From 2badd477c204ecebe5fffb090d14a71d557d83dc Mon Sep 17 00:00:00 2001 From: denglingang Date: Thu, 17 Oct 2019 15:59:11 +0800 Subject: [PATCH 1/5] Fix ORC version --- docs/sql-data-sources-orc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sql-data-sources-orc.md b/docs/sql-data-sources-orc.md index 45bff17c6cf2..0cb723bccf5c 100644 --- a/docs/sql-data-sources-orc.md +++ b/docs/sql-data-sources-orc.md @@ -31,7 +31,7 @@ the vectorized reader is used when `spark.sql.hive.convertMetastoreOrc` is also spark.sql.orc.impl native - The name of ORC implementation. It can be one of native and hive. native means the native ORC support that is built on Apache ORC 1.4. `hive` means the ORC library in Hive 1.2.1. + The name of ORC implementation. It can be one of native and hive. native means the native ORC support that is built on Apache ORC 1.5. `hive` means the ORC library in Hive 1.2.1. spark.sql.orc.enableVectorizedReader From 25dcd2c09c3b4f3bccc880c7f5a804727d64c4f5 Mon Sep 17 00:00:00 2001 From: denglingang Date: Fri, 18 Oct 2019 16:12:38 +0800 Subject: [PATCH 2/5] Remove ORC version --- docs/sql-data-sources-orc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sql-data-sources-orc.md b/docs/sql-data-sources-orc.md index 0cb723bccf5c..58ec17c7593a 100644 --- a/docs/sql-data-sources-orc.md +++ b/docs/sql-data-sources-orc.md @@ -31,7 +31,7 @@ the vectorized reader is used when `spark.sql.hive.convertMetastoreOrc` is also spark.sql.orc.impl native - The name of ORC implementation. It can be one of native and hive. native means the native ORC support that is built on Apache ORC 1.5. `hive` means the ORC library in Hive 1.2.1. + The name of ORC implementation. It can be one of native and hive. native means the native ORC support. hive means the ORC library in Hive 1.2.1. spark.sql.orc.enableVectorizedReader From 6974b7f5051e93367eda015464db6cdbdbcf3dd6 Mon Sep 17 00:00:00 2001 From: denglingang Date: Mon, 21 Oct 2019 11:16:53 +0800 Subject: [PATCH 3/5] Remove hive version --- docs/sql-data-sources-orc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sql-data-sources-orc.md b/docs/sql-data-sources-orc.md index 58ec17c7593a..bddffe02602e 100644 --- a/docs/sql-data-sources-orc.md +++ b/docs/sql-data-sources-orc.md @@ -31,7 +31,7 @@ the vectorized reader is used when `spark.sql.hive.convertMetastoreOrc` is also spark.sql.orc.impl native - The name of ORC implementation. It can be one of native and hive. native means the native ORC support. hive means the ORC library in Hive 1.2.1. + The name of ORC implementation. It can be one of native and hive. native means the native ORC support. hive means the ORC library in Hive. spark.sql.orc.enableVectorizedReader From 806edaeee218584390c34498bd282d5908f481c5 Mon Sep 17 00:00:00 2001 From: denglingang Date: Tue, 22 Oct 2019 09:27:54 +0800 Subject: [PATCH 4/5] Remove hive version in SQLConf.scala --- .../src/main/scala/org/apache/spark/sql/internal/SQLConf.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala index e2c1308cdc60..6a4f82d06dd8 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala @@ -628,7 +628,7 @@ object SQLConf { val ORC_IMPLEMENTATION = buildConf("spark.sql.orc.impl") .doc("When native, use the native version of ORC support instead of the ORC library in Hive " + - "1.2.1. It is 'hive' by default prior to Spark 2.4.") + ". It is 'hive' by default prior to Spark 2.4.") .internal() .stringConf .checkValues(Set("hive", "native")) From c5ddd1eba1afdd33c050818e9a1ff1a69ed8f71b Mon Sep 17 00:00:00 2001 From: HyukjinKwon Date: Tue, 22 Oct 2019 11:18:37 +0900 Subject: [PATCH 5/5] Fix a typo --- .../main/scala/org/apache/spark/sql/internal/SQLConf.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala index 6a4f82d06dd8..a44a94660707 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala @@ -627,8 +627,8 @@ object SQLConf { .createWithDefault("snappy") val ORC_IMPLEMENTATION = buildConf("spark.sql.orc.impl") - .doc("When native, use the native version of ORC support instead of the ORC library in Hive " + - ". It is 'hive' by default prior to Spark 2.4.") + .doc("When native, use the native version of ORC support instead of the ORC library in Hive." + + "It is 'hive' by default prior to Spark 2.4.") .internal() .stringConf .checkValues(Set("hive", "native"))