You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by bl...@apache.org on 2019/09/09 21:47:35 UTC
[flink] branch master updated: [FLINK-14005][hive] Support Hive
version 2.2.0
This is an automated email from the ASF dual-hosted git repository.
bli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 2ceee3e [FLINK-14005][hive] Support Hive version 2.2.0
2ceee3e is described below
commit 2ceee3e41d72a8c05c5ed6d918664616fe74ef77
Author: Xuefu Zhang <xu...@alibaba-inc.com>
AuthorDate: Mon Sep 9 10:56:54 2019 +0800
[FLINK-14005][hive] Support Hive version 2.2.0
This closes #9647.
---
flink-connectors/flink-connector-hive/pom.xml | 6 +++++
.../table/catalog/hive/client/HiveShimLoader.java | 4 ++++
.../table/catalog/hive/client/HiveShimV220.java | 26 ++++++++++++++++++++++
.../table/catalog/hive/client/HiveShimV230.java | 2 +-
.../connectors/hive/HiveRunnerShimLoader.java | 1 +
5 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/flink-connectors/flink-connector-hive/pom.xml b/flink-connectors/flink-connector-hive/pom.xml
index 471e045..deca4bc 100644
--- a/flink-connectors/flink-connector-hive/pom.xml
+++ b/flink-connectors/flink-connector-hive/pom.xml
@@ -667,6 +667,12 @@ under the License.
</properties>
</profile>
<profile>
+ <id>hive-2.2.0</id>
+ <properties>
+ <hive.version>2.2.0</hive.version>
+ </properties>
+ </profile>
+ <profile>
<id>hive-3.1.1</id>
<properties>
<hive.version>3.1.1</hive.version>
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 fec8b7c..c9a3ca0 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
@@ -37,6 +37,7 @@ public class HiveShimLoader {
public static final String HIVE_VERSION_V1_2_2 = "1.2.2";
public static final String HIVE_VERSION_V2_1_0 = "2.1.0";
public static final String HIVE_VERSION_V2_1_1 = "2.1.1";
+ public static final String HIVE_VERSION_V2_2_0 = "2.2.0";
public static final String HIVE_VERSION_V2_3_0 = "2.3.0";
public static final String HIVE_VERSION_V2_3_1 = "2.3.1";
public static final String HIVE_VERSION_V2_3_2 = "2.3.2";
@@ -72,6 +73,9 @@ public class HiveShimLoader {
if (v.startsWith(HIVE_VERSION_V2_1_1)) {
return new HiveShimV211();
}
+ if (v.startsWith(HIVE_VERSION_V2_2_0)) {
+ return new HiveShimV220();
+ }
if (v.startsWith(HIVE_VERSION_V2_3_0)) {
return new HiveShimV230();
}
diff --git a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV220.java b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV220.java
new file mode 100644
index 0000000..d267e89
--- /dev/null
+++ b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV220.java
@@ -0,0 +1,26 @@
+/*
+ * 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.2.0.
+ */
+public class HiveShimV220 extends HiveShimV211 {
+
+}
diff --git a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV230.java b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV230.java
index 3e2f3b5..ac76cba 100644
--- a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV230.java
+++ b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV230.java
@@ -47,7 +47,7 @@ import java.util.List;
/**
* Shim for Hive version 2.3.0.
*/
-public class HiveShimV230 extends HiveShimV211 {
+public class HiveShimV230 extends HiveShimV220 {
@Override
public IMetaStoreClient getHiveMetastoreClient(HiveConf hiveConf) {
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 9a64238..b5aae24 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
@@ -43,6 +43,7 @@ public class HiveRunnerShimLoader {
return new HiveRunnerShimV3();
case HiveShimLoader.HIVE_VERSION_V2_1_0:
case HiveShimLoader.HIVE_VERSION_V2_1_1:
+ case HiveShimLoader.HIVE_VERSION_V2_2_0:
case HiveShimLoader.HIVE_VERSION_V2_3_0:
case HiveShimLoader.HIVE_VERSION_V2_3_1:
case HiveShimLoader.HIVE_VERSION_V2_3_2: