From 702f1f6b8dc787f518fd79e0d53fd09e2ff0937b Mon Sep 17 00:00:00 2001 From: Alexander Kolbasov Date: Tue, 17 Jul 2018 12:24:42 -0700 Subject: [PATCH 1/1] HIVE-20188: Split server-specific code outside of standalone metastore-common --- .gitignore | 1 + hcatalog/core/pom.xml | 7 + hcatalog/webhcat/java-client/pom.xml | 7 + hcatalog/webhcat/svr/pom.xml | 7 + itests/hcatalog-unit/pom.xml | 6 + itests/hive-blobstore/pom.xml | 13 + itests/hive-minikdc/pom.xml | 13 + itests/hive-unit-hadoop2/pom.xml | 6 + itests/hive-unit/pom.xml | 8 +- itests/qtest-accumulo/pom.xml | 13 + itests/qtest-spark/pom.xml | 13 + itests/qtest/pom.xml | 13 + itests/util/pom.xml | 6 + llap-server/pom.xml | 7 + metastore/pom.xml | 5 + packaging/src/main/assembly/bin.xml | 2 +- packaging/src/main/assembly/src.xml | 1 + ql/pom.xml | 8 + service/pom.xml | 7 + standalone-metastore/metastore-common/pom.xml | 128 ---- .../metastore-common/src/assembly/bin.xml | 28 - .../hive/metastore/minihms/package-info.java | 23 - standalone-metastore/metastore-server/pom.xml | 684 +++++++++++++++++++++ .../metastore-server/src/assembly/bin.xml | 136 ++++ .../metastore-server/src/assembly/src.xml | 53 ++ .../apache/hadoop/hive/common/StatsSetupConst.java | 0 .../hive/common/ndv/NumDistinctValueEstimator.java | 0 .../ndv/NumDistinctValueEstimatorFactory.java | 0 .../apache/hadoop/hive/common/ndv/fm/FMSketch.java | 0 .../hadoop/hive/common/ndv/fm/FMSketchUtils.java | 0 .../hadoop/hive/common/ndv/hll/HLLConstants.java | 0 .../hive/common/ndv/hll/HLLDenseRegister.java | 0 .../hadoop/hive/common/ndv/hll/HLLRegister.java | 0 .../hive/common/ndv/hll/HLLSparseRegister.java | 0 .../hadoop/hive/common/ndv/hll/HyperLogLog.java | 0 .../hive/common/ndv/hll/HyperLogLogUtils.java | 0 .../hadoop/hive/metastore/AcidEventListener.java | 0 .../hadoop/hive/metastore/AggregateStatsCache.java | 0 .../apache/hadoop/hive/metastore/AlterHandler.java | 0 .../apache/hadoop/hive/metastore/Batchable.java | 0 .../apache/hadoop/hive/metastore/ColumnType.java | 0 .../hadoop/hive/metastore/DatabaseProduct.java | 0 .../org/apache/hadoop/hive/metastore/Deadline.java | 0 .../hadoop/hive/metastore/DeadlineException.java | 0 .../metastore/DefaultPartitionExpressionProxy.java | 0 .../hive/metastore/DefaultStorageSchemaReader.java | 0 .../hadoop/hive/metastore/FileMetadataHandler.java | 0 .../hadoop/hive/metastore/FileMetadataManager.java | 0 .../hadoop/hive/metastore/HMSMetricsListener.java | 0 .../hadoop/hive/metastore/HiveAlterHandler.java | 0 .../hadoop/hive/metastore/HiveMetaStore.java | 0 .../hadoop/hive/metastore/HiveMetaStoreClient.java | 0 .../hadoop/hive/metastore/HiveMetaStoreFsImpl.java | 0 .../hive/metastore/IExtrapolatePartStatus.java | 0 .../apache/hadoop/hive/metastore/IHMSHandler.java | 0 .../hadoop/hive/metastore/IMetaStoreClient.java | 0 .../hive/metastore/IMetaStoreSchemaInfo.java | 0 .../metastore/LinearExtrapolatePartStatus.java | 0 .../hive/metastore/LockComponentBuilder.java | 0 .../hadoop/hive/metastore/LockRequestBuilder.java | 0 .../MaterializationsRebuildLockCleanerTask.java | 0 .../MaterializationsRebuildLockHandler.java | 0 .../hadoop/hive/metastore/MetaStoreDirectSql.java | 0 .../metastore/MetaStoreEndFunctionContext.java | 0 .../metastore/MetaStoreEndFunctionListener.java | 0 .../hive/metastore/MetaStoreEventListener.java | 0 .../metastore/MetaStoreEventListenerConstants.java | 0 .../apache/hadoop/hive/metastore/MetaStoreFS.java | 0 .../hadoop/hive/metastore/MetaStoreInit.java | 0 .../hive/metastore/MetaStoreInitContext.java | 0 .../hive/metastore/MetaStoreInitListener.java | 0 .../hive/metastore/MetaStoreListenerNotifier.java | 0 .../hive/metastore/MetaStorePreEventListener.java | 0 .../hadoop/hive/metastore/MetaStoreSchemaInfo.java | 0 .../hive/metastore/MetaStoreSchemaInfoFactory.java | 0 .../hadoop/hive/metastore/MetaStoreThread.java | 0 .../hadoop/hive/metastore/MetadataStore.java | 0 .../hadoop/hive/metastore/MetastoreTaskThread.java | 0 .../apache/hadoop/hive/metastore/ObjectStore.java | 0 .../hadoop/hive/metastore/PartFilterExprUtil.java | 0 .../hive/metastore/PartitionExpressionProxy.java | 0 .../org/apache/hadoop/hive/metastore/RawStore.java | 0 .../hadoop/hive/metastore/RawStoreProxy.java | 0 .../hadoop/hive/metastore/ReplChangeManager.java | 0 .../hadoop/hive/metastore/RetryingHMSHandler.java | 0 .../hive/metastore/RetryingMetaStoreClient.java | 0 .../hive/metastore/RuntimeStatsCleanerTask.java | 0 .../hive/metastore/SessionPropertiesListener.java | 0 .../hadoop/hive/metastore/StatObjectConverter.java | 0 .../hive/metastore/TServerSocketKeepAlive.java | 0 .../hive/metastore/TSetIpAddressProcessor.java | 0 .../hadoop/hive/metastore/TUGIBasedProcessor.java | 0 .../hadoop/hive/metastore/TableIterable.java | 0 .../apache/hadoop/hive/metastore/ThreadPool.java | 0 .../TransactionalMetaStoreEventListener.java | 0 .../metastore/TransactionalValidationListener.java | 0 .../apache/hadoop/hive/metastore/Warehouse.java | 0 .../hive/metastore/api/utils/DecimalUtils.java | 0 .../hive/metastore/cache/ByteArrayWrapper.java | 0 .../hadoop/hive/metastore/cache/CacheUtils.java | 0 .../hadoop/hive/metastore/cache/CachedStore.java | 0 .../hadoop/hive/metastore/cache/SharedCache.java | 0 .../metastore/client/builder/CatalogBuilder.java | 0 .../client/builder/ConstraintBuilder.java | 0 .../metastore/client/builder/DatabaseBuilder.java | 0 .../metastore/client/builder/FunctionBuilder.java | 0 .../GrantRevokePrivilegeRequestBuilder.java | 0 .../client/builder/HiveObjectPrivilegeBuilder.java | 0 .../client/builder/HiveObjectRefBuilder.java | 0 .../metastore/client/builder/ISchemaBuilder.java | 0 .../metastore/client/builder/PartitionBuilder.java | 0 .../client/builder/PrivilegeGrantInfoBuilder.java | 0 .../hive/metastore/client/builder/RoleBuilder.java | 0 .../client/builder/SQLCheckConstraintBuilder.java | 0 .../builder/SQLDefaultConstraintBuilder.java | 0 .../client/builder/SQLForeignKeyBuilder.java | 0 .../builder/SQLNotNullConstraintBuilder.java | 0 .../client/builder/SQLPrimaryKeyBuilder.java | 0 .../client/builder/SQLUniqueConstraintBuilder.java | 0 .../client/builder/SchemaVersionBuilder.java | 0 .../client/builder/SerdeAndColsBuilder.java | 0 .../client/builder/StorageDescriptorBuilder.java | 0 .../metastore/client/builder/TableBuilder.java | 0 .../aggr/BinaryColumnStatsAggregator.java | 0 .../aggr/BooleanColumnStatsAggregator.java | 0 .../columnstats/aggr/ColumnStatsAggregator.java | 0 .../aggr/ColumnStatsAggregatorFactory.java | 0 .../aggr/DateColumnStatsAggregator.java | 0 .../aggr/DecimalColumnStatsAggregator.java | 0 .../aggr/DoubleColumnStatsAggregator.java | 0 .../columnstats/aggr/IExtrapolatePartStatus.java | 0 .../aggr/LongColumnStatsAggregator.java | 0 .../aggr/StringColumnStatsAggregator.java | 0 .../cache/DateColumnStatsDataInspector.java | 0 .../cache/DecimalColumnStatsDataInspector.java | 0 .../cache/DoubleColumnStatsDataInspector.java | 0 .../cache/LongColumnStatsDataInspector.java | 0 .../cache/StringColumnStatsDataInspector.java | 0 .../columnstats/merge/BinaryColumnStatsMerger.java | 0 .../merge/BooleanColumnStatsMerger.java | 0 .../columnstats/merge/ColumnStatsMerger.java | 0 .../merge/ColumnStatsMergerFactory.java | 0 .../columnstats/merge/DateColumnStatsMerger.java | 0 .../merge/DecimalColumnStatsMerger.java | 0 .../columnstats/merge/DoubleColumnStatsMerger.java | 0 .../columnstats/merge/LongColumnStatsMerger.java | 0 .../columnstats/merge/StringColumnStatsMerger.java | 0 .../hive/metastore/conf/ConfTemplatePrinter.java | 0 .../hadoop/hive/metastore/conf/MetastoreConf.java | 0 .../hadoop/hive/metastore/conf/TimeValidator.java | 0 .../datasource/BoneCPDataSourceProvider.java | 0 .../metastore/datasource/DataSourceProvider.java | 0 .../datasource/DataSourceProviderFactory.java | 0 .../datasource/DbCPDataSourceProvider.java | 0 .../datasource/HikariCPDataSourceProvider.java | 0 .../hive/metastore/datasource/package-info.java | 0 .../hive/metastore/events/AbortTxnEvent.java | 0 .../hive/metastore/events/AcidWriteEvent.java | 0 .../hive/metastore/events/AddForeignKeyEvent.java | 0 .../events/AddNotNullConstraintEvent.java | 0 .../hive/metastore/events/AddPartitionEvent.java | 0 .../hive/metastore/events/AddPrimaryKeyEvent.java | 0 .../metastore/events/AddSchemaVersionEvent.java | 0 .../metastore/events/AddUniqueConstraintEvent.java | 0 .../hive/metastore/events/AllocWriteIdEvent.java | 0 .../hive/metastore/events/AlterCatalogEvent.java | 0 .../hive/metastore/events/AlterDatabaseEvent.java | 0 .../hive/metastore/events/AlterISchemaEvent.java | 0 .../hive/metastore/events/AlterPartitionEvent.java | 0 .../metastore/events/AlterSchemaVersionEvent.java | 0 .../hive/metastore/events/AlterTableEvent.java | 0 .../hive/metastore/events/CommitTxnEvent.java | 0 .../hive/metastore/events/ConfigChangeEvent.java | 0 .../hive/metastore/events/CreateCatalogEvent.java | 0 .../hive/metastore/events/CreateDatabaseEvent.java | 0 .../hive/metastore/events/CreateFunctionEvent.java | 0 .../hive/metastore/events/CreateISchemaEvent.java | 0 .../hive/metastore/events/CreateTableEvent.java | 0 .../hive/metastore/events/DropCatalogEvent.java | 0 .../hive/metastore/events/DropConstraintEvent.java | 0 .../hive/metastore/events/DropDatabaseEvent.java | 0 .../hive/metastore/events/DropFunctionEvent.java | 0 .../hive/metastore/events/DropISchemaEvent.java | 0 .../hive/metastore/events/DropPartitionEvent.java | 0 .../metastore/events/DropSchemaVersionEvent.java | 0 .../hive/metastore/events/DropTableEvent.java | 0 .../hive/metastore/events/EventCleanerTask.java | 0 .../hadoop/hive/metastore/events/InsertEvent.java | 0 .../hive/metastore/events/ListenerEvent.java | 0 .../metastore/events/LoadPartitionDoneEvent.java | 0 .../hadoop/hive/metastore/events/OpenTxnEvent.java | 0 .../metastore/events/PreAddPartitionEvent.java | 0 .../metastore/events/PreAddSchemaVersionEvent.java | 0 .../metastore/events/PreAlterCatalogEvent.java | 0 .../metastore/events/PreAlterDatabaseEvent.java | 0 .../metastore/events/PreAlterISchemaEvent.java | 0 .../metastore/events/PreAlterPartitionEvent.java | 0 .../events/PreAlterSchemaVersionEvent.java | 0 .../hive/metastore/events/PreAlterTableEvent.java | 0 .../events/PreAuthorizationCallEvent.java | 0 .../metastore/events/PreCreateCatalogEvent.java | 0 .../metastore/events/PreCreateDatabaseEvent.java | 0 .../metastore/events/PreCreateISchemaEvent.java | 0 .../hive/metastore/events/PreCreateTableEvent.java | 0 .../hive/metastore/events/PreDropCatalogEvent.java | 0 .../metastore/events/PreDropDatabaseEvent.java | 0 .../hive/metastore/events/PreDropISchemaEvent.java | 0 .../metastore/events/PreDropPartitionEvent.java | 0 .../events/PreDropSchemaVersionEvent.java | 0 .../hive/metastore/events/PreDropTableEvent.java | 0 .../hive/metastore/events/PreEventContext.java | 0 .../events/PreLoadPartitionDoneEvent.java | 0 .../hive/metastore/events/PreReadCatalogEvent.java | 0 .../metastore/events/PreReadDatabaseEvent.java | 0 .../hive/metastore/events/PreReadISchemaEvent.java | 0 .../hive/metastore/events/PreReadTableEvent.java | 0 .../events/PreReadhSchemaVersionEvent.java | 0 .../hive/metastore/hooks/JDOConnectionURLHook.java | 0 .../hive/metastore/messaging/AbortTxnMessage.java | 0 .../hive/metastore/messaging/AcidWriteMessage.java | 0 .../metastore/messaging/AddForeignKeyMessage.java | 0 .../messaging/AddNotNullConstraintMessage.java | 0 .../metastore/messaging/AddPartitionMessage.java | 0 .../metastore/messaging/AddPrimaryKeyMessage.java | 0 .../messaging/AddUniqueConstraintMessage.java | 0 .../metastore/messaging/AllocWriteIdMessage.java | 0 .../metastore/messaging/AlterCatalogMessage.java | 0 .../metastore/messaging/AlterDatabaseMessage.java | 0 .../metastore/messaging/AlterPartitionMessage.java | 0 .../metastore/messaging/AlterTableMessage.java | 0 .../hive/metastore/messaging/CommitTxnMessage.java | 0 .../metastore/messaging/CreateCatalogMessage.java | 0 .../metastore/messaging/CreateDatabaseMessage.java | 0 .../metastore/messaging/CreateFunctionMessage.java | 0 .../metastore/messaging/CreateTableMessage.java | 0 .../metastore/messaging/DropCatalogMessage.java | 0 .../metastore/messaging/DropConstraintMessage.java | 0 .../metastore/messaging/DropDatabaseMessage.java | 0 .../metastore/messaging/DropFunctionMessage.java | 0 .../metastore/messaging/DropPartitionMessage.java | 0 .../hive/metastore/messaging/DropTableMessage.java | 0 .../hive/metastore/messaging/EventMessage.java | 0 .../hive/metastore/messaging/EventUtils.java | 0 .../hive/metastore/messaging/InsertMessage.java | 0 .../metastore/messaging/MessageDeserializer.java | 0 .../hive/metastore/messaging/MessageFactory.java | 0 .../hive/metastore/messaging/OpenTxnMessage.java | 0 .../hive/metastore/messaging/PartitionFiles.java | 0 .../messaging/event/filters/AndFilter.java | 0 .../messaging/event/filters/BasicFilter.java | 0 .../event/filters/DatabaseAndTableFilter.java | 0 .../event/filters/EventBoundaryFilter.java | 0 .../event/filters/MessageFormatFilter.java | 0 .../messaging/json/JSONAbortTxnMessage.java | 0 .../messaging/json/JSONAcidWriteMessage.java | 0 .../messaging/json/JSONAddForeignKeyMessage.java | 0 .../json/JSONAddNotNullConstraintMessage.java | 0 .../messaging/json/JSONAddPartitionMessage.java | 0 .../messaging/json/JSONAddPrimaryKeyMessage.java | 0 .../json/JSONAddUniqueConstraintMessage.java | 0 .../messaging/json/JSONAllocWriteIdMessage.java | 0 .../messaging/json/JSONAlterCatalogMessage.java | 0 .../messaging/json/JSONAlterDatabaseMessage.java | 0 .../messaging/json/JSONAlterPartitionMessage.java | 0 .../messaging/json/JSONAlterTableMessage.java | 0 .../messaging/json/JSONCommitTxnMessage.java | 0 .../messaging/json/JSONCreateCatalogMessage.java | 0 .../messaging/json/JSONCreateDatabaseMessage.java | 0 .../messaging/json/JSONCreateFunctionMessage.java | 0 .../messaging/json/JSONCreateTableMessage.java | 0 .../messaging/json/JSONDropCatalogMessage.java | 0 .../messaging/json/JSONDropConstraintMessage.java | 0 .../messaging/json/JSONDropDatabaseMessage.java | 0 .../messaging/json/JSONDropFunctionMessage.java | 0 .../messaging/json/JSONDropPartitionMessage.java | 0 .../messaging/json/JSONDropTableMessage.java | 0 .../messaging/json/JSONInsertMessage.java | 0 .../messaging/json/JSONMessageDeserializer.java | 0 .../messaging/json/JSONMessageFactory.java | 0 .../messaging/json/JSONOpenTxnMessage.java | 0 .../hive/metastore/metrics/JsonReporter.java | 0 .../hive/metastore/metrics/JvmPauseMonitor.java | 0 .../hadoop/hive/metastore/metrics/Metrics.java | 0 .../hive/metastore/metrics/MetricsConstants.java | 0 .../hadoop/hive/metastore/metrics/PerfLogger.java | 0 .../hadoop/hive/metastore/model/MCatalog.java | 0 .../hive/metastore/model/MColumnDescriptor.java | 0 .../hadoop/hive/metastore/model/MConstraint.java | 0 .../hive/metastore/model/MCreationMetadata.java | 0 .../hadoop/hive/metastore/model/MDBPrivilege.java | 0 .../hadoop/hive/metastore/model/MDatabase.java | 0 .../hive/metastore/model/MDelegationToken.java | 0 .../hadoop/hive/metastore/model/MFieldSchema.java | 0 .../hadoop/hive/metastore/model/MFunction.java | 0 .../hive/metastore/model/MGlobalPrivilege.java | 0 .../hadoop/hive/metastore/model/MISchema.java | 0 .../apache/hadoop/hive/metastore/model/MIndex.java | 0 .../hadoop/hive/metastore/model/MMasterKey.java | 0 .../metastore/model/MMetastoreDBProperties.java | 0 .../hive/metastore/model/MNotificationLog.java | 0 .../hive/metastore/model/MNotificationNextId.java | 0 .../apache/hadoop/hive/metastore/model/MOrder.java | 0 .../hadoop/hive/metastore/model/MPartition.java | 0 .../metastore/model/MPartitionColumnPrivilege.java | 0 .../model/MPartitionColumnStatistics.java | 0 .../hive/metastore/model/MPartitionEvent.java | 0 .../hive/metastore/model/MPartitionPrivilege.java | 0 .../hive/metastore/model/MPrincipalDesc.java | 0 .../hadoop/hive/metastore/model/MResourceUri.java | 0 .../apache/hadoop/hive/metastore/model/MRole.java | 0 .../hadoop/hive/metastore/model/MRoleMap.java | 0 .../hadoop/hive/metastore/model/MRuntimeStat.java | 0 .../hive/metastore/model/MSchemaVersion.java | 0 .../hadoop/hive/metastore/model/MSerDeInfo.java | 0 .../hive/metastore/model/MStorageDescriptor.java | 0 .../hadoop/hive/metastore/model/MStringList.java | 0 .../apache/hadoop/hive/metastore/model/MTable.java | 0 .../metastore/model/MTableColumnPrivilege.java | 0 .../metastore/model/MTableColumnStatistics.java | 0 .../hive/metastore/model/MTablePrivilege.java | 0 .../metastore/model/MTxnWriteNotificationLog.java | 0 .../apache/hadoop/hive/metastore/model/MType.java | 0 .../hadoop/hive/metastore/model/MVersionTable.java | 0 .../hadoop/hive/metastore/model/MWMMapping.java | 0 .../hadoop/hive/metastore/model/MWMPool.java | 0 .../hive/metastore/model/MWMResourcePlan.java | 0 .../hadoop/hive/metastore/model/MWMTrigger.java | 0 .../hive/metastore/parser/ExpressionTree.java | 0 .../apache/hadoop/hive/metastore/parser/Filter.g | 0 .../hadoop/hive/metastore/parser/package-info.java | 0 .../spec/CompositePartitionSpecProxy.java | 0 .../spec/PartitionListComposingSpecProxy.java | 0 .../partition/spec/PartitionSpecProxy.java | 0 .../spec/PartitionSpecWithSharedSDProxy.java | 0 .../hive/metastore/security/DBTokenStore.java | 0 .../security/DelegationTokenIdentifier.java | 0 .../security/DelegationTokenSecretManager.java | 0 .../security/DelegationTokenSelector.java | 0 .../metastore/security/DelegationTokenStore.java | 0 .../metastore/security/DelegationTokenTool.java | 0 .../metastore/security/HadoopThriftAuthBridge.java | 0 .../security/HadoopThriftAuthBridge23.java | 0 .../hive/metastore/security/MemoryTokenStore.java | 0 .../security/MetastoreDelegationTokenManager.java | 0 .../security/TUGIContainingTransport.java | 0 .../TokenStoreDelegationTokenSecretManager.java | 0 .../metastore/security/ZooKeeperTokenStore.java | 0 .../hadoop/hive/metastore/tools/HiveMetaTool.java | 0 .../hive/metastore/tools/HiveSchemaHelper.java | 0 .../hive/metastore/tools/MetastoreSchemaTool.java | 0 .../hadoop/hive/metastore/tools/SQLGenerator.java | 0 .../metastore/tools/SchemaToolCommandLine.java | 0 .../hive/metastore/tools/SchemaToolTask.java | 0 .../tools/SchemaToolTaskAlterCatalog.java | 0 .../tools/SchemaToolTaskCreateCatalog.java | 0 .../metastore/tools/SchemaToolTaskCreateUser.java | 0 .../hive/metastore/tools/SchemaToolTaskInfo.java | 0 .../hive/metastore/tools/SchemaToolTaskInit.java | 0 .../tools/SchemaToolTaskMoveDatabase.java | 0 .../metastore/tools/SchemaToolTaskMoveTable.java | 0 .../metastore/tools/SchemaToolTaskUpgrade.java | 0 .../metastore/tools/SchemaToolTaskValidate.java | 0 .../hadoop/hive/metastore/tools/SmokeTest.java | 0 .../txn/AcidCompactionHistoryService.java | 0 .../hive/metastore/txn/AcidHouseKeeperService.java | 0 .../metastore/txn/AcidOpenTxnsCounterService.java | 0 .../hive/metastore/txn/AcidWriteSetService.java | 0 .../hadoop/hive/metastore/txn/CompactionInfo.java | 0 .../hive/metastore/txn/CompactionTxnHandler.java | 0 .../hadoop/hive/metastore/txn/TxnDbUtil.java | 0 .../hadoop/hive/metastore/txn/TxnHandler.java | 0 .../apache/hadoop/hive/metastore/txn/TxnStore.java | 0 .../apache/hadoop/hive/metastore/txn/TxnUtils.java | 0 .../hive/metastore/utils/CommonCliOptions.java | 0 .../hadoop/hive/metastore/utils/FileUtils.java | 0 .../hadoop/hive/metastore/utils/HdfsUtils.java | 0 .../metastore/utils/HiveStrictManagedUtils.java | 0 .../hadoop/hive/metastore/utils/LogUtils.java | 0 .../hive/metastore/utils/MetaStoreUtils.java | 0 .../hive/metastore/utils/MetastoreVersionInfo.java | 0 .../hadoop/hive/metastore/utils/SecurityUtils.java | 0 .../hadoop/hive/metastore/utils/StringableMap.java | 0 .../main/resources/datanucleus-log4j.properties | 17 + .../src/main/resources/metastore-log4j2.properties | 71 +++ .../src/main/resources/metastore-site.xml | 34 + .../src/main/resources/package.jdo | 0 .../src/main/resources/saveVersion.sh | 91 +++ .../src/main/scripts/base | 6 + .../src/main/scripts/ext/metastore.sh | 2 +- .../src/main/scripts/ext/schemaTool.sh | 2 +- .../src/main/scripts/ext/smokeTest.sh | 2 +- .../src/main/scripts/metastore-config.sh | 0 .../src/main/scripts/schematool | 0 .../src/main/scripts/start-metastore | 0 .../src/main/sql/derby/hive-schema-1.2.0.derby.sql | 0 .../src/main/sql/derby/hive-schema-3.0.0.derby.sql | 0 .../src/main/sql/derby/hive-schema-3.1.0.derby.sql | 0 .../src/main/sql/derby/hive-schema-4.0.0.derby.sql | 0 .../sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql | 0 .../sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql | 0 .../sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql | 0 .../sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql | 0 .../sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql | 0 .../sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql | 0 .../sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql | 0 .../src/main/sql/derby/upgrade.order.derby | 0 .../src/main/sql/mssql/create-user.mssql.sql | 0 .../src/main/sql/mssql/hive-schema-1.2.0.mssql.sql | 0 .../src/main/sql/mssql/hive-schema-3.0.0.mssql.sql | 0 .../src/main/sql/mssql/hive-schema-3.1.0.mssql.sql | 0 .../src/main/sql/mssql/hive-schema-4.0.0.mssql.sql | 0 .../sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql | 0 .../sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql | 0 .../sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql | 0 .../sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql | 0 .../sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql | 0 .../sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql | 0 .../sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql | 0 .../src/main/sql/mssql/upgrade.order.mssql | 0 .../src/main/sql/mysql/create-user.mysql.sql | 0 .../src/main/sql/mysql/hive-schema-1.2.0.mysql.sql | 0 .../src/main/sql/mysql/hive-schema-3.0.0.mysql.sql | 0 .../src/main/sql/mysql/hive-schema-3.1.0.mysql.sql | 0 .../src/main/sql/mysql/hive-schema-4.0.0.mysql.sql | 0 .../sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql | 0 .../sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql | 0 .../sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql | 0 .../sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql | 0 .../sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql | 0 .../sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql | 0 .../sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql | 0 .../src/main/sql/mysql/upgrade.order.mysql | 0 .../src/main/sql/oracle/create-user.oracle.sql | 0 .../main/sql/oracle/hive-schema-1.2.0.oracle.sql | 0 .../main/sql/oracle/hive-schema-3.0.0.oracle.sql | 0 .../main/sql/oracle/hive-schema-3.1.0.oracle.sql | 0 .../main/sql/oracle/hive-schema-4.0.0.oracle.sql | 0 .../sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql | 0 .../sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql | 0 .../sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql | 0 .../sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql | 0 .../sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql | 0 .../sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql | 0 .../sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql | 0 .../src/main/sql/oracle/upgrade.order.oracle | 0 .../src/main/sql/postgres/create-user.postgres.sql | 0 .../sql/postgres/hive-schema-1.2.0.postgres.sql | 0 .../sql/postgres/hive-schema-3.0.0.postgres.sql | 0 .../sql/postgres/hive-schema-3.1.0.postgres.sql | 0 .../sql/postgres/hive-schema-4.0.0.postgres.sql | 0 .../postgres/upgrade-1.2.0-to-2.0.0.postgres.sql | 0 .../postgres/upgrade-2.0.0-to-2.1.0.postgres.sql | 0 .../postgres/upgrade-2.1.0-to-2.2.0.postgres.sql | 0 .../postgres/upgrade-2.2.0-to-2.3.0.postgres.sql | 0 .../postgres/upgrade-2.3.0-to-3.0.0.postgres.sql | 0 .../postgres/upgrade-3.0.0-to-3.1.0.postgres.sql | 0 .../postgres/upgrade-3.1.0-to-4.0.0.postgres.sql | 0 .../src/main/sql/postgres/upgrade.order.postgres | 0 .../hadoop/hive/common/TestStatsSetupConst.java | 0 .../common/ndv/fm/TestFMSketchSerialization.java | 0 .../hadoop/hive/common/ndv/hll/TestHLLNoBias.java | 0 .../hive/common/ndv/hll/TestHLLSerialization.java | 0 .../hive/common/ndv/hll/TestHyperLogLog.java | 0 .../hive/common/ndv/hll/TestHyperLogLogDense.java | 0 .../hive/common/ndv/hll/TestHyperLogLogMerge.java | 0 .../hive/common/ndv/hll/TestHyperLogLogSparse.java | 0 .../hive/common/ndv/hll/TestSparseEncodeHash.java | 0 .../metastore/AlternateFailurePreListener.java | 0 .../hive/metastore/DummyEndFunctionListener.java | 0 .../hive/metastore/DummyJdoConnectionUrlHook.java | 0 .../hadoop/hive/metastore/DummyListener.java | 0 .../hive/metastore/DummyMetaStoreInitListener.java | 0 .../hadoop/hive/metastore/DummyPreListener.java | 0 .../metastore/DummyRawStoreControlledCommit.java | 0 .../metastore/DummyRawStoreForJdoConnection.java | 0 .../apache/hadoop/hive/metastore/FakeDerby.java | 0 .../metastore/HiveMetaStoreClientPreCatalog.java | 0 .../metastore/InjectableBehaviourObjectStore.java | 0 .../hadoop/hive/metastore/IpAddressListener.java | 0 .../hadoop/hive/metastore/MetaStoreTestUtils.java | 0 .../MockPartitionExpressionForMetastore.java | 0 .../hive/metastore/NonCatCallsWithCatalog.java | 0 .../hadoop/hive/metastore/TestAdminUser.java | 0 .../hive/metastore/TestAggregateStatsCache.java | 0 .../metastore/TestCatalogNonDefaultClient.java | 0 .../hive/metastore/TestCatalogNonDefaultSvr.java | 0 .../hive/metastore/TestCatalogOldClient.java | 0 .../apache/hadoop/hive/metastore/TestDeadline.java | 0 .../hive/metastore/TestEmbeddedHiveMetaStore.java | 0 .../hadoop/hive/metastore/TestFilterHooks.java | 0 .../hive/metastore/TestHiveAlterHandler.java | 0 .../hadoop/hive/metastore/TestHiveMetaStore.java | 0 .../metastore/TestHiveMetaStoreGetMetaConf.java | 0 .../metastore/TestHiveMetaStorePartitionSpecs.java | 0 .../metastore/TestHiveMetaStoreSchemaMethods.java | 0 .../hive/metastore/TestHiveMetaStoreTimeout.java | 0 .../hive/metastore/TestHiveMetaStoreTxns.java | 0 .../TestHiveMetaStoreWithEnvironmentContext.java | 0 .../hive/metastore/TestHiveMetastoreCli.java | 0 .../hive/metastore/TestLockRequestBuilder.java | 0 .../hadoop/hive/metastore/TestMarkPartition.java | 0 .../hive/metastore/TestMarkPartitionRemote.java | 0 .../metastore/TestMetaStoreConnectionUrlHook.java | 0 .../TestMetaStoreEndFunctionListener.java | 0 .../hive/metastore/TestMetaStoreEventListener.java | 0 .../TestMetaStoreEventListenerOnlyOnCommit.java | 0 .../TestMetaStoreEventListenerWithOldConf.java | 0 .../hive/metastore/TestMetaStoreInitListener.java | 0 .../metastore/TestMetaStoreListenersError.java | 0 .../hive/metastore/TestMetaStoreSchemaFactory.java | 0 .../hive/metastore/TestMetaStoreSchemaInfo.java | 0 .../hadoop/hive/metastore/TestObjectStore.java | 0 .../hive/metastore/TestObjectStoreInitRetry.java | 0 .../metastore/TestObjectStoreSchemaMethods.java | 0 .../hadoop/hive/metastore/TestOldSchema.java | 0 .../TestPartitionNameWhitelistValidation.java | 0 .../hadoop/hive/metastore/TestRawStoreProxy.java | 0 .../hive/metastore/TestRemoteHiveMetaStore.java | 0 .../TestRemoteHiveMetaStoreIpAddress.java | 0 .../TestRemoteUGIHiveMetaStoreIpAddress.java | 0 .../metastore/TestRetriesInRetryingHMSHandler.java | 0 .../hive/metastore/TestRetryingHMSHandler.java | 0 .../metastore/TestSetUGIOnBothClientServer.java | 0 .../hive/metastore/TestSetUGIOnOnlyClient.java | 0 .../hive/metastore/TestSetUGIOnOnlyServer.java | 0 .../apache/hadoop/hive/metastore/TestStats.java | 0 .../hadoop/hive/metastore/TestTableIterable.java | 0 .../hive/metastore/VerifyingObjectStore.java | 0 .../metastore/annotation/MetastoreCheckinTest.java | 0 .../hive/metastore/annotation/MetastoreTest.java | 0 .../metastore/annotation/MetastoreUnitTest.java | 0 .../hive/metastore/cache/TestCachedStore.java | 0 .../hive/metastore/cache/TestCatalogCaching.java | 0 .../hive/metastore/client/MetaStoreClientTest.java | 0 .../metastore/client/MetaStoreFactoryForTests.java | 0 .../hive/metastore/client/TestAddPartitions.java | 0 .../client/TestAddPartitionsFromPartSpec.java | 0 .../hive/metastore/client/TestAlterPartitions.java | 0 .../metastore/client/TestAppendPartitions.java | 0 .../hadoop/hive/metastore/client/TestCatalogs.java | 0 .../hive/metastore/client/TestCheckConstraint.java | 0 .../hive/metastore/client/TestDatabases.java | 0 .../metastore/client/TestDefaultConstraint.java | 0 .../hive/metastore/client/TestDropPartitions.java | 0 .../metastore/client/TestExchangePartitions.java | 0 .../hive/metastore/client/TestForeignKey.java | 0 .../hive/metastore/client/TestFunctions.java | 0 .../hive/metastore/client/TestGetPartitions.java | 0 .../hive/metastore/client/TestGetTableMeta.java | 0 .../hive/metastore/client/TestListPartitions.java | 0 .../metastore/client/TestNotNullConstraint.java | 0 .../hive/metastore/client/TestPrimaryKey.java | 0 .../hive/metastore/client/TestRuntimeStats.java | 0 .../client/TestTablesCreateDropAlterTruncate.java | 0 .../hive/metastore/client/TestTablesGetExists.java | 0 .../hive/metastore/client/TestTablesList.java | 0 .../metastore/client/TestUniqueConstraint.java | 0 .../hadoop/hive/metastore/client/package-info.java | 0 .../merge/DecimalColumnStatsMergerTest.java | 0 .../hive/metastore/conf/TestMetastoreConf.java | 0 .../datasource/TestDataSourceProviderFactory.java | 0 .../hive/metastore/dbinstall/DbInstallBase.java | 0 .../hive/metastore/dbinstall/ITestMysql.java | 0 .../hive/metastore/dbinstall/ITestOracle.java | 0 .../hive/metastore/dbinstall/ITestPostgres.java | 0 .../hive/metastore/dbinstall/ITestSqlServer.java | 0 .../json/TestJSONMessageDeserializer.java | 0 .../hadoop/hive/metastore/metrics/TestMetrics.java | 0 .../minihms/AbstractMetaStoreService.java | 0 .../minihms/ClusterMetaStoreForTests.java | 0 .../minihms/EmbeddedMetaStoreForTests.java | 0 .../hadoop/hive/metastore/minihms/MiniHMS.java | 0 .../metastore/minihms/RemoteMetaStoreForTests.java | 0 .../metastore/tools/TestMetastoreSchemaTool.java | 0 .../tools/TestSchemaToolForMetastore.java | 0 .../hive/metastore/txn/TestTxnHandlerNegative.java | 0 .../hadoop/hive/metastore/txn/TestTxnUtils.java | 0 .../hadoop/hive/metastore/utils/TestHdfsUtils.java | 0 .../hive/metastore/utils/TestMetaStoreUtils.java | 0 .../src/test/resources/log4j2.properties | 35 ++ standalone-metastore/pom.xml | 1 + upgrade-acid/pom.xml | 2 +- 582 files changed, 1273 insertions(+), 185 deletions(-) delete mode 100644 standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/package-info.java create mode 100644 standalone-metastore/metastore-server/pom.xml create mode 100644 standalone-metastore/metastore-server/src/assembly/bin.xml create mode 100644 standalone-metastore/metastore-server/src/assembly/src.xml rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/HMSMetricsListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/TableIterable.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/conf/ConfTemplatePrinter.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolCommandLine.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTask.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskAlterCatalog.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateCatalog.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateUser.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInfo.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInit.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveDatabase.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveTable.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskUpgrade.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskValidate.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java (100%) create mode 100644 standalone-metastore/metastore-server/src/main/resources/datanucleus-log4j.properties create mode 100644 standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties create mode 100644 standalone-metastore/metastore-server/src/main/resources/metastore-site.xml rename standalone-metastore/{metastore-common => metastore-server}/src/main/resources/package.jdo (100%) create mode 100755 standalone-metastore/metastore-server/src/main/resources/saveVersion.sh rename standalone-metastore/{metastore-common => metastore-server}/src/main/scripts/base (97%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/scripts/ext/metastore.sh (95%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/scripts/ext/schemaTool.sh (94%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/scripts/ext/smokeTest.sh (95%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/scripts/metastore-config.sh (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/scripts/schematool (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/scripts/start-metastore (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/hive-schema-1.2.0.derby.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/hive-schema-3.0.0.derby.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/hive-schema-3.1.0.derby.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/hive-schema-4.0.0.derby.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/derby/upgrade.order.derby (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/create-user.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mssql/upgrade.order.mssql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/create-user.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/mysql/upgrade.order.mysql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/create-user.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/oracle/upgrade.order.oracle (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/create-user.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/main/sql/postgres/upgrade.order.postgres (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogMerge.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/AlternateFailurePreListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyEndFunctionListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyJdoConnectionUrlHook.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyMetaStoreInitListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyPreListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreSchemaMethods.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestStats.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestTableIterable.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/VerifyingObjectStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCatalogCaching.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreClientTest.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreFactoryForTests.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/tools/TestMetastoreSchemaTool.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/tools/TestSchemaToolForMetastore.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java (100%) rename standalone-metastore/{metastore-common => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java (100%) create mode 100644 standalone-metastore/metastore-server/src/test/resources/log4j2.properties diff --git a/.gitignore b/.gitignore index 33f209dd99..0d4aa44f92 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ itests/hive-blobstore/src/test/resources/blobstore-conf.xml patchprocess standalone-metastore/src/gen/version standalone-metastore/metastore-common/src/gen/version +standalone-metastore/metastore-server/src/gen/version diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml index 06e83e1adb..6afe8c4770 100644 --- a/hcatalog/core/pom.xml +++ b/hcatalog/core/pom.xml @@ -74,6 +74,13 @@ test-jar test + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test-jar + test + com.google.guava diff --git a/hcatalog/webhcat/java-client/pom.xml b/hcatalog/webhcat/java-client/pom.xml index 185c785c90..66ebfb5375 100644 --- a/hcatalog/webhcat/java-client/pom.xml +++ b/hcatalog/webhcat/java-client/pom.xml @@ -81,6 +81,13 @@ test-jar test + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test-jar + test + org.apache.hive.hcatalog hive-hcatalog-core diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml index 8e4bc70356..d19e99a498 100644 --- a/hcatalog/webhcat/svr/pom.xml +++ b/hcatalog/webhcat/svr/pom.xml @@ -207,6 +207,13 @@ test-jar test + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test-jar + test + junit junit diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml index 0568cf6eaf..593c9de81e 100644 --- a/itests/hcatalog-unit/pom.xml +++ b/itests/hcatalog-unit/pom.xml @@ -102,6 +102,12 @@ ${project.version} test + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test + org.apache.hive hive-exec diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml index b8d5f0d65b..83c26dace7 100644 --- a/itests/hive-blobstore/pom.xml +++ b/itests/hive-blobstore/pom.xml @@ -66,6 +66,19 @@ tests test + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test + + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + tests + test + org.apache.hive hive-it-unit diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml index 406c407cdd..10801a0f05 100644 --- a/itests/hive-minikdc/pom.xml +++ b/itests/hive-minikdc/pom.xml @@ -85,6 +85,19 @@ test tests + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test + + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test + tests + org.apache.hive hive-serde diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml index 3288659cd0..4ebb8668a2 100644 --- a/itests/hive-unit-hadoop2/pom.xml +++ b/itests/hive-unit-hadoop2/pom.xml @@ -105,6 +105,12 @@ ${project.version} tests + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + tests + org.apache.hive hive-serde diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml index 6081884086..711856e3c6 100644 --- a/itests/hive-unit/pom.xml +++ b/itests/hive-unit/pom.xml @@ -181,6 +181,12 @@ ${project.version} tests + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + tests + org.apache.hive hive-serde @@ -568,7 +574,7 @@ - + diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml index e0c31e480d..abfb5cb413 100644 --- a/itests/qtest-accumulo/pom.xml +++ b/itests/qtest-accumulo/pom.xml @@ -78,6 +78,19 @@ tests test + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test + + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + tests + test + org.apache.hive hive-it-custom-serde diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml index c33aa90a5c..d77dc89afc 100644 --- a/itests/qtest-spark/pom.xml +++ b/itests/qtest-spark/pom.xml @@ -138,6 +138,19 @@ tests test + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test + + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + tests + test + org.apache.hive hive-it-custom-serde diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index 8020743302..5767806017 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -69,6 +69,19 @@ tests test + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test + + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + tests + test + org.apache.hive hive-it-custom-serde diff --git a/itests/util/pom.xml b/itests/util/pom.xml index e1aece6430..9a36446173 100644 --- a/itests/util/pom.xml +++ b/itests/util/pom.xml @@ -117,6 +117,12 @@ ${project.version} test-jar + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test-jar + org.apache.hive hive-llap-server diff --git a/llap-server/pom.xml b/llap-server/pom.xml index 6b52d5da48..e7932b31fd 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -247,6 +247,13 @@ test-jar test + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test-jar + test + org.apache.hadoop diff --git a/metastore/pom.xml b/metastore/pom.xml index a75ab97ae7..7f751a4935 100644 --- a/metastore/pom.xml +++ b/metastore/pom.xml @@ -48,6 +48,11 @@ org.apache.hive hive-standalone-metastore-common ${project.version} + + + org.apache.hive + hive-standalone-metastore-server + ${project.version} javolution diff --git a/packaging/src/main/assembly/bin.xml b/packaging/src/main/assembly/bin.xml index 373ed99840..eeed3ecbe8 100644 --- a/packaging/src/main/assembly/bin.xml +++ b/packaging/src/main/assembly/bin.xml @@ -222,7 +222,7 @@ - ${project.parent.basedir}/standalone-metastore/metastore-common/src/main/sql + ${project.parent.basedir}/standalone-metastore/metastore-server/src/main/sql **/* diff --git a/packaging/src/main/assembly/src.xml b/packaging/src/main/assembly/src.xml index d9db67df3d..6b6d9db05f 100644 --- a/packaging/src/main/assembly/src.xml +++ b/packaging/src/main/assembly/src.xml @@ -97,6 +97,7 @@ spark-client/**/* storage-api/**/* standalone-metastore/metastore-common/**/* + standalone-metastore/metastore-server/**/* streaming/**/* testutils/**/* upgrade-acid/**/* diff --git a/ql/pom.xml b/ql/pom.xml index fe11d06694..a55cbe380d 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -463,6 +463,13 @@ test-jar test + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test-jar + test + org.apache.parquet @@ -916,6 +923,7 @@ org.apache.hive:hive-llap-client org.apache.hive:hive-metastore org.apache.hive:hive-standalone-metastore-common + org.apache.hive:hive-standalone-metastore-server org.apache.hive:hive-service-rpc com.esotericsoftware:kryo-shaded com.esotericsoftware:minlog diff --git a/service/pom.xml b/service/pom.xml index 702347281b..eca6f3b8c3 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -235,6 +235,13 @@ test-jar test + + org.apache.hive + hive-standalone-metastore-server + ${project.version} + test-jar + test + junit diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml index d6df15f9c1..b0d9eee927 100644 --- a/standalone-metastore/metastore-common/pom.xml +++ b/standalone-metastore/metastore-common/pom.xml @@ -169,42 +169,17 @@ org.apache.thrift libthrift - - org.datanucleus - datanucleus-api-jdo - - - org.datanucleus - datanucleus-core - - - org.datanucleus - datanucleus-rdbms - - - org.datanucleus - javax.jdo - org.skyscreamer jsonassert test - - sqlline - sqlline - commons-logging commons-logging - - com.microsoft.sqlserver - mssql-jdbc - test - junit junit @@ -215,18 +190,6 @@ mockito-core test - - - org.mariadb.jdbc - mariadb-java-client - test - - - org.postgresql - postgresql - test - @@ -360,48 +323,6 @@ - @@ -490,14 +411,6 @@ run - - - - - - - - @@ -691,47 +604,6 @@ - - org.codehaus.mojo - exec-maven-plugin - - - prepare-package - - exec - - - java - - -classpath - - org.apache.hadoop.hive.metastore.conf.ConfTemplatePrinter - ${project.build.directory}/generated-sources/conf/metastore-site.xml.template - - - - - - - org.datanucleus - datanucleus-maven-plugin - 4.0.5 - - JDO - false - ${basedir}/src/main/resources/datanucleus-log4j.properties - **/*.jdo - false - - - - process-classes - - enhance - - - - org.antlr antlr3-maven-plugin diff --git a/standalone-metastore/metastore-common/src/assembly/bin.xml b/standalone-metastore/metastore-common/src/assembly/bin.xml index 81912d78da..5992a484cf 100644 --- a/standalone-metastore/metastore-common/src/assembly/bin.xml +++ b/standalone-metastore/metastore-common/src/assembly/bin.xml @@ -76,27 +76,6 @@ binary-package-licenses - - 755 - ${project.basedir}/src/main/scripts - - base - schematool - start-metastore - metastore-config.sh - ext/**/* - - bin - - - - ${project.basedir}/src/main/sql - - **/* - - scripts/metastore/upgrade - - ${project.basedir}/src/gen/thrift/gen-php @@ -118,19 +97,12 @@ ${project.basedir}/src/main/resources/ 644 - metastore-site.xml metastore-log4j2.properties conf - - - ${project.build.directory}/generated-sources/conf/metastore-site.xml.template - conf - - diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/package-info.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/package-info.java deleted file mode 100644 index 9e05d31d50..0000000000 --- a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - */ - -/** - * This package contains test and utility classes for creating MetaStore instances for test - * purposes. - */ -package org.apache.hadoop.hive.metastore.minihms; diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml new file mode 100644 index 0000000000..f2c10b08cf --- /dev/null +++ b/standalone-metastore/metastore-server/pom.xml @@ -0,0 +1,684 @@ + + + + hive-standalone-metastore + org.apache.hive + 4.0.0-SNAPSHOT + + 4.0.0 + + hive-standalone-metastore-server + Hive Metastore Server + + + + + org.apache.hive + hive-standalone-metastore-common + 4.0.0-SNAPSHOT + + + + org.apache.orc + orc-core + + + org.apache.hadoop + hadoop-common + + + org.apache.hive + hive-storage-api + + + + + com.fasterxml.jackson.core + jackson-databind + + + com.github.joshelser + dropwizard-metrics-hadoop-metrics2-reporter + + + com.google.guava + guava + + + com.google.protobuf + protobuf-java + + + com.jolbox + bonecp + + + com.zaxxer + HikariCP + + + commons-dbcp + commons-dbcp + + + io.dropwizard.metrics + metrics-core + + + io.dropwizard.metrics + metrics-jvm + + + io.dropwizard.metrics + metrics-json + + + javolution + javolution + + + org.antlr + antlr-runtime + + + org.apache.commons + commons-lang3 + + + org.apache.derby + derby + + + org.apache.hadoop + hadoop-common + true + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + + + org.apache.hadoop + hadoop-distcp + provided + + + org.apache.hadoop + hadoop-hdfs + true + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + + + org.apache.hadoop + hadoop-hdfs-client + true + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + + + org.apache.hadoop + hadoop-mapreduce-client-core + true + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + + + + org.apache.hive + hive-storage-api + ${storage-api.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-1.2-api + + + org.apache.thrift + libfb303 + + + org.apache.thrift + libthrift + + + org.datanucleus + datanucleus-api-jdo + + + org.datanucleus + datanucleus-core + + + org.datanucleus + datanucleus-rdbms + + + org.datanucleus + javax.jdo + + + org.skyscreamer + jsonassert + test + + + sqlline + sqlline + + + commons-logging + commons-logging + + + + com.microsoft.sqlserver + mssql-jdbc + test + + + junit + junit + test + + + org.mockito + mockito-core + test + + + + org.mariadb.jdbc + mariadb-java-client + test + + + org.postgresql + postgresql + test + + + + + + thriftif + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + + + + findbugs + + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.0 + + true + 2048 + -Djava.awt.headless=true -Xmx2048m -Xms512m + ${basedir}/findbugs/findbugs-exclude.xml + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.0 + + true + 2048 + -Djava.awt.headless=true -Xmx2048m -Xms512m + ${basedir}/findbugs/findbugs-exclude.xml + + + + + + + + + + + + ${basedir}/src/main/resources + + package.jdo + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven.antrun.plugin.version} + + + ant-contrib + ant-contrib + ${ant.contrib.version} + + + ant + ant + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle.plugin.version} + + + org.codehaus.mojo + exec-maven-plugin + ${maven.exec.plugin.version} + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + setup-test-dirs + process-test-resources + + run + + + + + + + + + + + + generate-version-annotation + generate-sources + + + + + + + + + + + + run + + + + setup-metastore-scripts + process-test-resources + + run + + + + + + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${checkstyle.conf.dir}/checkstyle.xml + config_loc=${checkstyle.conf.dir} + true + + + + com.github.os72 + protoc-jar-maven-plugin + 3.5.1.1 + + + generate-sources + + run + + + com.google.protobuf:protoc:2.5.0 + none + + ${basedir}/src/main/protobuf/org/apache/hadoop/hive/metastore + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${maven.assembly.plugin.version} + + + assemble + package + + single + + + apache-hive-metastore-${project.version} + + src/assembly/bin.xml + src/assembly/src.xml + + gnu + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-banned-dependencies + + enforce + + + + + + + com.google.code.findbugs:annotations + + + + true + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.20.1 + + + + integration-test + verify + + + + + true + false + -Xmx2048m + false + + true + ${test.tmp.dir} + ${test.tmp.dir} + true + + + ${log4j.conf.dir} + ${itest.jdbc.jars} + + ${skipITests} + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.version} + + true + false + ${test.forkcount} + -Xmx2048m + false + + ${project.build.directory} + true + ${derby.version} + ${test.tmp.dir}/derby.log + true + ${test.tmp.dir} + + jdbc:derby:memory:${test.tmp.dir}/junit_metastore_db;create=true + + false + ${test.tmp.dir} + ${test.warehouse.scheme}${test.warehouse.dir} + + + + ${log4j.conf.dir} + + ${test.groups} + + + + org.apache.rat + apache-rat-plugin + 0.10 + + + binary-package-licenses/** + DEV-README + **/src/main/sql/** + **/README.md + **/*.iml + **/*.txt + **/*.log + **/*.arcconfig + **/package-info.java + **/*.properties + **/*.q + **/*.q.out + **/*.xml + **/gen/** + **/patchprocess/** + **/metastore_db/** + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + add-source + generate-sources + + add-source + + + + src/gen/thrift/gen-javabean + ${project.build.directory}/generated-sources + src/gen/version + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + prepare-package + + exec + + + + + java + + -classpath + + org.apache.hadoop.hive.metastore.conf.ConfTemplatePrinter + + ${project.build.directory}/generated-sources/conf/metastore-site.xml.template + + + + + + org.datanucleus + datanucleus-maven-plugin + 4.0.5 + + JDO + false + ${basedir}/src/main/resources/datanucleus-log4j.properties + + **/*.jdo + false + + + + process-classes + + enhance + + + + + + org.antlr + antlr3-maven-plugin + ${antlr.version} + + + + antlr + + + + + ${project.build.directory}/generated-sources + ${basedir}/src/main/java + + + + + + + \ No newline at end of file diff --git a/standalone-metastore/metastore-server/src/assembly/bin.xml b/standalone-metastore/metastore-server/src/assembly/bin.xml new file mode 100644 index 0000000000..81912d78da --- /dev/null +++ b/standalone-metastore/metastore-server/src/assembly/bin.xml @@ -0,0 +1,136 @@ + + + + + bin + + + dir + tar.gz + + + apache-hive-metastore-${project.version}-bin + + + + lib + false + true + true + true + + org.apache.hadoop:* + org.slf4j:* + log4j:* + + + + + + + ${project.basedir} + + target/** + .classpath + .project + .settings/** + lib/** + + + + README.txt + LICENSE + NOTICE + + / + + + + ${project.basedir}/binary-package-licenses + + /* + + + /README + + binary-package-licenses + + + + 755 + ${project.basedir}/src/main/scripts + + base + schematool + start-metastore + metastore-config.sh + ext/**/* + + bin + + + + ${project.basedir}/src/main/sql + + **/* + + scripts/metastore/upgrade + + + + ${project.basedir}/src/gen/thrift/gen-php + + **/* + + lib/php/packages/hive_metastore + + + + ${project.basedir}/src/gen/thrift/gen-py/hive_metastore + 755 + + **/* + + lib/py/hive_metastore + + + + ${project.basedir}/src/main/resources/ + 644 + + metastore-site.xml + metastore-log4j2.properties + + conf + + + + + + ${project.build.directory}/generated-sources/conf/metastore-site.xml.template + conf + + + + + diff --git a/standalone-metastore/metastore-server/src/assembly/src.xml b/standalone-metastore/metastore-server/src/assembly/src.xml new file mode 100644 index 0000000000..a2405443ea --- /dev/null +++ b/standalone-metastore/metastore-server/src/assembly/src.xml @@ -0,0 +1,53 @@ + + + + + src + + + tar.gz + + + apache-hive-metastore-${project.version}-src + + + + ${project.basedir} + + + target/** + + + + .checkstyle + .gitattributes + .gitignore + LICENSE + NOTICE + pom.xml + src/**/* + + / + + + diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HMSMetricsListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSMetricsListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HMSMetricsListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSMetricsListener.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TableIterable.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableIterable.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TableIterable.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableIterable.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/ConfTemplatePrinter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/ConfTemplatePrinter.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/ConfTemplatePrinter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/ConfTemplatePrinter.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolCommandLine.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolCommandLine.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolCommandLine.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolCommandLine.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTask.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTask.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTask.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTask.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskAlterCatalog.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskAlterCatalog.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskAlterCatalog.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskAlterCatalog.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateCatalog.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateCatalog.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateCatalog.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateCatalog.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateUser.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateUser.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateUser.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateUser.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInfo.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInfo.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInfo.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInfo.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInit.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInit.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInit.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInit.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveDatabase.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveDatabase.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveDatabase.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveDatabase.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveTable.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveTable.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveTable.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveTable.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskUpgrade.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskUpgrade.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskUpgrade.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskUpgrade.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskValidate.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskValidate.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskValidate.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskValidate.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java similarity index 100% rename from standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java diff --git a/standalone-metastore/metastore-server/src/main/resources/datanucleus-log4j.properties b/standalone-metastore/metastore-server/src/main/resources/datanucleus-log4j.properties new file mode 100644 index 0000000000..80f17e8a53 --- /dev/null +++ b/standalone-metastore/metastore-server/src/main/resources/datanucleus-log4j.properties @@ -0,0 +1,17 @@ +# Define the destination and format of our logging +log4j.appender.A1=org.apache.log4j.FileAppender +log4j.appender.A1.File=target/datanucleus.log +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n + +# DataNucleus Categories +log4j.category.DataNucleus.JDO=INFO, A1 +log4j.category.DataNucleus.Cache=INFO, A1 +log4j.category.DataNucleus.MetaData=INFO, A1 +log4j.category.DataNucleus.General=INFO, A1 +log4j.category.DataNucleus.Transaction=INFO, A1 +log4j.category.DataNucleus.Datastore=DEBUG, A1 +log4j.category.DataNucleus.ValueGeneration=DEBUG, A1 + +log4j.category.DataNucleus.Enhancer=INFO, A1 +log4j.category.DataNucleus.SchemaTool=INFO, A1 diff --git a/standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties b/standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties new file mode 100644 index 0000000000..ec5039b4fb --- /dev/null +++ b/standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties @@ -0,0 +1,71 @@ +# 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. + +status = INFO +name = MetastoreLog4j2 +packages = org.apache.hadoop.hive.metastore + +# list of properties +property.metastore.log.level = INFO +property.metastore.root.logger = DRFA +property.metastore.log.dir = ${sys:java.io.tmpdir}/${sys:user.name} +property.metastore.log.file = metastore.log +property.hive.perflogger.log.level = INFO + +# list of all appenders +appenders = console, DRFA + +# console appender +appender.console.type = Console +appender.console.name = console +appender.console.target = SYSTEM_ERR +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n + +# daily rolling file appender +appender.DRFA.type = RollingRandomAccessFile +appender.DRFA.name = DRFA +appender.DRFA.fileName = ${sys:metastore.log.dir}/${sys:metastore.log.file} +# Use %pid in the filePattern to append @ to the filename if you want separate log files for different CLI session +appender.DRFA.filePattern = ${sys:metastore.log.dir}/${sys:metastore.log.file}.%d{yyyy-MM-dd} +appender.DRFA.layout.type = PatternLayout +appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n +appender.DRFA.policies.type = Policies +appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy +appender.DRFA.policies.time.interval = 1 +appender.DRFA.policies.time.modulate = true +appender.DRFA.strategy.type = DefaultRolloverStrategy +appender.DRFA.strategy.max = 30 + +# list of all loggers +loggers = DataNucleus, Datastore, JPOX, PerfLogger + +logger.DataNucleus.name = DataNucleus +logger.DataNucleus.level = ERROR + +logger.Datastore.name = Datastore +logger.Datastore.level = ERROR + +logger.JPOX.name = JPOX +logger.JPOX.level = ERROR + +logger.PerfLogger.name = org.apache.hadoop.hive.ql.log.PerfLogger +logger.PerfLogger.level = ${sys:hive.perflogger.log.level} + +# root logger +rootLogger.level = ${sys:metastore.log.level} +rootLogger.appenderRefs = root +rootLogger.appenderRef.root.ref = ${sys:metastore.root.logger} diff --git a/standalone-metastore/metastore-server/src/main/resources/metastore-site.xml b/standalone-metastore/metastore-server/src/main/resources/metastore-site.xml new file mode 100644 index 0000000000..271fc59379 --- /dev/null +++ b/standalone-metastore/metastore-server/src/main/resources/metastore-site.xml @@ -0,0 +1,34 @@ + + + + + + metastore.thrift.uris + thrift://localhost:9083 + Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore. + + + metastore.task.threads.always + org.apache.hadoop.hive.metastore.events.EventCleanerTask + + + metastore.expression.proxy + org.apache.hadoop.hive.metastore.DefaultPartitionExpressionProxy + + \ No newline at end of file diff --git a/standalone-metastore/metastore-common/src/main/resources/package.jdo b/standalone-metastore/metastore-server/src/main/resources/package.jdo similarity index 100% rename from standalone-metastore/metastore-common/src/main/resources/package.jdo rename to standalone-metastore/metastore-server/src/main/resources/package.jdo diff --git a/standalone-metastore/metastore-server/src/main/resources/saveVersion.sh b/standalone-metastore/metastore-server/src/main/resources/saveVersion.sh new file mode 100755 index 0000000000..0d1a463fdd --- /dev/null +++ b/standalone-metastore/metastore-server/src/main/resources/saveVersion.sh @@ -0,0 +1,91 @@ +#!/usr/bin/env bash + +# 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. + + +# This file is used to generate the package-info.java class that +# records the version, revision, branch, user, timestamp, and url +unset LANG +unset LC_CTYPE +unset LC_TIME +version=$1 +shortversion=$2 +src_dir=$3 +revision=$4 +branch=$5 +url=$6 +user=`whoami` +date=`date` +dir=`pwd` +cwd=`dirname $dir` +if [ "$revision" = "" ]; then + if git rev-parse HEAD 2>/dev/null > /dev/null ; then + revision=`git log -1 --pretty=format:"%H"` + hostname=`hostname` + branch=`git branch | sed -n -e 's/^* //p'` + url="git://${hostname}${cwd}" + elif [ -d .svn ]; then + revision=`svn info ../ | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'` + url=`svn info ../ | sed -n -e 's/^URL: \(.*\)/\1/p'` + # Get canonical branch (branches/X, tags/X, or trunk) + branch=`echo $url | sed -n -e 's,.*\(branches/.*\)$,\1,p' \ + -e 's,.*\(tags/.*\)$,\1,p' \ + -e 's,.*trunk$,trunk,p'` + else + revision="Unknown" + branch="Unknown" + url="file://$cwd" + fi +fi +if [ "$branch" = "" ]; then + branch="Unknown" +fi +if [ "$url" = "" ]; then + url="file://$cwd" +fi + +if [ -x /sbin/md5 ]; then + md5="/sbin/md5" +else + md5="md5sum" +fi + +srcChecksum=`find ../ -name '*.java' | grep -v generated-sources | LC_ALL=C sort | xargs $md5 | $md5 | cut -d ' ' -f 1` + +mkdir -p $src_dir/gen/version/org/apache/hadoop/hive/metastore/annotation + +# In Windows, all the following string ends with \r, need to get rid of them +branch=`echo $branch | tr -d '\r'` +user=`echo $user | tr -d '\r'` +date=`echo $date | tr -d '\r'` +url=`echo $url | tr -d '\r'` +srcChecksum=`echo $srcChecksum | tr -d '\r'` + +cat << EOF | \ + sed -e "s/VERSION/$version/" -e "s/SHORTVERSION/$shortversion/" \ + -e "s/USER/$user/" -e "s/DATE/$date/" \ + -e "s|URL|$url|" -e "s/REV/$revision/" \ + -e "s|BRANCH|$branch|" -e "s/SRCCHECKSUM/$srcChecksum/" \ + > $src_dir/gen/version/org/apache/hadoop/hive/metastore/annotation/package-info.java +/* + * Generated by saveVersion.sh + */ +@MetastoreVersionAnnotation(version="VERSION", shortVersion="SHORTVERSION", + revision="REV", branch="BRANCH", + user="USER", date="DATE", url="URL", + srcChecksum="SRCCHECKSUM") +package org.apache.hadoop.hive.metastore.annotation; +EOF diff --git a/standalone-metastore/metastore-common/src/main/scripts/base b/standalone-metastore/metastore-server/src/main/scripts/base similarity index 97% rename from standalone-metastore/metastore-common/src/main/scripts/base rename to standalone-metastore/metastore-server/src/main/scripts/base index c455b2a6c7..0a49b4596e 100755 --- a/standalone-metastore/metastore-common/src/main/scripts/base +++ b/standalone-metastore/metastore-server/src/main/scripts/base @@ -87,6 +87,12 @@ if [ ! -f ${METASTORE_LIB}/hive-standalone-metastore-common-*.jar ]; then exit 2; fi +# needed for execution +if [ ! -f ${METASTORE_LIB}/hive-standalone-metastore-server-*.jar ]; then + echo "Missing Standalone MetaStore Jar" + exit 2; +fi + for f in ${METASTORE_LIB}/*.jar; do CLASSPATH=${CLASSPATH}:$f; done diff --git a/standalone-metastore/metastore-common/src/main/scripts/ext/metastore.sh b/standalone-metastore/metastore-server/src/main/scripts/ext/metastore.sh similarity index 95% rename from standalone-metastore/metastore-common/src/main/scripts/ext/metastore.sh rename to standalone-metastore/metastore-server/src/main/scripts/ext/metastore.sh index a8d4d804d6..7f23bd39ff 100644 --- a/standalone-metastore/metastore-common/src/main/scripts/ext/metastore.sh +++ b/standalone-metastore/metastore-server/src/main/scripts/ext/metastore.sh @@ -22,7 +22,7 @@ metastore() { if $cygwin; then METASTORE_LIB=`cygpath -w "$METASTORE_LIB"` fi - JAR=${METASTORE_LIB}/hive-standalone-metastore-common-*.jar + JAR=${METASTORE_LIB}/hive-standalone-metastore-server-*.jar # hadoop 20 or newer - skip the aux_jars option and hiveconf diff --git a/standalone-metastore/metastore-common/src/main/scripts/ext/schemaTool.sh b/standalone-metastore/metastore-server/src/main/scripts/ext/schemaTool.sh similarity index 94% rename from standalone-metastore/metastore-common/src/main/scripts/ext/schemaTool.sh rename to standalone-metastore/metastore-server/src/main/scripts/ext/schemaTool.sh index 1863b061bd..479805503c 100644 --- a/standalone-metastore/metastore-common/src/main/scripts/ext/schemaTool.sh +++ b/standalone-metastore/metastore-server/src/main/scripts/ext/schemaTool.sh @@ -22,7 +22,7 @@ schemaTool() { if $cygwin; then METASTORE_LIB=`cygpath -w "$METASTORE_LIB"` fi - JAR=${METASTORE_LIB}/hive-standalone-metastore-common-*.jar + JAR=${METASTORE_LIB}/hive-standalone-metastore-server-*.jar # hadoop 20 or newer - skip the aux_jars option and hiveconf exec $HADOOP jar $JAR $CLASS "$@" diff --git a/standalone-metastore/metastore-common/src/main/scripts/ext/smokeTest.sh b/standalone-metastore/metastore-server/src/main/scripts/ext/smokeTest.sh similarity index 95% rename from standalone-metastore/metastore-common/src/main/scripts/ext/smokeTest.sh rename to standalone-metastore/metastore-server/src/main/scripts/ext/smokeTest.sh index cd1eb1d653..db4b3c4204 100644 --- a/standalone-metastore/metastore-common/src/main/scripts/ext/smokeTest.sh +++ b/standalone-metastore/metastore-server/src/main/scripts/ext/smokeTest.sh @@ -22,7 +22,7 @@ smokeTest() { if $cygwin; then METASTORE_LIB=`cygpath -w "$METASTORE_LIB"` fi - JAR=${METASTORE_LIB}/hive-standalone-metastore-common-*.jar + JAR=${METASTORE_LIB}/hive-standalone-metastore-server-*.jar # hadoop 20 or newer - skip the aux_jars option and hiveconf exec $HADOOP jar $JAR $CLASS "$@" diff --git a/standalone-metastore/metastore-common/src/main/scripts/metastore-config.sh b/standalone-metastore/metastore-server/src/main/scripts/metastore-config.sh similarity index 100% rename from standalone-metastore/metastore-common/src/main/scripts/metastore-config.sh rename to standalone-metastore/metastore-server/src/main/scripts/metastore-config.sh diff --git a/standalone-metastore/metastore-common/src/main/scripts/schematool b/standalone-metastore/metastore-server/src/main/scripts/schematool similarity index 100% rename from standalone-metastore/metastore-common/src/main/scripts/schematool rename to standalone-metastore/metastore-server/src/main/scripts/schematool diff --git a/standalone-metastore/metastore-common/src/main/scripts/start-metastore b/standalone-metastore/metastore-server/src/main/scripts/start-metastore similarity index 100% rename from standalone-metastore/metastore-common/src/main/scripts/start-metastore rename to standalone-metastore/metastore-server/src/main/scripts/start-metastore diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-1.2.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-1.2.0.derby.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-1.2.0.derby.sql rename to standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-1.2.0.derby.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-3.0.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.0.0.derby.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-3.0.0.derby.sql rename to standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.0.0.derby.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-3.1.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.1.0.derby.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-3.1.0.derby.sql rename to standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.1.0.derby.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-4.0.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-4.0.0.derby.sql rename to standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql rename to standalone-metastore/metastore-server/src/main/sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql rename to standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql rename to standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql rename to standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql rename to standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql rename to standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql rename to standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/derby/upgrade.order.derby b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/derby/upgrade.order.derby rename to standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/create-user.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/create-user.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/create-user.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/create-user.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade.order.mssql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mssql/upgrade.order.mssql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/create-user.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/create-user.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/create-user.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/create-user.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade.order.mysql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/mysql/upgrade.order.mysql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/create-user.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/create-user.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/create-user.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/create-user.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade.order.oracle b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/oracle/upgrade.order.oracle rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/create-user.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/create-user.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/create-user.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/create-user.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql diff --git a/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade.order.postgres b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres similarity index 100% rename from standalone-metastore/metastore-common/src/main/sql/postgres/upgrade.order.postgres rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogMerge.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogMerge.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogMerge.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogMerge.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/AlternateFailurePreListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/AlternateFailurePreListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/AlternateFailurePreListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/AlternateFailurePreListener.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyEndFunctionListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyEndFunctionListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyEndFunctionListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyEndFunctionListener.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyJdoConnectionUrlHook.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyJdoConnectionUrlHook.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyJdoConnectionUrlHook.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyJdoConnectionUrlHook.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyListener.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyMetaStoreInitListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyMetaStoreInitListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyMetaStoreInitListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyMetaStoreInitListener.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyPreListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyPreListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyPreListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyPreListener.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreSchemaMethods.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreSchemaMethods.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreSchemaMethods.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreSchemaMethods.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestStats.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestStats.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestStats.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestStats.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestTableIterable.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestTableIterable.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestTableIterable.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestTableIterable.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/VerifyingObjectStore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/VerifyingObjectStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/VerifyingObjectStore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/VerifyingObjectStore.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCatalogCaching.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCatalogCaching.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCatalogCaching.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCatalogCaching.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreClientTest.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreClientTest.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreClientTest.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreClientTest.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreFactoryForTests.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreFactoryForTests.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreFactoryForTests.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreFactoryForTests.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/tools/TestMetastoreSchemaTool.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/TestMetastoreSchemaTool.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/tools/TestMetastoreSchemaTool.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/TestMetastoreSchemaTool.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/tools/TestSchemaToolForMetastore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/TestSchemaToolForMetastore.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/tools/TestSchemaToolForMetastore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/TestSchemaToolForMetastore.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java diff --git a/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java similarity index 100% rename from standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java diff --git a/standalone-metastore/metastore-server/src/test/resources/log4j2.properties b/standalone-metastore/metastore-server/src/test/resources/log4j2.properties new file mode 100644 index 0000000000..365687e1c9 --- /dev/null +++ b/standalone-metastore/metastore-server/src/test/resources/log4j2.properties @@ -0,0 +1,35 @@ +# 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. + +name=PropertiesConfig +property.filename = logs +appenders = console + +appender.console.type = Console +appender.console.name = STDOUT +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = [%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n + +loggers=file +logger.file.name=guru.springframework.blog.log4j2properties +logger.file.level = debug +logger.file.appenderRefs = file +logger.file.appenderRef.file.ref = LOGFILE + +rootLogger.level = debug +rootLogger.appenderRefs = stdout +rootLogger.appenderRef.stdout.ref = STDOUT diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 65bb86ee82..2da4f2b2c8 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -18,6 +18,7 @@ 4.0.0 metastore-common + metastore-server org.apache diff --git a/upgrade-acid/pom.xml b/upgrade-acid/pom.xml index fc68372823..a0325488ac 100644 --- a/upgrade-acid/pom.xml +++ b/upgrade-acid/pom.xml @@ -206,7 +206,7 @@ java.io.IOException: Cannot initialize Cluster. Please check your configuration - + -- 2.16.3