mchades commented on code in PR #9446: URL: https://github.com/apache/gravitino/pull/9446#discussion_r2606078890
########## catalogs/hive-metastore-common/src/main/java/org/apache/gravitino/hive/client/HiveShimV2.java: ########## @@ -0,0 +1,280 @@ +/* + * 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.gravitino.hive.client; + +import static org.apache.gravitino.hive.client.HiveClientClassLoader.HiveVersion.HIVE2; +import static org.apache.gravitino.hive.client.Util.buildConfigurationFromProperties; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.List; +import java.util.Properties; +import org.apache.gravitino.hive.HivePartition; +import org.apache.gravitino.hive.HiveSchema; +import org.apache.gravitino.hive.HiveTable; +import org.apache.gravitino.hive.client.HiveExceptionConverter.ExceptionTarget; +import org.apache.gravitino.hive.converter.HiveDatabaseConverter; +import org.apache.gravitino.hive.converter.HiveTableConverter; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.api.Database; + +class HiveShimV2 extends HiveShim { + + HiveShimV2(Properties properties) { + super(HIVE2, properties); + } + + HiveShimV2(HiveClientClassLoader.HiveVersion version, Properties properties) { + super(version, properties); + } + + @Override + public IMetaStoreClient createMetaStoreClient(Properties properties) { + try { + ClassLoader classLoader = this.getClass().getClassLoader(); + Class<?> clientClass = classLoader.loadClass(RETRYING_META_STORE_CLIENT_CLASS); + Class<?> hiveConfClass = classLoader.loadClass(HIVE_CONF_CLASS); + Class<?> confClass = classLoader.loadClass(CONFIGURATION_CLASS); Review Comment: where define the `CONFIGURATION_CLASS`? ########## catalogs/hive-metastore-common/src/main/java/org/apache/gravitino/hive/client/HiveShimV2.java: ########## @@ -0,0 +1,280 @@ +/* + * 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.gravitino.hive.client; + +import static org.apache.gravitino.hive.client.HiveClientClassLoader.HiveVersion.HIVE2; +import static org.apache.gravitino.hive.client.Util.buildConfigurationFromProperties; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.List; +import java.util.Properties; +import org.apache.gravitino.hive.HivePartition; +import org.apache.gravitino.hive.HiveSchema; +import org.apache.gravitino.hive.HiveTable; +import org.apache.gravitino.hive.client.HiveExceptionConverter.ExceptionTarget; +import org.apache.gravitino.hive.converter.HiveDatabaseConverter; +import org.apache.gravitino.hive.converter.HiveTableConverter; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.IMetaStoreClient; +import org.apache.hadoop.hive.metastore.api.Database; + +class HiveShimV2 extends HiveShim { + + HiveShimV2(Properties properties) { + super(HIVE2, properties); + } + + HiveShimV2(HiveClientClassLoader.HiveVersion version, Properties properties) { + super(version, properties); + } + + @Override + public IMetaStoreClient createMetaStoreClient(Properties properties) { + try { + ClassLoader classLoader = this.getClass().getClassLoader(); + Class<?> clientClass = classLoader.loadClass(RETRYING_META_STORE_CLIENT_CLASS); + Class<?> hiveConfClass = classLoader.loadClass(HIVE_CONF_CLASS); + Class<?> confClass = classLoader.loadClass(CONFIGURATION_CLASS); + + Object conf = confClass.getDeclaredConstructor().newInstance(); + buildConfigurationFromProperties(properties, (Configuration) conf); + + Constructor<?> hiveConfCtor = hiveConfClass.getConstructor(confClass, Class.class); + Object hiveConfInstance = hiveConfCtor.newInstance(conf, hiveConfClass); + + Method getProxyMethod = clientClass.getMethod(METHOD_GET_PROXY, hiveConfClass, boolean.class); + return (IMetaStoreClient) getProxyMethod.invoke(null, hiveConfInstance, false); + + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException( + e, ExceptionTarget.other("MetaStoreClient")); + } + } + + @Override + public void createDatabase(HiveSchema database) { + try { + Database db = HiveDatabaseConverter.toHiveDb(database); + client.createDatabase(db); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.schema(database.name())); + } + } + + @Override + public HiveSchema getDatabase(String catalogName, String databaseName) { + try { + Database db = client.getDatabase(databaseName); + return HiveDatabaseConverter.fromHiveDB(db); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.schema(databaseName)); + } + } + + @Override + public void alterDatabase(String catalogName, String databaseName, HiveSchema database) { + try { + Database db = HiveDatabaseConverter.toHiveDb(database); + client.alterDatabase(databaseName, db); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.schema(databaseName)); + } + } + + @Override + public void dropDatabase(String catalogName, String databaseName, boolean cascade) { + try { + client.dropDatabase(databaseName, false, false, cascade); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.schema(databaseName)); + } + } + + @Override + public List<String> getAllTables(String catalogName, String databaseName) { + try { + return client.getAllTables(databaseName); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.schema(databaseName)); + } + } + + @Override + public List<String> listTableNamesByFilter( + String catalogName, String databaseName, String filter, short pageSize) { + try { + return client.listTableNamesByFilter(databaseName, filter, pageSize); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.schema(databaseName)); + } + } + + @Override + public HiveTable getTable(String catalogName, String databaseName, String tableName) { + try { + var tb = client.getTable(databaseName, tableName); + return HiveTableConverter.fromHiveTable(tb); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.table(tableName)); + } + } + + @Override + public void alterTable( + String catalogName, String databaseName, String tableName, HiveTable alteredHiveTable) { + try { + var tb = HiveTableConverter.toHiveTable(alteredHiveTable); + client.alter_table(databaseName, tableName, tb); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.table(tableName)); + } + } + + @Override + public void dropTable( + String catalogName, + String databaseName, + String tableName, + boolean deleteData, + boolean ifPurge) { + try { + client.dropTable(databaseName, tableName, deleteData, ifPurge); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.table(tableName)); + } + } + + @Override + public void createTable(HiveTable hiveTable) { + try { + var tb = HiveTableConverter.toHiveTable(hiveTable); + client.createTable(tb); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.table(hiveTable.name())); + } + } + + @Override + public List<String> listPartitionNames(HiveTable table, short pageSize) { + try { + String databaseName = table.databaseName(); + return client.listPartitionNames(databaseName, table.name(), pageSize); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.table(table.name())); + } + } + + @Override + public List<HivePartition> listPartitions(HiveTable table, short pageSize) { + try { + String databaseName = table.databaseName(); + var partitions = client.listPartitions(databaseName, table.name(), pageSize); + return partitions.stream().map(p -> HiveTableConverter.fromHivePartition(table, p)).toList(); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.table(table.name())); + } + } + + @Override + public List<HivePartition> listPartitions( + HiveTable table, List<String> filterPartitionValueList, short pageSize) { + try { + String databaseName = table.databaseName(); + var partitions = + client.listPartitions(databaseName, table.name(), filterPartitionValueList, pageSize); + return partitions.stream().map(p -> HiveTableConverter.fromHivePartition(table, p)).toList(); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException(e, ExceptionTarget.table(table.name())); + } + } + + @Override + public HivePartition getPartition(HiveTable table, String partitionName) { + try { + String databaseName = table.databaseName(); + var partitionValues = HivePartition.extractPartitionValues(partitionName); + var partition = client.getPartition(databaseName, table.name(), partitionValues); + return HiveTableConverter.fromHivePartition(table, partition); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException( + e, ExceptionTarget.partition(partitionName)); + } + } + + @Override + public HivePartition addPartition(HiveTable table, HivePartition partition) { + try { + String databaseName = table.databaseName(); + var hivePartition = HiveTableConverter.toHivePartition(databaseName, table, partition); + var addedPartition = client.add_partition(hivePartition); + return HiveTableConverter.fromHivePartition(table, addedPartition); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException( + e, ExceptionTarget.partition(partition.name())); + } + } + + @Override + public void dropPartition( + String catalogName, + String databaseName, + String tableName, + String partitionName, + boolean deleteData) { + try { + var partitionValues = HivePartition.extractPartitionValues(partitionName); + client.dropPartition(databaseName, tableName, partitionValues, deleteData); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException( + e, ExceptionTarget.partition(partitionName)); + } + } + + @Override + public String getDelegationToken(String finalPrincipalName, String userName) { + try { + return client.getDelegationToken(finalPrincipalName, userName); + } catch (Exception e) { + throw HiveExceptionConverter.toGravitinoException( + e, ExceptionTarget.other(finalPrincipalName)); + } + } + + @Override + public List<HiveTable> getTableObjectsByName( + String catalogName, String databaseName, List<String> allTables) { + try { + // Hive2 doesn't support catalog, so we ignore catalogName and use databaseName + var tables = client.getTableObjectsByName(databaseName, allTables); Review Comment: Should we throw an exception when the catalogName is not null? ########## catalogs/hive-metastore-common/src/main/java/org/apache/gravitino/hive/client/Util.java: ########## @@ -27,9 +27,9 @@ public class Util { public static final String HIVE_CONFIG_RESOURCES = "hive.config.resources"; - public static Configuration buildConfigurationFromProperties(Properties properties) { + public static Configuration buildConfigurationFromProperties( + Properties properties, Configuration config) { Review Comment: This method modifies the value of the `config` parameter, but this is not evident from the function name. It is recommended to rename the function to one that better reflects its actual behavior. ########## catalogs/hive-metastore-common/src/main/java/org/apache/gravitino/hive/client/HiveClientImpl.java: ########## @@ -29,107 +30,155 @@ * partition operations. */ public class HiveClientImpl implements HiveClient { + + HiveShim shim; Review Comment: should it be `private final`? -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
