diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 index e92f8a7975..8400413c44 100644 --- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 @@ -195,9 +195,9 @@ objenesis/2.6//objenesis-2.6.jar okhttp/3.12.12//okhttp-3.12.12.jar okio/1.14.0//okio-1.14.0.jar opencsv/2.3//opencsv-2.3.jar -orc-core/1.6.10//orc-core-1.6.10.jar -orc-mapreduce/1.6.10//orc-mapreduce-1.6.10.jar -orc-shims/1.6.10//orc-shims-1.6.10.jar +orc-core/1.6.11//orc-core-1.6.11.jar +orc-mapreduce/1.6.11//orc-mapreduce-1.6.11.jar +orc-shims/1.6.11//orc-shims-1.6.11.jar oro/2.0.8//oro-2.0.8.jar osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar paranamer/2.8//paranamer-2.8.jar diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 index b8426e2484..d0d8d5e5ee 100644 --- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 @@ -102,7 +102,6 @@ janino/3.0.16//janino-3.0.16.jar javassist/3.25.0-GA//javassist-3.25.0-GA.jar javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar javolution/5.5.1//javolution-5.5.1.jar -jaxb-api/2.2.11//jaxb-api-2.2.11.jar jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar jcl-over-slf4j/1.7.30//jcl-over-slf4j-1.7.30.jar jdo-api/3.0.1//jdo-api-3.0.1.jar @@ -166,9 +165,9 @@ objenesis/2.6//objenesis-2.6.jar okhttp/3.12.12//okhttp-3.12.12.jar okio/1.14.0//okio-1.14.0.jar opencsv/2.3//opencsv-2.3.jar -orc-core/1.6.10//orc-core-1.6.10.jar -orc-mapreduce/1.6.10//orc-mapreduce-1.6.10.jar -orc-shims/1.6.10//orc-shims-1.6.10.jar +orc-core/1.6.11//orc-core-1.6.11.jar +orc-mapreduce/1.6.11//orc-mapreduce-1.6.11.jar +orc-shims/1.6.11//orc-shims-1.6.11.jar oro/2.0.8//oro-2.0.8.jar osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar paranamer/2.8//paranamer-2.8.jar diff --git a/pom.xml b/pom.xml index ab71632c4d..9f2b2c923c 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ 10.14.2.0 1.12.1 - 1.6.10 + 1.6.11 9.4.43.v20210629 4.0.3 0.10.0 @@ -2305,11 +2305,6 @@ - - io.airlift - aircompressor - 0.21 - org.apache.orc orc-mapreduce diff --git a/sql/core/src/test/scala/org/apache/spark/sql/FileBasedDataSourceSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/FileBasedDataSourceSuite.scala index 243639222f..001b6a00af 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/FileBasedDataSourceSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/FileBasedDataSourceSuite.scala @@ -695,9 +695,9 @@ class FileBasedDataSourceSuite extends QueryTest test("SPARK-22790,SPARK-27668: spark.sql.sources.compressionFactor takes effect") { Seq(1.0, 0.5).foreach { compressionFactor => withSQLConf(SQLConf.FILE_COMPRESSION_FACTOR.key -> compressionFactor.toString, - SQLConf.AUTO_BROADCASTJOIN_THRESHOLD.key -> "250") { + SQLConf.AUTO_BROADCASTJOIN_THRESHOLD.key -> "350") { withTempPath { workDir => - // the file size is 486 bytes + // the file size is 504 bytes val workDirPath = workDir.getAbsolutePath val data1 = Seq(100, 200, 300, 400).toDF("count") data1.write.orc(workDirPath + "/data1")