Skip to content

Commit 032499e

Browse files
committed
Remove Hive 1.2
1 parent aa66579 commit 032499e

File tree

16 files changed

+7
-1345
lines changed

16 files changed

+7
-1345
lines changed

dev/run-tests.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ def get_hive_profiles(hive_version):
325325
"""
326326

327327
sbt_maven_hive_profiles = {
328-
"hive1.2": ["-Phive-1.2"],
329328
"hive2.3": ["-Phive-2.3"],
330329
}
331330

dev/test-dependencies.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export LC_ALL=C
3232
HADOOP_MODULE_PROFILES="-Phive-thriftserver -Pmesos -Pkubernetes -Pyarn -Phive"
3333
MVN="build/mvn"
3434
HADOOP_HIVE_PROFILES=(
35-
hadoop-2.7-hive-1.2
3635
hadoop-2.7-hive-2.3
3736
hadoop-3.2-hive-2.3
3837
)
@@ -71,12 +70,9 @@ for HADOOP_HIVE_PROFILE in "${HADOOP_HIVE_PROFILES[@]}"; do
7170
if [[ $HADOOP_HIVE_PROFILE == **hadoop-3.2-hive-2.3** ]]; then
7271
HADOOP_PROFILE=hadoop-3.2
7372
HIVE_PROFILE=hive-2.3
74-
elif [[ $HADOOP_HIVE_PROFILE == **hadoop-2.7-hive-2.3** ]]; then
75-
HADOOP_PROFILE=hadoop-2.7
76-
HIVE_PROFILE=hive-2.3
7773
else
7874
HADOOP_PROFILE=hadoop-2.7
79-
HIVE_PROFILE=hive-1.2
75+
HIVE_PROFILE=hive-2.3
8076
fi
8177
echo "Performing Maven install for $HADOOP_HIVE_PROFILE"
8278
$MVN $HADOOP_MODULE_PROFILES -P$HADOOP_PROFILE -P$HIVE_PROFILE jar:jar jar:test-jar install:install clean -q

docs/sql-migration-guide.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ license: |
4242

4343
- In Spark 3.1, incomplete interval literals, e.g. `INTERVAL '1'`, `INTERVAL '1 DAY 2'` will fail with IllegalArgumentException. In Spark 3.0, they result `NULL`s.
4444

45+
- In Spark 3.1, we remove the built-in Hive 1.2. You need to migrate your custom SerDes to Hive 2.3. See [HIVE-15167](https://issues.apache.org/jira/browse/HIVE-15167) for more details.
46+
4547
## Upgrading from Spark SQL 3.0 to 3.0.1
4648

4749
- In Spark 3.0, JSON datasource and JSON function `schema_of_json` infer TimestampType from string values if they match to the pattern defined by the JSON option `timestampFormat`. Since version 3.0.1, the timestamp type inference is disabled by default. Set the JSON option `inferTimestamp` to `true` to enable such type inference.

pom.xml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3150,23 +3150,7 @@
31503150

31513151
<profile>
31523152
<id>hive-1.2</id>
3153-
<properties>
3154-
<hive.group>org.spark-project.hive</hive.group>
3155-
<hive.classifier></hive.classifier>
3156-
<!-- Version used in Maven Hive dependency -->
3157-
<hive.version>1.2.1.spark2</hive.version>
3158-
<!-- Version used for internal directory structure -->
3159-
<hive.version.short>1.2</hive.version.short>
3160-
<hive.parquet.scope>${hive.deps.scope}</hive.parquet.scope>
3161-
<hive.storage.version>2.6.0</hive.storage.version>
3162-
<hive.storage.scope>provided</hive.storage.scope>
3163-
<hive.common.scope>provided</hive.common.scope>
3164-
<hive.llap.scope>provided</hive.llap.scope>
3165-
<hive.serde.scope>provided</hive.serde.scope>
3166-
<hive.shims.scope>provided</hive.shims.scope>
3167-
<orc.classifier>nohive</orc.classifier>
3168-
<datanucleus-core.version>3.2.10</datanucleus-core.version>
3169-
</properties>
3153+
<!-- Exists only for backward compatibility. No-op. -->
31703154
</profile>
31713155

31723156
<profile>

sql/core/v1.2/src/main/java/org/apache/spark/sql/execution/datasources/orc/OrcColumnVector.java

Lines changed: 0 additions & 208 deletions
This file was deleted.

sql/core/v1.2/src/main/scala/org/apache/spark/sql/execution/datasources/orc/DaysWritable.scala

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)