lirui-apache commented on a change in pull request #8564: [FLINK-12649][hive] Add a shim layer to support multiple versions of HMS URL: https://github.com/apache/flink/pull/8564#discussion_r288868329
########## File path: flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveMetastoreClientWrapper.java ########## @@ -0,0 +1,227 @@ +/* + * 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; + +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; +import org.apache.hadoop.hive.metastore.api.ColumnStatistics; +import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; +import org.apache.hadoop.hive.metastore.api.Database; +import org.apache.hadoop.hive.metastore.api.Function; +import org.apache.hadoop.hive.metastore.api.InvalidInputException; +import org.apache.hadoop.hive.metastore.api.InvalidObjectException; +import org.apache.hadoop.hive.metastore.api.InvalidOperationException; +import org.apache.hadoop.hive.metastore.api.MetaException; +import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; +import org.apache.hadoop.hive.metastore.api.Partition; +import org.apache.hadoop.hive.metastore.api.Table; +import org.apache.hadoop.hive.metastore.api.UnknownDBException; +import org.apache.thrift.TException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import java.util.Map; + +/** + * Wrapper class for Hive Metastore Client, which embeds a HiveShim layer to handle different Hive versions. + * Methods provided mostly conforms to IMetaStoreClient interfaces except those that require shims. + */ +public class HiveMetastoreClientWrapper implements AutoCloseable { + + private static final Logger LOG = LoggerFactory.getLogger(HiveMetastoreClientWrapper.class); + + private final IMetaStoreClient client; + private final HiveConf hiveConf; + + public HiveMetastoreClientWrapper(HiveConf hiveConf) { + this.hiveConf = hiveConf; + client = createMetastoreClient(); + } + + @Override + public void close() { + client.close(); + } + + public List<String> getDatabases(String pattern) throws MetaException, TException { + return client.getDatabases(pattern); + } + + public List<String> getAllDatabases() throws MetaException, TException { + return client.getAllDatabases(); + } + + public List<String> getAllTables(String databaseName) throws MetaException, TException, UnknownDBException { + return client.getAllTables(databaseName); + } + + public void dropTable(String databaseName, String tableName) throws MetaException, TException, + NoSuchObjectException { + client.dropTable(databaseName, tableName); + } + + public void dropTable(String dbName, String tableName, boolean deleteData, boolean ignoreUnknownTable) + throws MetaException, NoSuchObjectException, TException { + client.dropTable(dbName, tableName, deleteData, ignoreUnknownTable); + } + + public boolean tableExists(String databaseName, String tableName) throws MetaException, TException, + UnknownDBException { + return client.tableExists(databaseName, tableName); + } + + public Database getDatabase(String name) throws NoSuchObjectException, MetaException, TException { + return client.getDatabase(name); + } + + public Table getTable(String databaseName, String tableName) throws MetaException, TException, + NoSuchObjectException { + return client.getTable(databaseName, tableName); + } + + public Partition add_partition(Partition partition) throws InvalidObjectException, AlreadyExistsException, + MetaException, TException { + return client.add_partition(partition); + } + + public int add_partitions(List<Partition> partitionList) throws InvalidObjectException, AlreadyExistsException, + MetaException, TException { + return client.add_partitions(partitionList); + } + + public Partition getPartition(String databaseName, String tableName, List<String> list) + throws NoSuchObjectException, MetaException, TException { + return client.getPartition(databaseName, tableName, list); + } + + public List<String> listPartitionNames(String databaseName, String tableName, short maxPartitions) + throws MetaException, TException { + return client.listPartitionNames(databaseName, tableName, maxPartitions); + } + + public List<String> listPartitionNames(String databaseName, String tableName, List<String> partitionValues, + short maxPartitions) throws MetaException, TException, NoSuchObjectException { + return client.listPartitionNames(databaseName, tableName, partitionValues, maxPartitions); + } + + public void createTable(Table table) throws AlreadyExistsException, InvalidObjectException, MetaException, + NoSuchObjectException, TException { + client.createTable(table); + } + + public void alter_table(String databaseName, String tableName, Table table) throws InvalidOperationException, + MetaException, TException { + client.alter_table(databaseName, tableName, table); + } + + public void alter_table(String s, String s1, Table table, boolean b) throws InvalidOperationException, Review comment: Nice catch. Will remove it ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services