This is an automated email from the ASF dual-hosted git repository.
hxb pushed a commit to branch release-1.15
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.15 by this push:
new 177e8a78a33 [FLINK-27450][hive] Upgrade default hive version to fix
Hive SessionState initialization issue with jdk11
177e8a78a33 is described below
commit 177e8a78a33a449bdeab4aafb1ff60ee169cd134
Author: Tartarus0zm <[email protected]>
AuthorDate: Wed May 11 11:36:59 2022 +0800
[FLINK-27450][hive] Upgrade default hive version to fix Hive SessionState
initialization issue with jdk11
This closes #19806.
---
.../table/catalog/hive/client/HiveShimLoader.java | 8 ++++++++
.../table/catalog/hive/client/HiveShimV238.java | 22 ++++++++++++++++++++++
.../table/catalog/hive/client/HiveShimV239.java | 22 ++++++++++++++++++++++
.../connectors/hive/HiveRunnerShimLoader.java | 2 ++
.../flink/table/module/hive/HiveModuleTest.java | 4 ++--
flink-table/flink-sql-client/pom.xml | 4 ++++
pom.xml | 2 +-
7 files changed, 61 insertions(+), 3 deletions(-)
diff --git
a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimLoader.java
b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimLoader.java
index d5452328a69..b3db8d7fa55 100644
---
a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimLoader.java
+++
b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimLoader.java
@@ -50,6 +50,8 @@ public class HiveShimLoader {
public static final String HIVE_VERSION_V2_3_5 = "2.3.5";
public static final String HIVE_VERSION_V2_3_6 = "2.3.6";
public static final String HIVE_VERSION_V2_3_7 = "2.3.7";
+ public static final String HIVE_VERSION_V2_3_8 = "2.3.8";
+ public static final String HIVE_VERSION_V2_3_9 = "2.3.9";
public static final String HIVE_VERSION_V3_1_0 = "3.1.0";
public static final String HIVE_VERSION_V3_1_1 = "3.1.1";
public static final String HIVE_VERSION_V3_1_2 = "3.1.2";
@@ -124,6 +126,12 @@ public class HiveShimLoader {
if (v.startsWith(HIVE_VERSION_V2_3_7)) {
return new HiveShimV237();
}
+ if (v.startsWith(HIVE_VERSION_V2_3_8)) {
+ return new HiveShimV238();
+ }
+ if (v.startsWith(HIVE_VERSION_V2_3_9)) {
+ return new HiveShimV239();
+ }
if (v.startsWith(HIVE_VERSION_V3_1_0)) {
return new HiveShimV310();
}
diff --git
a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV238.java
b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV238.java
new file mode 100644
index 00000000000..c6e51fe191e
--- /dev/null
+++
b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV238.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.table.catalog.hive.client;
+
+/** Shim for Hive version 2.3.8. */
+public class HiveShimV238 extends HiveShimV237 {}
diff --git
a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV239.java
b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV239.java
new file mode 100644
index 00000000000..d33fcb1c2ef
--- /dev/null
+++
b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV239.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.table.catalog.hive.client;
+
+/** Shim for Hive version 2.3.9. */
+public class HiveShimV239 extends HiveShimV238 {}
diff --git
a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveRunnerShimLoader.java
b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveRunnerShimLoader.java
index faef40fb213..f61614e86ba 100644
---
a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveRunnerShimLoader.java
+++
b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveRunnerShimLoader.java
@@ -57,6 +57,8 @@ public class HiveRunnerShimLoader {
case HiveShimLoader.HIVE_VERSION_V2_3_5:
case HiveShimLoader.HIVE_VERSION_V2_3_6:
case HiveShimLoader.HIVE_VERSION_V2_3_7:
+ case HiveShimLoader.HIVE_VERSION_V2_3_8:
+ case HiveShimLoader.HIVE_VERSION_V2_3_9:
case HiveShimLoader.HIVE_VERSION_V3_1_0:
case HiveShimLoader.HIVE_VERSION_V3_1_1:
case HiveShimLoader.HIVE_VERSION_V3_1_2:
diff --git
a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/module/hive/HiveModuleTest.java
b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/module/hive/HiveModuleTest.java
index 427b5d8b69e..f1602148864 100644
---
a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/module/hive/HiveModuleTest.java
+++
b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/module/hive/HiveModuleTest.java
@@ -42,7 +42,7 @@ import static
org.apache.flink.table.catalog.hive.client.HiveShimLoader.HIVE_VER
import static
org.apache.flink.table.catalog.hive.client.HiveShimLoader.HIVE_VERSION_V2_0_0;
import static
org.apache.flink.table.catalog.hive.client.HiveShimLoader.HIVE_VERSION_V2_1_1;
import static
org.apache.flink.table.catalog.hive.client.HiveShimLoader.HIVE_VERSION_V2_2_0;
-import static
org.apache.flink.table.catalog.hive.client.HiveShimLoader.HIVE_VERSION_V2_3_4;
+import static
org.apache.flink.table.catalog.hive.client.HiveShimLoader.HIVE_VERSION_V2_3_9;
import static
org.apache.flink.table.catalog.hive.client.HiveShimLoader.HIVE_VERSION_V3_1_1;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -97,7 +97,7 @@ public class HiveModuleTest {
case HIVE_VERSION_V2_2_0:
assertEquals(257, hiveModule.listFunctions().size());
break;
- case HIVE_VERSION_V2_3_4:
+ case HIVE_VERSION_V2_3_9:
assertEquals(275, hiveModule.listFunctions().size());
break;
case HIVE_VERSION_V3_1_1:
diff --git a/flink-table/flink-sql-client/pom.xml
b/flink-table/flink-sql-client/pom.xml
index fbd61f6bb16..f38592339ca 100644
--- a/flink-table/flink-sql-client/pom.xml
+++ b/flink-table/flink-sql-client/pom.xml
@@ -421,6 +421,10 @@ under the License.
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/pom.xml b/pom.xml
index 0018115e245..019ab3bda94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@ under the License.
to revisit the impact at that time.
-->
<minikdc.version>3.2.0</minikdc.version>
- <hive.version>2.3.4</hive.version>
+ <hive.version>2.3.9</hive.version>
<hive-2.2.0-orc-version>1.4.3</hive-2.2.0-orc-version>
<orc.version>1.5.6</orc.version>
<!--
