HIVE-17980 Move HiveMetaStoreClient plus a few remaining classes. This closes #272 (Alan Gates, reviewed by Daniel Dai)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/d79c4595 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/d79c4595 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/d79c4595 Branch: refs/heads/master Commit: d79c45951d0382dc42d5ce0c9474d994948522b7 Parents: 95dadac Author: Alan Gates <ga...@hortonworks.com> Authored: Wed Dec 6 13:19:00 2017 -0800 Committer: Alan Gates <ga...@hortonworks.com> Committed: Wed Dec 6 13:19:00 2017 -0800 ---------------------------------------------------------------------- .../hive/accumulo/AccumuloStorageHandler.java | 2 +- .../hadoop/hive/druid/DruidStorageHandler.java | 2 +- .../apache/hadoop/hive/hbase/HBaseMetaHook.java | 2 +- .../hadoop/hive/hbase/HBaseStorageHandler.java | 1 + hcatalog/core/pom.xml | 2 +- .../hive/hcatalog/common/HiveClientCache.java | 2 +- .../mapreduce/FileOutputCommitterContainer.java | 4 +- .../mapreduce/FileOutputFormatContainer.java | 4 +- .../hive/hcatalog/mapreduce/InternalUtil.java | 2 +- .../apache/hive/hcatalog/cli/TestPermsGrp.java | 1 - .../mapreduce/TestHCatPartitionPublish.java | 1 - .../listener/DbNotificationListener.java | 41 +- .../streaming/DelimitedInputWriter.java | 3 +- .../hcatalog/streaming/StrictJsonWriter.java | 2 +- .../hcatalog/streaming/StrictRegexWriter.java | 2 +- hcatalog/webhcat/java-client/pom.xml | 2 +- .../hive/hcatalog/api/HCatClientHMSImpl.java | 5 +- hcatalog/webhcat/svr/pom.xml | 2 +- itests/hcatalog-unit/pom.xml | 2 +- .../hive/hcatalog/hbase/ManyMiniCluster.java | 4 +- itests/hive-blobstore/pom.xml | 4 +- itests/hive-minikdc/pom.xml | 4 +- itests/hive-unit-hadoop2/pom.xml | 2 +- itests/hive-unit/pom.xml | 2 +- .../AbstractTestAuthorizationApiAuthorizer.java | 1 + .../hadoop/hive/metastore/TestFilterHooks.java | 4 + .../hive/metastore/TestHiveMetaStore.java | 3 +- ...TestHiveMetaStoreWithEnvironmentContext.java | 1 + .../hive/metastore/TestMarkPartitionRemote.java | 1 + .../metastore/TestMetaStoreAuthorization.java | 1 + .../TestMetaStoreEndFunctionListener.java | 1 + .../metastore/TestMetaStoreEventListener.java | 1 + .../TestMetaStoreEventListenerOnlyOnCommit.java | 1 + .../metastore/TestMetaStoreInitListener.java | 1 + .../metastore/TestMetaStoreListenersError.java | 1 + .../hive/metastore/TestMetaStoreMetrics.java | 1 + .../hive/metastore/TestRemoteHiveMetaStore.java | 1 + .../TestRemoteHiveMetaStoreIpAddress.java | 1 + .../hive/metastore/TestRetryingHMSHandler.java | 1 + .../hive/ql/parse/TestReplicationScenarios.java | 1 + .../TestMetastoreAuthorizationProvider.java | 4 + .../hive/serde2/TestSerdeWithFieldComments.java | 4 +- .../thrift/TestThriftCliServiceMessageSize.java | 14 +- itests/qtest-accumulo/pom.xml | 4 +- itests/qtest-spark/pom.xml | 4 +- itests/qtest/pom.xml | 4 +- itests/util/pom.xml | 2 +- llap-server/pom.xml | 2 +- metastore/pom.xml | 11 - .../hive/metastore/HiveMetaStoreClient.java | 2782 ------------------ .../hive/metastore/HiveMetaStoreUtils.java | 213 ++ .../hadoop/hive/metastore/IMetaStoreClient.java | 1826 ------------ .../hadoop/hive/metastore/MetaStoreUtils.java | 1095 ------- .../hive/metastore/RetryingMetaStoreClient.java | 340 --- .../metastore/SerDeStorageSchemaReader.java | 4 +- .../hive/metastore/messaging/EventUtils.java | 202 -- .../messaging/event/filters/AndFilter.java | 39 - .../messaging/event/filters/BasicFilter.java | 33 - .../event/filters/DatabaseAndTableFilter.java | 52 - .../event/filters/EventBoundaryFilter.java | 34 - .../event/filters/MessageFormatFilter.java | 36 - .../hive/metastore/tools/HiveMetaTool.java | 487 --- .../metastore/AlternateFailurePreListener.java | 62 - .../metastore/DummyEndFunctionListener.java | 47 - .../hadoop/hive/metastore/DummyListener.java | 144 - .../metastore/DummyMetaStoreInitListener.java | 44 - .../hadoop/hive/metastore/DummyPreListener.java | 49 - .../DummyRawStoreControlledCommit.java | 1053 ------- .../InjectableBehaviourObjectStore.java | 104 - .../hive/metastore/IpAddressListener.java | 103 - .../hive/metastore/MetaStoreTestUtils.java | 199 -- .../MockPartitionExpressionForMetastore.java | 59 - .../metastore/TestHiveMetaStoreGetMetaConf.java | 138 - .../TestHiveMetaStorePartitionSpecs.java | 409 --- .../metastore/TestHiveMetaStoreTimeout.java | 142 - .../hadoop/hive/metastore/TestOldSchema.java | 220 -- .../hive/metastore/VerifyingObjectStore.java | 217 -- ql/pom.xml | 2 +- .../java/org/apache/hadoop/hive/ql/Driver.java | 7 +- .../org/apache/hadoop/hive/ql/QueryState.java | 6 +- .../hadoop/hive/ql/exec/ArchiveUtils.java | 2 +- .../org/apache/hadoop/hive/ql/exec/DDLTask.java | 5 +- .../hadoop/hive/ql/exec/FetchOperator.java | 1 - .../apache/hadoop/hive/ql/exec/MoveTask.java | 2 +- .../apache/hadoop/hive/ql/exec/StatsTask.java | 4 +- .../apache/hadoop/hive/ql/exec/Utilities.java | 2 +- .../hadoop/hive/ql/exec/tez/DagUtils.java | 4 +- .../hadoop/hive/ql/io/HiveInputFormat.java | 1 - .../apache/hadoop/hive/ql/metadata/Hive.java | 15 +- .../hadoop/hive/ql/metadata/Partition.java | 11 +- .../ql/metadata/SessionHiveMetaStoreClient.java | 11 +- .../apache/hadoop/hive/ql/metadata/Table.java | 9 +- .../formatting/TextMetaDataFormatter.java | 2 +- .../ql/optimizer/AbstractBucketJoinProc.java | 1 - .../BucketingSortingReduceSinkOptimizer.java | 1 - .../hadoop/hive/ql/optimizer/SamplePruner.java | 1 - .../hive/ql/optimizer/StatsOptimizer.java | 2 +- .../optimizer/physical/SamplingOptimizer.java | 1 - .../hive/ql/parse/DDLSemanticAnalyzer.java | 2 +- .../hive/ql/parse/ExportSemanticAnalyzer.java | 33 - .../hive/ql/parse/ImportSemanticAnalyzer.java | 1 - .../hadoop/hive/ql/parse/SemanticAnalyzer.java | 21 +- .../hadoop/hive/ql/plan/CreateTableDesc.java | 2 +- .../hadoop/hive/ql/plan/FileSinkDesc.java | 1 - .../hadoop/hive/ql/plan/LoadTableDesc.java | 1 - .../hadoop/hive/ql/plan/PartitionDesc.java | 4 +- .../apache/hadoop/hive/ql/plan/PlanUtils.java | 13 +- .../AuthorizationPreEventListener.java | 2 +- .../hadoop/hive/ql/stats/BasicStatsTask.java | 4 +- .../hadoop/hive/ql/txn/compactor/Initiator.java | 1 - .../apache/hadoop/hive/ql/TestTxnCommands.java | 3 +- service/pom.xml | 2 +- .../thrift/EmbeddedThriftBinaryCLIService.java | 2 +- .../apache/hive/service/server/HiveServer2.java | 2 +- .../thrift/ThriftCliServiceTestWithCookie.java | 1 - standalone-metastore/pom.xml | 29 +- .../hadoop/hive/metastore/ColumnType.java | 63 +- .../hadoop/hive/metastore/HiveAlterHandler.java | 16 +- .../hive/metastore/HiveMetaStoreClient.java | 2749 +++++++++++++++++ .../hadoop/hive/metastore/IMetaStoreClient.java | 1825 ++++++++++++ .../hadoop/hive/metastore/RawStoreProxy.java | 2 +- .../hive/metastore/RetryingMetaStoreClient.java | 341 +++ .../hive/metastore/conf/MetastoreConf.java | 16 + .../hive/metastore/messaging/EventUtils.java | 202 ++ .../messaging/event/filters/AndFilter.java | 39 + .../messaging/event/filters/BasicFilter.java | 33 + .../event/filters/DatabaseAndTableFilter.java | 52 + .../event/filters/EventBoundaryFilter.java | 34 + .../event/filters/MessageFormatFilter.java | 36 + .../hive/metastore/tools/HiveMetaTool.java | 484 +++ .../hadoop/hive/metastore/utils/FileUtils.java | 29 + .../hive/metastore/utils/MetaStoreUtils.java | 511 +++- .../hive/metastore/utils/SecurityUtils.java | 26 + .../metastore/AlternateFailurePreListener.java | 62 + .../metastore/DummyEndFunctionListener.java | 47 + .../hadoop/hive/metastore/DummyListener.java | 144 + .../metastore/DummyMetaStoreInitListener.java | 39 + .../hadoop/hive/metastore/DummyPreListener.java | 49 + .../DummyRawStoreControlledCommit.java | 1053 +++++++ .../InjectableBehaviourObjectStore.java | 104 + .../hive/metastore/IpAddressListener.java | 102 + .../hive/metastore/MetaStoreTestUtils.java | 208 ++ .../MockPartitionExpressionForMetastore.java | 58 + .../metastore/TestHiveMetaStoreGetMetaConf.java | 137 + .../TestHiveMetaStorePartitionSpecs.java | 407 +++ .../metastore/TestHiveMetaStoreTimeout.java | 140 + .../TestMetaStoreConnectionUrlHook.java | 3 +- .../hadoop/hive/metastore/TestOldSchema.java | 218 ++ .../hive/metastore/VerifyingObjectStore.java | 217 ++ 149 files changed, 9833 insertions(+), 10128 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/AccumuloStorageHandler.java ---------------------------------------------------------------------- diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/AccumuloStorageHandler.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/AccumuloStorageHandler.java index 5391a99..872f12b 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/AccumuloStorageHandler.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/AccumuloStorageHandler.java @@ -32,10 +32,10 @@ import org.apache.hadoop.hive.accumulo.serde.AccumuloIndexParameters; import org.apache.hadoop.hive.accumulo.serde.AccumuloSerDe; import org.apache.hadoop.hive.accumulo.serde.AccumuloSerDeParameters; import org.apache.hadoop.hive.metastore.HiveMetaHook; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.metadata.HiveStoragePredicateHandler; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java ---------------------------------------------------------------------- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java index 8117633..fe66a44 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java @@ -42,10 +42,10 @@ import org.apache.hadoop.hive.druid.security.KerberosHttpClient; import org.apache.hadoop.hive.druid.serde.DruidSerDe; import org.apache.hadoop.hive.metastore.DefaultHiveMetaHook; import org.apache.hadoop.hive.metastore.HiveMetaHook; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.Table; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.metadata.HiveStorageHandler; import org.apache.hadoop.hive.ql.plan.TableDesc; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseMetaHook.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseMetaHook.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseMetaHook.java index 9fe07af..cd19a4f 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseMetaHook.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseMetaHook.java @@ -28,9 +28,9 @@ import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hive.metastore.HiveMetaHook; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.Table; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.util.StringUtils; import java.io.Closeable; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java ---------------------------------------------------------------------- diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java index 0a3788f..276ffcf 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java @@ -42,6 +42,7 @@ import org.apache.hadoop.hive.hbase.ColumnMappings.ColumnMapping; import org.apache.hadoop.hive.metastore.HiveMetaHook; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.exec.FunctionRegistry; import org.apache.hadoop.hive.ql.index.IndexPredicateAnalyzer; import org.apache.hadoop.hive.ql.index.IndexSearchCondition; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/core/pom.xml ---------------------------------------------------------------------- diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml index 94e9fbe..560e438 100644 --- a/hcatalog/core/pom.xml +++ b/hcatalog/core/pom.xml @@ -69,7 +69,7 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java ---------------------------------------------------------------------- diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java index c1b63d9..3569ffc 100644 --- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java +++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java @@ -76,7 +76,7 @@ class HiveClientCache { // Since HiveMetaStoreClient is not threadsafe, hive clients are not shared across threads. // Thread local variable containing each thread's unique ID, is used as one of the keys for the cache - // causing each thread to get a different client even if the hiveConf is same. + // causing each thread to get a different client even if the conf is same. private static final ThreadLocal<Integer> threadId = new ThreadLocal<Integer>() { @Override http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputCommitterContainer.java ---------------------------------------------------------------------- diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputCommitterContainer.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputCommitterContainer.java index 04d78ee..39a4d2d 100644 --- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputCommitterContainer.java +++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputCommitterContainer.java @@ -38,7 +38,6 @@ import org.apache.hadoop.hive.common.FileUtils; import org.apache.hadoop.hive.common.StatsSetupConst; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.IMetaStoreClient; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.InvalidOperationException; @@ -610,7 +609,8 @@ class FileOutputCommitterContainer extends OutputCommitterContainer { } } else { - if(immutable && fs.exists(finalOutputPath) && !MetaStoreUtils.isDirEmpty(fs, finalOutputPath)) { + if(immutable && fs.exists(finalOutputPath) && + !org.apache.hadoop.hive.metastore.utils.FileUtils.isDirEmpty(fs, finalOutputPath)) { throw new HCatException(ErrorType.ERROR_DUPLICATE_PARTITION, "Data already exists in " + finalOutputPath + ", duplicate publish not possible."); http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputFormatContainer.java ---------------------------------------------------------------------- diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputFormatContainer.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputFormatContainer.java index 3ecb608..10eda77 100644 --- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputFormatContainer.java +++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputFormatContainer.java @@ -23,7 +23,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.IMetaStoreClient; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; +import org.apache.hadoop.hive.metastore.utils.FileUtils; import org.apache.hadoop.hive.ql.metadata.HiveStorageHandler; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.MetaException; @@ -202,7 +202,7 @@ class FileOutputFormatContainer extends OutputFormatContainer { Path tablePath = new Path(table.getTTable().getSd().getLocation()); FileSystem fs = tablePath.getFileSystem(context.getConfiguration()); - if (!MetaStoreUtils.isDirEmpty(fs,tablePath)){ + if (!FileUtils.isDirEmpty(fs,tablePath)){ throw new HCatException(ErrorType.ERROR_NON_EMPTY_TABLE, table.getDbName() + "." + table.getTableName()); } http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/InternalUtil.java ---------------------------------------------------------------------- diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/InternalUtil.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/InternalUtil.java index 8fd676f..6c4c5e1 100644 --- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/InternalUtil.java +++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/InternalUtil.java @@ -20,10 +20,10 @@ package org.apache.hive.hcatalog.mapreduce; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.hadoop.hive.metastore.api.StorageDescriptor; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.metadata.Table; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.Deserializer; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java ---------------------------------------------------------------------- diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java index e5aa2b8..bce246f 100644 --- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java +++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java @@ -32,7 +32,6 @@ import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.HiveMetaStoreClient; import org.apache.hadoop.hive.metastore.MetaStoreTestUtils; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.Database; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java ---------------------------------------------------------------------- diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java index 6711a3e..091efb6 100644 --- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java +++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java @@ -37,7 +37,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.HiveMetaStoreClient; import org.apache.hadoop.hive.metastore.MetaStoreTestUtils; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.SerDeInfo; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java ---------------------------------------------------------------------- diff --git a/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java b/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java index ec5d1c4..67fc34d 100644 --- a/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java +++ b/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java @@ -27,7 +27,6 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; -import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.HiveMetaStore.HMSHandler; import org.apache.hadoop.hive.metastore.MetaStoreEventListenerConstants; import org.apache.hadoop.hive.metastore.RawStore; @@ -46,6 +45,8 @@ import org.apache.hadoop.hive.metastore.api.SQLNotNullConstraint; import org.apache.hadoop.hive.metastore.api.SQLPrimaryKey; import org.apache.hadoop.hive.metastore.api.SQLUniqueConstraint; import org.apache.hadoop.hive.metastore.api.Table; +import org.apache.hadoop.hive.metastore.conf.MetastoreConf; +import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.apache.hadoop.hive.metastore.events.AddForeignKeyEvent; import org.apache.hadoop.hive.metastore.events.AddIndexEvent; import org.apache.hadoop.hive.metastore.events.AddNotNullConstraintEvent; @@ -92,27 +93,22 @@ public class DbNotificationListener extends TransactionalMetaStoreEventListener private static final Logger LOG = LoggerFactory.getLogger(DbNotificationListener.class.getName()); private static CleanerThread cleaner = null; - // This is the same object as super.conf, but it's convenient to keep a copy of it as a - // HiveConf rather than a Configuration. - private HiveConf hiveConf; + private Configuration conf; private MessageFactory msgFactory; - private synchronized void init(HiveConf conf) throws MetaException { + private synchronized void init(Configuration conf) throws MetaException { if (cleaner == null) { cleaner = new CleanerThread(conf, RawStoreProxy.getProxy(conf, conf, - conf.getVar(HiveConf.ConfVars.METASTORE_RAW_STORE_IMPL), 999999)); + MetastoreConf.getVar(conf, ConfVars.RAW_STORE_IMPL), 999999)); cleaner.start(); } } public DbNotificationListener(Configuration config) throws MetaException { super(config); - // The code in MetastoreUtils.getMetaStoreListeners() that calls this looks for a constructor - // with a Configuration parameter, so we have to declare config as Configuration. But it - // actually passes a HiveConf, which we need. So we'll do this ugly down cast. - hiveConf = (HiveConf)config; - init(hiveConf); + conf = config; + init(conf); msgFactory = MessageFactory.getInstance(); } @@ -123,14 +119,17 @@ public class DbNotificationListener extends TransactionalMetaStoreEventListener @Override public void onConfigChange(ConfigChangeEvent tableEvent) throws MetaException { String key = tableEvent.getKey(); - if (key.equals(HiveConf.ConfVars.METASTORE_EVENT_DB_LISTENER_TTL.toString())) { - // This weirdness of setting it in our hiveConf and then reading back does two things. + if (key.equals(ConfVars.EVENT_DB_LISTENER_TTL.toString()) || + key.equals(ConfVars.EVENT_DB_LISTENER_TTL.getHiveName())) { + // This weirdness of setting it in our conf and then reading back does two things. // One, it handles the conversion of the TimeUnit. Two, it keeps the value around for // later in case we need it again. - hiveConf.set(HiveConf.ConfVars.METASTORE_EVENT_DB_LISTENER_TTL.name(), - tableEvent.getNewValue()); - cleaner.setTimeToLive(hiveConf.getTimeVar(HiveConf.ConfVars.METASTORE_EVENT_DB_LISTENER_TTL, - TimeUnit.SECONDS)); + long time = MetastoreConf.convertTimeStr(tableEvent.getNewValue(), TimeUnit.SECONDS, + TimeUnit.SECONDS); + MetastoreConf.setTimeVar(getConf(), MetastoreConf.ConfVars.EVENT_DB_LISTENER_TTL, time, + TimeUnit.SECONDS); + cleaner.setTimeToLive(MetastoreConf.getTimeVar(getConf(), + MetastoreConf.ConfVars.EVENT_DB_LISTENER_TTL, TimeUnit.SECONDS)); } } @@ -205,7 +204,7 @@ public class DbNotificationListener extends TransactionalMetaStoreEventListener try { if (locString != null) { Path loc = new Path(locString); - fs = loc.getFileSystem(hiveConf); + fs = loc.getFileSystem(conf); files = fs.listStatus(loc, VALID_FILES_FILTER); } } catch (IOException e) { @@ -573,7 +572,7 @@ public class DbNotificationListener extends TransactionalMetaStoreEventListener event.setMessageFormat(msgFactory.getMessageFormat()); LOG.debug("DbNotificationListener: Processing : {}:{}", event.getEventId(), event.getMessage()); - HMSHandler.getMSForConf(hiveConf).addNotificationEvent(event); + HMSHandler.getMSForConf(conf).addNotificationEvent(event); // Set the DB_NOTIFICATION_EVENT_ID for future reference by other listeners. if (event.isSetEventId()) { @@ -588,10 +587,10 @@ public class DbNotificationListener extends TransactionalMetaStoreEventListener private int ttl; static private long sleepTime = 60000; - CleanerThread(HiveConf conf, RawStore rs) { + CleanerThread(Configuration conf, RawStore rs) { super("CleanerThread"); this.rs = rs; - setTimeToLive(conf.getTimeVar(HiveConf.ConfVars.METASTORE_EVENT_DB_LISTENER_TTL, + setTimeToLive(MetastoreConf.getTimeVar(conf, ConfVars.EVENT_DB_LISTENER_TTL, TimeUnit.SECONDS)); setDaemon(true); } http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java ---------------------------------------------------------------------- diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java index 58fba4f..bd73f29 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java @@ -20,11 +20,10 @@ package org.apache.hive.hcatalog.streaming; import com.google.common.annotations.VisibleForTesting; -import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.conf.HiveConf; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.serde2.AbstractSerDe; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/StrictJsonWriter.java ---------------------------------------------------------------------- diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/StrictJsonWriter.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/StrictJsonWriter.java index 13756e2..7cfddfa 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/StrictJsonWriter.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/StrictJsonWriter.java @@ -19,8 +19,8 @@ package org.apache.hive.hcatalog.streaming; import org.apache.hadoop.hive.conf.HiveConf; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.api.Table; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.serde2.AbstractSerDe; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeUtils; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/StrictRegexWriter.java ---------------------------------------------------------------------- diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/StrictRegexWriter.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/StrictRegexWriter.java index 78987ab..736893b 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/StrictRegexWriter.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/StrictRegexWriter.java @@ -25,9 +25,9 @@ import java.util.Properties; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.hive.conf.HiveConf; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.Table; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.AbstractSerDe; import org.apache.hadoop.hive.serde2.RegexSerDe; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/webhcat/java-client/pom.xml ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/java-client/pom.xml b/hcatalog/webhcat/java-client/pom.xml index ea51854..5693157 100644 --- a/hcatalog/webhcat/java-client/pom.xml +++ b/hcatalog/webhcat/java-client/pom.xml @@ -76,7 +76,7 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatClientHMSImpl.java ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatClientHMSImpl.java b/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatClientHMSImpl.java index 17b9d03..5f7128d 100644 --- a/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatClientHMSImpl.java +++ b/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatClientHMSImpl.java @@ -29,7 +29,6 @@ import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hive.common.ObjectPair; import org.apache.hadoop.hive.common.classification.InterfaceAudience; import org.apache.hadoop.hive.common.classification.InterfaceStability; import org.apache.hadoop.hive.conf.HiveConf; @@ -52,6 +51,7 @@ import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.api.UnknownDBException; import org.apache.hadoop.hive.metastore.api.UnknownTableException; +import org.apache.hadoop.hive.metastore.utils.ObjectPair; import org.apache.hadoop.hive.ql.exec.FunctionRegistry; import org.apache.hadoop.hive.ql.exec.SerializationUtilities; import org.apache.hadoop.hive.ql.parse.SemanticException; @@ -584,8 +584,7 @@ public class HCatClientHMSImpl extends HCatClient { throws SemanticException, TException { LOG.info("HCatClient: Dropping partitions using partition-predicate Expressions."); ExprNodeGenericFuncDesc partitionExpression = new ExpressionBuilder(table, partitionSpec).build(); - ObjectPair<Integer, byte[]> serializedPartitionExpression = - new ObjectPair<Integer, byte[]>(partitionSpec.size(), + ObjectPair<Integer, byte[]> serializedPartitionExpression = new ObjectPair<>(partitionSpec.size(), SerializationUtilities.serializeExpressionToKryo(partitionExpression)); hmsClient.dropPartitions(table.getDbName(), table.getTableName(), Arrays.asList(serializedPartitionExpression), deleteData && !isExternal(table), // Delete data? http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/hcatalog/webhcat/svr/pom.xml ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml index 6bceee1..a22bc22 100644 --- a/hcatalog/webhcat/svr/pom.xml +++ b/hcatalog/webhcat/svr/pom.xml @@ -197,7 +197,7 @@ <!-- test inter-project --> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hcatalog-unit/pom.xml ---------------------------------------------------------------------- diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml index 2a2f845..433147a 100644 --- a/itests/hcatalog-unit/pom.xml +++ b/itests/hcatalog-unit/pom.xml @@ -98,7 +98,7 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/ManyMiniCluster.java ---------------------------------------------------------------------- diff --git a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/ManyMiniCluster.java b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/ManyMiniCluster.java index ad44bc2..2fe4045 100644 --- a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/ManyMiniCluster.java +++ b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/ManyMiniCluster.java @@ -310,8 +310,8 @@ public class ManyMiniCluster { System.setProperty("derby.stream.error.file", derbyLogFile.getPath()); -// Driver driver = new Driver(hiveConf); -// SessionState.start(new CliSessionState(hiveConf)); +// Driver driver = new Driver(conf); +// SessionState.start(new CliSessionState(conf)); hiveMetaStoreClient = new HiveMetaStoreClient(hiveConf); } http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-blobstore/pom.xml ---------------------------------------------------------------------- diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml index d1c732d..fadb4f2 100644 --- a/itests/hive-blobstore/pom.xml +++ b/itests/hive-blobstore/pom.xml @@ -55,13 +55,13 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-minikdc/pom.xml ---------------------------------------------------------------------- diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml index 689e679..337535a 100644 --- a/itests/hive-minikdc/pom.xml +++ b/itests/hive-minikdc/pom.xml @@ -74,13 +74,13 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit-hadoop2/pom.xml ---------------------------------------------------------------------- diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml index f862dac..ebf81c9 100644 --- a/itests/hive-unit-hadoop2/pom.xml +++ b/itests/hive-unit-hadoop2/pom.xml @@ -76,7 +76,7 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <classifier>tests</classifier> </dependency> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/pom.xml ---------------------------------------------------------------------- diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml index 3a435a8..73a454f 100644 --- a/itests/hive-unit/pom.xml +++ b/itests/hive-unit/pom.xml @@ -161,7 +161,7 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <classifier>tests</classifier> </dependency> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/AbstractTestAuthorizationApiAuthorizer.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/AbstractTestAuthorizationApiAuthorizer.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/AbstractTestAuthorizationApiAuthorizer.java index bd8332c..f8ed419 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/AbstractTestAuthorizationApiAuthorizer.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/AbstractTestAuthorizationApiAuthorizer.java @@ -32,6 +32,7 @@ import org.apache.hadoop.hive.metastore.api.PrincipalType; import org.apache.hadoop.hive.metastore.api.PrivilegeBag; import org.apache.hadoop.hive.metastore.api.Role; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.security.authorization.MetaStoreAuthzAPIAuthorizerEmbedOnly; import org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java index 8366fab..91fc706 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java @@ -37,6 +37,7 @@ import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.hadoop.hive.metastore.api.PartitionSpec; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.Driver; import org.apache.hadoop.hive.ql.session.SessionState; import org.junit.AfterClass; @@ -44,8 +45,11 @@ import org.junit.BeforeClass; import org.junit.Test; import com.google.common.collect.Lists; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestFilterHooks { + private static final Logger LOG = LoggerFactory.getLogger(TestFilterHooks.class); public static class DummyMetaStoreFilterHookImpl extends DefaultMetaStoreFilterHookImpl { public static boolean blockResults = false; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java index 98dad7a..f344c47 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java @@ -81,6 +81,7 @@ import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.api.Type; import org.apache.hadoop.hive.metastore.api.UnknownDBException; import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.exec.Utilities; import org.apache.hadoop.hive.ql.io.HiveInputFormat; import org.apache.hadoop.hive.ql.io.HiveOutputFormat; @@ -1270,7 +1271,7 @@ public abstract class TestHiveMetaStore extends TestCase { new FieldSchema("name", serdeConstants.STRING_TYPE_NAME, "")); fam.getFields().add( new FieldSchema("members", - MetaStoreUtils.getListType(typ1.getName()), "")); + ColumnType.getListType(typ1.getName()), "")); ret = client.createType(fam); assertTrue("Unable to create type " + fam.getName(), ret); http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java index 5267dca..c29a34d 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java @@ -43,6 +43,7 @@ import org.apache.hadoop.hive.metastore.events.DropPartitionEvent; import org.apache.hadoop.hive.metastore.events.DropTableEvent; import org.apache.hadoop.hive.metastore.events.ListenerEvent; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.io.HiveInputFormat; import org.apache.hadoop.hive.ql.io.HiveOutputFormat; import org.apache.hadoop.hive.ql.session.SessionState; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java index e3c9a4e..c541193 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hive.metastore; import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; public class TestMarkPartitionRemote extends TestMarkPartition { http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreAuthorization.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreAuthorization.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreAuthorization.java index 1bf76b5..e7b899b 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreAuthorization.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreAuthorization.java @@ -33,6 +33,7 @@ import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; public class TestMetaStoreAuthorization extends TestCase { http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java index 3bb340e..e44cfca 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java @@ -28,6 +28,7 @@ import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; import org.apache.hadoop.hive.ql.Driver; import org.apache.hadoop.hive.ql.session.SessionState; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; /** * TestMetaStoreEventListener. Test case for http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java index 7219774..e803106 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java @@ -64,6 +64,7 @@ import org.apache.hadoop.hive.metastore.events.PreDropTableEvent; import org.apache.hadoop.hive.metastore.events.PreEventContext; import org.apache.hadoop.hive.metastore.events.PreLoadPartitionDoneEvent; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.Driver; import org.apache.hadoop.hive.ql.processors.SetProcessor; import org.apache.hadoop.hive.ql.session.SessionState; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java index a905324..9623fed 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hive.cli.CliSessionState; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.events.ListenerEvent; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.Driver; import org.apache.hadoop.hive.ql.session.SessionState; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java index 3d58819..4982313 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java @@ -23,6 +23,7 @@ import junit.framework.TestCase; import org.apache.hadoop.hive.cli.CliSessionState; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.Driver; import org.apache.hadoop.hive.ql.session.SessionState; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java index b4d258c..11ebf4d 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java @@ -23,6 +23,7 @@ import junit.framework.TestCase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; /** * Test for unwrapping InvocationTargetException, which is thrown from http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMetrics.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMetrics.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMetrics.java index 9d241a8..6f5a963 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMetrics.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMetrics.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.metrics.Metrics; import org.apache.hadoop.hive.metastore.metrics.MetricsConstants; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.Driver; import org.apache.hadoop.hive.ql.session.SessionState; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java index d4a809f..ec84e66 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java @@ -21,6 +21,7 @@ package org.apache.hadoop.hive.metastore; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; public class TestRemoteHiveMetaStore extends TestHiveMetaStore { http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java index 9ba1d75..c7c35f3 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.util.StringUtils; /** http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java index 2b7c5a1..dfd80bc 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java @@ -34,6 +34,7 @@ import org.apache.hadoop.hive.metastore.api.SerDeInfo; import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.io.HiveInputFormat; import org.apache.hadoop.hive.ql.io.HiveOutputFormat; import org.apache.hadoop.hive.serde.serdeConstants; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenarios.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenarios.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenarios.java index 5854116..55acd1d 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenarios.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenarios.java @@ -48,6 +48,7 @@ import org.apache.hadoop.hive.metastore.messaging.event.filters.AndFilter; import org.apache.hadoop.hive.metastore.messaging.event.filters.DatabaseAndTableFilter; import org.apache.hadoop.hive.metastore.messaging.event.filters.EventBoundaryFilter; import org.apache.hadoop.hive.metastore.messaging.event.filters.MessageFormatFilter; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.CommandNeedRetryException; import org.apache.hadoop.hive.ql.Driver; import org.apache.hadoop.hive.ql.exec.repl.ReplDumpWork; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestMetastoreAuthorizationProvider.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestMetastoreAuthorizationProvider.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestMetastoreAuthorizationProvider.java index 871cf3d..edb46fd 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestMetastoreAuthorizationProvider.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestMetastoreAuthorizationProvider.java @@ -48,6 +48,8 @@ import org.apache.hadoop.hive.ql.session.SessionState; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.shims.Utils; import org.apache.hadoop.security.UserGroupInformation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * TestHiveMetastoreAuthorizationProvider. Test case for @@ -65,6 +67,8 @@ import org.apache.hadoop.security.UserGroupInformation; * authorization providers like StorageBasedAuthorizationProvider */ public class TestMetastoreAuthorizationProvider extends TestCase { + private static final Logger LOG = LoggerFactory.getLogger(TestMetastoreAuthorizationProvider.class); + protected HiveConf clientHiveConf; protected HiveMetaStoreClient msc; protected Driver driver; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hadoop/hive/serde2/TestSerdeWithFieldComments.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/serde2/TestSerdeWithFieldComments.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/serde2/TestSerdeWithFieldComments.java index bb96a89..63f48f0 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/serde2/TestSerdeWithFieldComments.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/serde2/TestSerdeWithFieldComments.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hive.serde2; import junit.framework.TestCase; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; +import org.apache.hadoop.hive.metastore.HiveMetaStoreUtils; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; @@ -61,7 +61,7 @@ public class TestSerdeWithFieldComments extends TestCase { Deserializer mockDe = mock(Deserializer.class); when(mockDe.getObjectInspector()).thenReturn(mockSOI); List<FieldSchema> result = - MetaStoreUtils.getFieldsFromDeserializer("testTable", mockDe); + HiveMetaStoreUtils.getFieldsFromDeserializer("testTable", mockDe); assertEquals(2, result.size()); assertEquals("first", result.get(0).getName()); http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftCliServiceMessageSize.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftCliServiceMessageSize.java b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftCliServiceMessageSize.java index 0948efc..147f53b 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftCliServiceMessageSize.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftCliServiceMessageSize.java @@ -17,6 +17,13 @@ */ package org.apache.hive.service.cli.thrift; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.Statement; + import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.MetaStoreTestUtils; @@ -28,13 +35,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.Statement; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - public class TestThriftCliServiceMessageSize { protected static int port; protected static String host = "localhost"; http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/qtest-accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml index 29ea428..eae436b 100644 --- a/itests/qtest-accumulo/pom.xml +++ b/itests/qtest-accumulo/pom.xml @@ -67,13 +67,13 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/qtest-spark/pom.xml ---------------------------------------------------------------------- diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml index b9b17b6..4b25223 100644 --- a/itests/qtest-spark/pom.xml +++ b/itests/qtest-spark/pom.xml @@ -121,13 +121,13 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/qtest/pom.xml ---------------------------------------------------------------------- diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index 7f7d5f3..1ac6b30 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -58,13 +58,13 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/itests/util/pom.xml ---------------------------------------------------------------------- diff --git a/itests/util/pom.xml b/itests/util/pom.xml index 16118b5..d311507 100644 --- a/itests/util/pom.xml +++ b/itests/util/pom.xml @@ -107,7 +107,7 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <type>test-jar</type> </dependency> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/llap-server/pom.xml ---------------------------------------------------------------------- diff --git a/llap-server/pom.xml b/llap-server/pom.xml index 176110d..61ccbd4 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -268,7 +268,7 @@ <!-- test intra-project --> <dependency> <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> + <artifactId>hive-standalone-metastore</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hive/blob/d79c4595/metastore/pom.xml ---------------------------------------------------------------------- diff --git a/metastore/pom.xml b/metastore/pom.xml index 12c01b6..21c607f 100644 --- a/metastore/pom.xml +++ b/metastore/pom.xml @@ -268,17 +268,6 @@ <plugins> <!-- plugins are always listed in sorted order by groupId, artifectId --> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions>
