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 edf1f7d [FLINK-13903][hive] Support Hive version 2.3.6 edf1f7d is described below commit edf1f7d610c75adb228b8bc8262eb1865a91e362 Author: Xuefu Zhang <xuef...@alibaba-inc.com> AuthorDate: Fri Aug 30 12:02:18 2019 -0700 [FLINK-13903][hive] Support Hive version 2.3.6 Support Hive 2.3.6, which was released a few days ago. This closes #9584. --- .../table/catalog/hive/client/HiveShimLoader.java | 4 ++++ .../table/catalog/hive/client/HiveShimV236.java | 26 ++++++++++++++++++++++ .../connectors/hive/HiveRunnerShimLoader.java | 1 + 3 files changed, 31 insertions(+) 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 a45722d..802f2bd 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 @@ -43,6 +43,7 @@ public class HiveShimLoader { public static final String HIVE_VERSION_V2_3_3 = "2.3.3"; public static final String HIVE_VERSION_V2_3_4 = "2.3.4"; public static final String HIVE_VERSION_V2_3_5 = "2.3.5"; + public static final String HIVE_VERSION_V2_3_6 = "2.3.6"; private static final Map<String, HiveShim> hiveShims = new ConcurrentHashMap<>(2); @@ -86,6 +87,9 @@ public class HiveShimLoader { if (v.startsWith(HIVE_VERSION_V2_3_5)) { return new HiveShimV235(); } + if (v.startsWith(HIVE_VERSION_V2_3_6)) { + return new HiveShimV236(); + } throw new CatalogException("Unsupported Hive version " + v); }); } diff --git a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV236.java b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV236.java new file mode 100644 index 0000000..f9832c1 --- /dev/null +++ b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV236.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.3.6. + */ +public class HiveShimV236 extends HiveShimV235 { + +} 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 6903cf6..ab0ee80 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 @@ -49,6 +49,7 @@ public class HiveRunnerShimLoader { case HiveShimLoader.HIVE_VERSION_V2_3_3: case HiveShimLoader.HIVE_VERSION_V2_3_4: case HiveShimLoader.HIVE_VERSION_V2_3_5: + case HiveShimLoader.HIVE_VERSION_V2_3_6: return new HiveRunnerShimV4(); default: throw new RuntimeException("Unsupported Hive version " + v);