From 7daa4d823acad0675ba3e38af54a32107a0eb240 Mon Sep 17 00:00:00 2001 From: Alexander Kolbasov Date: Mon, 3 Sep 2018 10:33:49 -0700 Subject: [PATCH 1/1] HIVE-20483: Really move metastore common classes into metastore-common --- beeline/pom.xml | 5 +++++ hcatalog/hcatalog-pig-adapter/pom.xml | 7 +++++++ hcatalog/pom.xml | 7 +++++++ metastore/pom.xml | 5 ----- ql/pom.xml | 5 +++++ .../main/java/org/apache/hadoop/hive/common/StatsSetupConst.java | 0 .../src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java | 0 .../java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java | 0 .../java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java | 0 .../java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java | 0 .../main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java | 0 .../main/java/org/apache/hadoop/hive/metastore/MetadataStore.java | 0 .../java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java | 0 .../org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java | 0 .../java/org/apache/hadoop/hive/metastore/ReplChangeManager.java | 0 .../org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java | 0 .../main/java/org/apache/hadoop/hive/metastore/TableIterable.java | 0 .../src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java | 0 .../java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java | 0 .../java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java | 0 .../hive/metastore/partition/spec/CompositePartitionSpecProxy.java | 0 .../metastore/partition/spec/PartitionListComposingSpecProxy.java | 0 .../hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java | 0 .../metastore/partition/spec/PartitionSpecWithSharedSDProxy.java | 0 .../hadoop/hive/metastore/security/DelegationTokenIdentifier.java | 0 .../hive/metastore/security/DelegationTokenSecretManager.java | 0 .../hadoop/hive/metastore/security/DelegationTokenSelector.java | 0 .../hadoop/hive/metastore/security/HadoopThriftAuthBridge.java | 0 .../hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java | 0 .../java/org/apache/hadoop/hive/metastore/utils/FileUtils.java | 0 .../java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java | 0 .../org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java | 0 .../java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java | 0 streaming/pom.xml | 6 ++++++ 34 files changed, 30 insertions(+), 5 deletions(-) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/TableIterable.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java (100%) rename standalone-metastore/{metastore-server => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java (100%) diff --git a/beeline/pom.xml b/beeline/pom.xml index 4567d5e09b..19ec53eba6 100644 --- a/beeline/pom.xml +++ b/beeline/pom.xml @@ -55,6 +55,11 @@ hive-jdbc ${project.version} + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + commons-cli diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml index a1c8ddf057..c026835f52 100644 --- a/hcatalog/hcatalog-pig-adapter/pom.xml +++ b/hcatalog/hcatalog-pig-adapter/pom.xml @@ -136,6 +136,13 @@ tests test + + org.apache.hive + hive-standalone-metastore-server + 4.0.0-SNAPSHOT + tests + test + org.apache.hadoop hadoop-mapreduce-client-common diff --git a/hcatalog/pom.xml b/hcatalog/pom.xml index 4894e9a16f..91d7dafa9c 100644 --- a/hcatalog/pom.xml +++ b/hcatalog/pom.xml @@ -65,6 +65,13 @@ ${hadoop.version} test + + org.apache.hive + hive-standalone-metastore-server + 4.0.0-SNAPSHOT + tests + test + org.apache.pig pig diff --git a/metastore/pom.xml b/metastore/pom.xml index 7f751a4935..a75ab97ae7 100644 --- a/metastore/pom.xml +++ b/metastore/pom.xml @@ -48,11 +48,6 @@ org.apache.hive hive-standalone-metastore-common ${project.version} - - - org.apache.hive - hive-standalone-metastore-server - ${project.version} javolution diff --git a/ql/pom.xml b/ql/pom.xml index a55cbe380d..d73deba440 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -448,6 +448,11 @@ opencsv ${opencsv.version} + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + org.apache.hive diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableIterable.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TableIterable.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableIterable.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TableIterable.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java similarity index 100% rename from standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java diff --git a/streaming/pom.xml b/streaming/pom.xml index 99697a8575..22fe61995d 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -91,6 +91,12 @@ ${project.version} test + + org.apache.hive + hive-standalone-metastore-server + 4.0.0-SNAPSHOT + test + -- 2.16.3