From b9b445e5ee772b823c90132662e5d6868590c48c Mon Sep 17 00:00:00 2001 From: Alexander Kolbasov Date: Sat, 7 Jul 2018 15:44:28 -0700 Subject: [PATCH] HIVE-20097 --- .gitignore | 1 + hcatalog/core/pom.xml | 2 +- hcatalog/webhcat/java-client/pom.xml | 2 +- hcatalog/webhcat/svr/pom.xml | 2 +- itests/hcatalog-unit/pom.xml | 2 +- itests/hive-blobstore/pom.xml | 4 +- itests/hive-minikdc/pom.xml | 4 +- itests/hive-unit-hadoop2/pom.xml | 2 +- itests/hive-unit/pom.xml | 4 +- itests/qtest-accumulo/pom.xml | 4 +- itests/qtest-spark/pom.xml | 4 +- itests/qtest/pom.xml | 4 +- itests/util/pom.xml | 2 +- llap-server/pom.xml | 2 +- metastore/pom.xml | 2 +- packaging/src/main/assembly/bin.xml | 2 +- packaging/src/main/assembly/src.xml | 2 +- ql/pom.xml | 4 +- service/pom.xml | 2 +- standalone-metastore/DEV-README | 2 +- standalone-metastore/metastore-common/pom.xml | 754 ++++++++++++++ .../src/assembly/bin.xml | 0 .../src/assembly/src.xml | 0 .../thrift/gen-cpp/ThriftHiveMetastore.cpp | 0 .../gen/thrift/gen-cpp/ThriftHiveMetastore.h | 0 .../ThriftHiveMetastore_server.skeleton.cpp | 0 .../gen-cpp/hive_metastore_constants.cpp | 0 .../thrift/gen-cpp/hive_metastore_constants.h | 0 .../thrift/gen-cpp/hive_metastore_types.cpp | 0 .../gen/thrift/gen-cpp/hive_metastore_types.h | 0 .../hive/metastore/api/AbortTxnRequest.java | 0 .../hive/metastore/api/AbortTxnsRequest.java | 0 .../api/AddCheckConstraintRequest.java | 0 .../api/AddDefaultConstraintRequest.java | 0 .../metastore/api/AddDynamicPartitions.java | 0 .../metastore/api/AddForeignKeyRequest.java | 0 .../api/AddNotNullConstraintRequest.java | 0 .../metastore/api/AddPartitionsRequest.java | 0 .../metastore/api/AddPartitionsResult.java | 0 .../metastore/api/AddPrimaryKeyRequest.java | 0 .../api/AddUniqueConstraintRequest.java | 0 .../hadoop/hive/metastore/api/AggrStats.java | 0 .../api/AllocateTableWriteIdsRequest.java | 0 .../api/AllocateTableWriteIdsResponse.java | 0 .../metastore/api/AlreadyExistsException.java | 0 .../metastore/api/AlterCatalogRequest.java | 0 .../metastore/api/AlterISchemaRequest.java | 0 .../hive/metastore/api/BasicTxnInfo.java | 0 .../metastore/api/BinaryColumnStatsData.java | 0 .../metastore/api/BooleanColumnStatsData.java | 0 .../api/CacheFileMetadataRequest.java | 0 .../api/CacheFileMetadataResult.java | 0 .../hadoop/hive/metastore/api/Catalog.java | 0 .../api/CheckConstraintsRequest.java | 0 .../api/CheckConstraintsResponse.java | 0 .../hive/metastore/api/CheckLockRequest.java | 0 .../api/ClearFileMetadataRequest.java | 0 .../api/ClearFileMetadataResult.java | 0 .../metastore/api/ClientCapabilities.java | 0 .../hive/metastore/api/ClientCapability.java | 0 .../hive/metastore/api/CmRecycleRequest.java | 0 .../hive/metastore/api/CmRecycleResponse.java | 0 .../hive/metastore/api/ColumnStatistics.java | 0 .../metastore/api/ColumnStatisticsData.java | 0 .../metastore/api/ColumnStatisticsDesc.java | 0 .../metastore/api/ColumnStatisticsObj.java | 0 .../hive/metastore/api/CommitTxnRequest.java | 0 .../hive/metastore/api/CompactionRequest.java | 0 .../metastore/api/CompactionResponse.java | 0 .../hive/metastore/api/CompactionType.java | 0 .../api/ConfigValSecurityException.java | 0 .../metastore/api/CreateCatalogRequest.java | 0 .../hive/metastore/api/CreationMetadata.java | 0 .../api/CurrentNotificationEventId.java | 0 .../hive/metastore/api/DataOperationType.java | 0 .../hadoop/hive/metastore/api/Database.java | 0 .../hadoop/hive/metastore/api/Date.java | 0 .../metastore/api/DateColumnStatsData.java | 0 .../hadoop/hive/metastore/api/Decimal.java | 0 .../metastore/api/DecimalColumnStatsData.java | 0 .../api/DefaultConstraintsRequest.java | 0 .../api/DefaultConstraintsResponse.java | 0 .../metastore/api/DoubleColumnStatsData.java | 0 .../metastore/api/DropCatalogRequest.java | 0 .../metastore/api/DropConstraintRequest.java | 0 .../metastore/api/DropPartitionsExpr.java | 0 .../metastore/api/DropPartitionsRequest.java | 0 .../metastore/api/DropPartitionsResult.java | 0 .../metastore/api/EnvironmentContext.java | 0 .../hive/metastore/api/EventRequestType.java | 0 .../hive/metastore/api/FieldSchema.java | 0 .../metastore/api/FileMetadataExprType.java | 0 .../metastore/api/FindSchemasByColsResp.java | 0 .../metastore/api/FindSchemasByColsRqst.java | 0 .../hive/metastore/api/FireEventRequest.java | 0 .../metastore/api/FireEventRequestData.java | 0 .../hive/metastore/api/FireEventResponse.java | 0 .../metastore/api/ForeignKeysRequest.java | 0 .../metastore/api/ForeignKeysResponse.java | 0 .../hadoop/hive/metastore/api/Function.java | 0 .../hive/metastore/api/FunctionType.java | 0 .../api/GetAllFunctionsResponse.java | 0 .../hive/metastore/api/GetCatalogRequest.java | 0 .../metastore/api/GetCatalogResponse.java | 0 .../metastore/api/GetCatalogsResponse.java | 0 .../api/GetFileMetadataByExprRequest.java | 0 .../api/GetFileMetadataByExprResult.java | 0 .../metastore/api/GetFileMetadataRequest.java | 0 .../metastore/api/GetFileMetadataResult.java | 0 .../api/GetOpenTxnsInfoResponse.java | 0 .../metastore/api/GetOpenTxnsResponse.java | 0 .../api/GetPrincipalsInRoleRequest.java | 0 .../api/GetPrincipalsInRoleResponse.java | 0 .../api/GetRoleGrantsForPrincipalRequest.java | 0 .../GetRoleGrantsForPrincipalResponse.java | 0 .../metastore/api/GetRuntimeStatsRequest.java | 0 .../hive/metastore/api/GetSerdeRequest.java | 0 .../hive/metastore/api/GetTableRequest.java | 0 .../hive/metastore/api/GetTableResult.java | 0 .../hive/metastore/api/GetTablesRequest.java | 0 .../hive/metastore/api/GetTablesResult.java | 0 .../api/GetValidWriteIdsRequest.java | 0 .../api/GetValidWriteIdsResponse.java | 0 .../api/GrantRevokePrivilegeRequest.java | 0 .../api/GrantRevokePrivilegeResponse.java | 0 .../metastore/api/GrantRevokeRoleRequest.java | 0 .../api/GrantRevokeRoleResponse.java | 0 .../hive/metastore/api/GrantRevokeType.java | 0 .../hive/metastore/api/HeartbeatRequest.java | 0 .../api/HeartbeatTxnRangeRequest.java | 0 .../api/HeartbeatTxnRangeResponse.java | 0 .../metastore/api/HiveObjectPrivilege.java | 0 .../hive/metastore/api/HiveObjectRef.java | 0 .../hive/metastore/api/HiveObjectType.java | 0 .../hadoop/hive/metastore/api/ISchema.java | 0 .../hive/metastore/api/ISchemaName.java | 0 .../metastore/api/InsertEventRequestData.java | 0 .../metastore/api/InvalidInputException.java | 0 .../metastore/api/InvalidObjectException.java | 0 .../api/InvalidOperationException.java | 0 .../api/InvalidPartitionException.java | 0 .../hive/metastore/api/LockComponent.java | 0 .../hadoop/hive/metastore/api/LockLevel.java | 0 .../hive/metastore/api/LockRequest.java | 0 .../hive/metastore/api/LockResponse.java | 0 .../hadoop/hive/metastore/api/LockState.java | 0 .../hadoop/hive/metastore/api/LockType.java | 0 .../metastore/api/LongColumnStatsData.java | 0 .../api/MapSchemaVersionToSerdeRequest.java | 0 .../hive/metastore/api/Materialization.java | 0 .../hive/metastore/api/MetaException.java | 0 .../hive/metastore/api/MetadataPpdResult.java | 0 .../metastore/api/NoSuchLockException.java | 0 .../metastore/api/NoSuchObjectException.java | 0 .../metastore/api/NoSuchTxnException.java | 0 .../api/NotNullConstraintsRequest.java | 0 .../api/NotNullConstraintsResponse.java | 0 .../hive/metastore/api/NotificationEvent.java | 0 .../api/NotificationEventRequest.java | 0 .../api/NotificationEventResponse.java | 0 .../api/NotificationEventsCountRequest.java | 0 .../api/NotificationEventsCountResponse.java | 0 .../hive/metastore/api/OpenTxnRequest.java | 0 .../hive/metastore/api/OpenTxnsResponse.java | 0 .../hadoop/hive/metastore/api/Order.java | 0 .../hadoop/hive/metastore/api/Partition.java | 0 .../metastore/api/PartitionEventType.java | 0 .../api/PartitionListComposingSpec.java | 0 .../hive/metastore/api/PartitionSpec.java | 0 .../api/PartitionSpecWithSharedSD.java | 0 .../metastore/api/PartitionValuesRequest.java | 0 .../api/PartitionValuesResponse.java | 0 .../metastore/api/PartitionValuesRow.java | 0 .../metastore/api/PartitionWithoutSD.java | 0 .../api/PartitionsByExprRequest.java | 0 .../metastore/api/PartitionsByExprResult.java | 0 .../metastore/api/PartitionsStatsRequest.java | 0 .../metastore/api/PartitionsStatsResult.java | 0 .../metastore/api/PrimaryKeysRequest.java | 0 .../metastore/api/PrimaryKeysResponse.java | 0 .../metastore/api/PrincipalPrivilegeSet.java | 0 .../hive/metastore/api/PrincipalType.java | 0 .../hive/metastore/api/PrivilegeBag.java | 0 .../metastore/api/PrivilegeGrantInfo.java | 0 .../metastore/api/PutFileMetadataRequest.java | 0 .../metastore/api/PutFileMetadataResult.java | 0 .../api/ReplTblWriteIdStateRequest.java | 0 .../hive/metastore/api/RequestPartsSpec.java | 0 .../hive/metastore/api/ResourceType.java | 0 .../hive/metastore/api/ResourceUri.java | 0 .../hadoop/hive/metastore/api/Role.java | 0 .../metastore/api/RolePrincipalGrant.java | 0 .../hive/metastore/api/RuntimeStat.java | 0 .../metastore/api/SQLCheckConstraint.java | 0 .../metastore/api/SQLDefaultConstraint.java | 0 .../hive/metastore/api/SQLForeignKey.java | 0 .../metastore/api/SQLNotNullConstraint.java | 0 .../hive/metastore/api/SQLPrimaryKey.java | 0 .../metastore/api/SQLUniqueConstraint.java | 0 .../hadoop/hive/metastore/api/Schema.java | 0 .../metastore/api/SchemaCompatibility.java | 0 .../hadoop/hive/metastore/api/SchemaType.java | 0 .../hive/metastore/api/SchemaValidation.java | 0 .../hive/metastore/api/SchemaVersion.java | 0 .../api/SchemaVersionDescriptor.java | 0 .../metastore/api/SchemaVersionState.java | 0 .../hadoop/hive/metastore/api/SerDeInfo.java | 0 .../hadoop/hive/metastore/api/SerdeType.java | 0 .../api/SetPartitionsStatsRequest.java | 0 .../api/SetSchemaVersionStateRequest.java | 0 .../metastore/api/ShowCompactRequest.java | 0 .../metastore/api/ShowCompactResponse.java | 0 .../api/ShowCompactResponseElement.java | 0 .../hive/metastore/api/ShowLocksRequest.java | 0 .../hive/metastore/api/ShowLocksResponse.java | 0 .../api/ShowLocksResponseElement.java | 0 .../hadoop/hive/metastore/api/SkewedInfo.java | 0 .../hive/metastore/api/StorageDescriptor.java | 0 .../metastore/api/StringColumnStatsData.java | 0 .../hadoop/hive/metastore/api/Table.java | 0 .../hadoop/hive/metastore/api/TableMeta.java | 0 .../hive/metastore/api/TableStatsRequest.java | 0 .../hive/metastore/api/TableStatsResult.java | 0 .../metastore/api/TableValidWriteIds.java | 0 .../metastore/api/ThriftHiveMetastore.java | 0 .../metastore/api/TxnAbortedException.java | 0 .../hadoop/hive/metastore/api/TxnInfo.java | 0 .../hive/metastore/api/TxnOpenException.java | 0 .../hadoop/hive/metastore/api/TxnState.java | 0 .../hive/metastore/api/TxnToWriteId.java | 0 .../hadoop/hive/metastore/api/Type.java | 0 .../api/UniqueConstraintsRequest.java | 0 .../api/UniqueConstraintsResponse.java | 0 .../metastore/api/UnknownDBException.java | 0 .../api/UnknownPartitionException.java | 0 .../metastore/api/UnknownTableException.java | 0 .../hive/metastore/api/UnlockRequest.java | 0 .../hadoop/hive/metastore/api/Version.java | 0 .../metastore/api/WMAlterPoolRequest.java | 0 .../metastore/api/WMAlterPoolResponse.java | 0 .../api/WMAlterResourcePlanRequest.java | 0 .../api/WMAlterResourcePlanResponse.java | 0 .../metastore/api/WMAlterTriggerRequest.java | 0 .../metastore/api/WMAlterTriggerResponse.java | 0 ...eateOrDropTriggerToPoolMappingRequest.java | 0 ...ateOrDropTriggerToPoolMappingResponse.java | 0 .../api/WMCreateOrUpdateMappingRequest.java | 0 .../api/WMCreateOrUpdateMappingResponse.java | 0 .../metastore/api/WMCreatePoolRequest.java | 0 .../metastore/api/WMCreatePoolResponse.java | 0 .../api/WMCreateResourcePlanRequest.java | 0 .../api/WMCreateResourcePlanResponse.java | 0 .../metastore/api/WMCreateTriggerRequest.java | 0 .../api/WMCreateTriggerResponse.java | 0 .../metastore/api/WMDropMappingRequest.java | 0 .../metastore/api/WMDropMappingResponse.java | 0 .../hive/metastore/api/WMDropPoolRequest.java | 0 .../metastore/api/WMDropPoolResponse.java | 0 .../api/WMDropResourcePlanRequest.java | 0 .../api/WMDropResourcePlanResponse.java | 0 .../metastore/api/WMDropTriggerRequest.java | 0 .../metastore/api/WMDropTriggerResponse.java | 0 .../metastore/api/WMFullResourcePlan.java | 0 .../api/WMGetActiveResourcePlanRequest.java | 0 .../api/WMGetActiveResourcePlanResponse.java | 0 .../api/WMGetAllResourcePlanRequest.java | 0 .../api/WMGetAllResourcePlanResponse.java | 0 .../api/WMGetResourcePlanRequest.java | 0 .../api/WMGetResourcePlanResponse.java | 0 .../WMGetTriggersForResourePlanRequest.java | 0 .../WMGetTriggersForResourePlanResponse.java | 0 .../hadoop/hive/metastore/api/WMMapping.java | 0 .../hive/metastore/api/WMNullablePool.java | 0 .../metastore/api/WMNullableResourcePlan.java | 0 .../hadoop/hive/metastore/api/WMPool.java | 0 .../metastore/api/WMPoolSchedulingPolicy.java | 0 .../hive/metastore/api/WMPoolTrigger.java | 0 .../hive/metastore/api/WMResourcePlan.java | 0 .../metastore/api/WMResourcePlanStatus.java | 0 .../hadoop/hive/metastore/api/WMTrigger.java | 0 .../api/WMValidateResourcePlanRequest.java | 0 .../api/WMValidateResourcePlanResponse.java | 0 .../hive/metastore/api/WriteEventInfo.java | 0 .../api/WriteNotificationLogRequest.java | 0 .../api/WriteNotificationLogResponse.java | 0 .../api/hive_metastoreConstants.java | 0 .../gen-php/metastore/ThriftHiveMetastore.php | 0 .../gen/thrift/gen-php/metastore/Types.php | 0 .../src/gen/thrift/gen-py/__init__.py | 0 .../hive_metastore/ThriftHiveMetastore-remote | 0 .../hive_metastore/ThriftHiveMetastore.py | 0 .../thrift/gen-py/hive_metastore/__init__.py | 0 .../thrift/gen-py/hive_metastore/constants.py | 0 .../thrift/gen-py/hive_metastore/ttypes.py | 0 .../thrift/gen-rb/hive_metastore_constants.rb | 0 .../gen/thrift/gen-rb/hive_metastore_types.rb | 0 .../thrift/gen-rb/thrift_hive_metastore.rb | 0 .../hadoop/hive/common/StatsSetupConst.java | 0 .../common/classification/RetrySemantics.java | 0 .../common/ndv/NumDistinctValueEstimator.java | 0 .../ndv/NumDistinctValueEstimatorFactory.java | 0 .../hadoop/hive/common/ndv/fm/FMSketch.java | 0 .../hive/common/ndv/fm/FMSketchUtils.java | 0 .../hive/common/ndv/hll/HLLConstants.java | 0 .../hive/common/ndv/hll/HLLDenseRegister.java | 0 .../hive/common/ndv/hll/HLLRegister.java | 0 .../common/ndv/hll/HLLSparseRegister.java | 0 .../hive/common/ndv/hll/HyperLogLog.java | 0 .../hive/common/ndv/hll/HyperLogLogUtils.java | 0 .../hive/metastore/AcidEventListener.java | 0 .../hive/metastore/AggregateStatsCache.java | 0 .../hadoop/hive/metastore/AlterHandler.java | 0 .../hadoop/hive/metastore/Batchable.java | 0 .../hadoop/hive/metastore/ColumnType.java | 0 .../hive/metastore/DatabaseProduct.java | 0 .../hadoop/hive/metastore/Deadline.java | 0 .../hive/metastore/DeadlineException.java | 0 .../hive/metastore/DefaultHiveMetaHook.java | 0 .../DefaultMetaStoreFilterHookImpl.java | 0 .../DefaultPartitionExpressionProxy.java | 0 .../metastore/DefaultStorageSchemaReader.java | 0 .../hive/metastore/FileFormatProxy.java | 0 .../hive/metastore/FileMetadataHandler.java | 0 .../hive/metastore/FileMetadataManager.java | 0 .../hive/metastore/HMSMetricsListener.java | 0 .../hive/metastore/HiveAlterHandler.java | 0 .../hive/metastore/HiveMetaException.java | 0 .../hadoop/hive/metastore/HiveMetaHook.java | 0 .../hive/metastore/HiveMetaHookLoader.java | 0 .../hadoop/hive/metastore/HiveMetaStore.java | 0 .../hive/metastore/HiveMetaStoreClient.java | 0 .../hive/metastore/HiveMetaStoreFsImpl.java | 0 .../metastore/IExtrapolatePartStatus.java | 0 .../hadoop/hive/metastore/IHMSHandler.java | 0 .../hive/metastore/IMetaStoreClient.java | 0 .../hive/metastore/IMetaStoreSchemaInfo.java | 0 .../LinearExtrapolatePartStatus.java | 0 .../hive/metastore/LockComponentBuilder.java | 0 .../hive/metastore/LockRequestBuilder.java | 0 .../MaterializationsCacheCleanerTask.java | 0 .../MaterializationsInvalidationCache.java | 0 ...aterializationsRebuildLockCleanerTask.java | 0 .../MaterializationsRebuildLockHandler.java | 0 .../hive/metastore/MetaStoreDirectSql.java | 0 .../MetaStoreEndFunctionContext.java | 0 .../MetaStoreEndFunctionListener.java | 0 .../metastore/MetaStoreEventListener.java | 0 .../MetaStoreEventListenerConstants.java | 0 .../hadoop/hive/metastore/MetaStoreFS.java | 0 .../hive/metastore/MetaStoreFilterHook.java | 0 .../hadoop/hive/metastore/MetaStoreInit.java | 0 .../hive/metastore/MetaStoreInitContext.java | 0 .../hive/metastore/MetaStoreInitListener.java | 0 .../metastore/MetaStoreListenerNotifier.java | 0 .../metastore/MetaStorePreEventListener.java | 0 .../hive/metastore/MetaStoreSchemaInfo.java | 0 .../metastore/MetaStoreSchemaInfoFactory.java | 0 .../hive/metastore/MetaStoreThread.java | 0 .../hadoop/hive/metastore/MetadataStore.java | 0 .../hive/metastore/MetastoreTaskThread.java | 0 .../hadoop/hive/metastore/ObjectStore.java | 0 .../hive/metastore/PartFilterExprUtil.java | 0 .../hive/metastore/PartitionDropOptions.java | 0 .../metastore/PartitionExpressionProxy.java | 0 .../hadoop/hive/metastore/RawStore.java | 0 .../hadoop/hive/metastore/RawStoreProxy.java | 0 .../hive/metastore/ReplChangeManager.java | 0 .../hive/metastore/RetryingHMSHandler.java | 0 .../metastore/RetryingMetaStoreClient.java | 0 .../metastore/RuntimeStatsCleanerTask.java | 0 .../metastore/SessionPropertiesListener.java | 0 .../hive/metastore/StatObjectConverter.java | 0 .../hive/metastore/StorageSchemaReader.java | 0 .../metastore/TServerSocketKeepAlive.java | 0 .../metastore/TSetIpAddressProcessor.java | 0 .../hive/metastore/TUGIBasedProcessor.java | 0 .../hadoop/hive/metastore/TableType.java | 0 .../hadoop/hive/metastore/ThreadPool.java | 0 .../TransactionalMetaStoreEventListener.java | 0 .../TransactionalValidationListener.java | 0 .../hadoop/hive/metastore/Warehouse.java | 0 .../MetastoreVersionAnnotation.java | 0 .../metastore/annotation/NoReconnect.java | 0 .../api/InitializeTableWriteIdsRequest.java | 0 .../metastore/api/utils/DecimalUtils.java | 0 .../metastore/cache/ByteArrayWrapper.java | 0 .../hive/metastore/cache/CacheUtils.java | 0 .../hive/metastore/cache/CachedStore.java | 0 .../hive/metastore/cache/SharedCache.java | 0 .../client/builder/CatalogBuilder.java | 0 .../client/builder/ConstraintBuilder.java | 0 .../client/builder/DatabaseBuilder.java | 0 .../client/builder/FunctionBuilder.java | 0 .../GrantRevokePrivilegeRequestBuilder.java | 0 .../builder/HiveObjectPrivilegeBuilder.java | 0 .../client/builder/HiveObjectRefBuilder.java | 0 .../client/builder/ISchemaBuilder.java | 0 .../client/builder/PartitionBuilder.java | 0 .../builder/PrivilegeGrantInfoBuilder.java | 0 .../metastore/client/builder/RoleBuilder.java | 0 .../builder/SQLCheckConstraintBuilder.java | 0 .../builder/SQLDefaultConstraintBuilder.java | 0 .../client/builder/SQLForeignKeyBuilder.java | 0 .../builder/SQLNotNullConstraintBuilder.java | 0 .../client/builder/SQLPrimaryKeyBuilder.java | 0 .../builder/SQLUniqueConstraintBuilder.java | 0 .../client/builder/SchemaVersionBuilder.java | 0 .../client/builder/SerdeAndColsBuilder.java | 0 .../builder/StorageDescriptorBuilder.java | 0 .../client/builder/TableBuilder.java | 0 .../aggr/BinaryColumnStatsAggregator.java | 0 .../aggr/BooleanColumnStatsAggregator.java | 0 .../aggr/ColumnStatsAggregator.java | 0 .../aggr/ColumnStatsAggregatorFactory.java | 0 .../aggr/DateColumnStatsAggregator.java | 0 .../aggr/DecimalColumnStatsAggregator.java | 0 .../aggr/DoubleColumnStatsAggregator.java | 0 .../aggr/IExtrapolatePartStatus.java | 0 .../aggr/LongColumnStatsAggregator.java | 0 .../aggr/StringColumnStatsAggregator.java | 0 .../cache/DateColumnStatsDataInspector.java | 0 .../DecimalColumnStatsDataInspector.java | 0 .../cache/DoubleColumnStatsDataInspector.java | 0 .../cache/LongColumnStatsDataInspector.java | 0 .../cache/StringColumnStatsDataInspector.java | 0 .../merge/BinaryColumnStatsMerger.java | 0 .../merge/BooleanColumnStatsMerger.java | 0 .../columnstats/merge/ColumnStatsMerger.java | 0 .../merge/ColumnStatsMergerFactory.java | 0 .../merge/DateColumnStatsMerger.java | 0 .../merge/DecimalColumnStatsMerger.java | 0 .../merge/DoubleColumnStatsMerger.java | 0 .../merge/LongColumnStatsMerger.java | 0 .../merge/StringColumnStatsMerger.java | 0 .../metastore/conf/ConfTemplatePrinter.java | 0 .../hive/metastore/conf/EnumValidator.java | 0 .../hive/metastore/conf/MetastoreConf.java | 0 .../hive/metastore/conf/RangeValidator.java | 0 .../hive/metastore/conf/SizeValidator.java | 0 .../metastore/conf/StringSetValidator.java | 0 .../hive/metastore/conf/TimeValidator.java | 0 .../hadoop/hive/metastore/conf/Validator.java | 0 .../datasource/BoneCPDataSourceProvider.java | 0 .../datasource/DataSourceProvider.java | 0 .../datasource/DataSourceProviderFactory.java | 0 .../datasource/DbCPDataSourceProvider.java | 0 .../HikariCPDataSourceProvider.java | 0 .../metastore/datasource/package-info.java | 0 .../hive/metastore/events/AbortTxnEvent.java | 0 .../hive/metastore/events/AcidWriteEvent.java | 0 .../metastore/events/AddForeignKeyEvent.java | 0 .../events/AddNotNullConstraintEvent.java | 0 .../metastore/events/AddPartitionEvent.java | 0 .../metastore/events/AddPrimaryKeyEvent.java | 0 .../events/AddSchemaVersionEvent.java | 0 .../events/AddUniqueConstraintEvent.java | 0 .../metastore/events/AllocWriteIdEvent.java | 0 .../metastore/events/AlterCatalogEvent.java | 0 .../metastore/events/AlterDatabaseEvent.java | 0 .../metastore/events/AlterISchemaEvent.java | 0 .../metastore/events/AlterPartitionEvent.java | 0 .../events/AlterSchemaVersionEvent.java | 0 .../metastore/events/AlterTableEvent.java | 0 .../hive/metastore/events/CommitTxnEvent.java | 0 .../metastore/events/ConfigChangeEvent.java | 0 .../metastore/events/CreateCatalogEvent.java | 0 .../metastore/events/CreateDatabaseEvent.java | 0 .../metastore/events/CreateFunctionEvent.java | 0 .../metastore/events/CreateISchemaEvent.java | 0 .../metastore/events/CreateTableEvent.java | 0 .../metastore/events/DropCatalogEvent.java | 0 .../metastore/events/DropConstraintEvent.java | 0 .../metastore/events/DropDatabaseEvent.java | 0 .../metastore/events/DropFunctionEvent.java | 0 .../metastore/events/DropISchemaEvent.java | 0 .../metastore/events/DropPartitionEvent.java | 0 .../events/DropSchemaVersionEvent.java | 0 .../hive/metastore/events/DropTableEvent.java | 0 .../metastore/events/EventCleanerTask.java | 0 .../hive/metastore/events/InsertEvent.java | 0 .../hive/metastore/events/ListenerEvent.java | 0 .../events/LoadPartitionDoneEvent.java | 0 .../hive/metastore/events/OpenTxnEvent.java | 0 .../events/PreAddPartitionEvent.java | 0 .../events/PreAddSchemaVersionEvent.java | 0 .../events/PreAlterCatalogEvent.java | 0 .../events/PreAlterDatabaseEvent.java | 0 .../events/PreAlterISchemaEvent.java | 0 .../events/PreAlterPartitionEvent.java | 0 .../events/PreAlterSchemaVersionEvent.java | 0 .../metastore/events/PreAlterTableEvent.java | 0 .../events/PreAuthorizationCallEvent.java | 0 .../events/PreCreateCatalogEvent.java | 0 .../events/PreCreateDatabaseEvent.java | 0 .../events/PreCreateISchemaEvent.java | 0 .../metastore/events/PreCreateTableEvent.java | 0 .../metastore/events/PreDropCatalogEvent.java | 0 .../events/PreDropDatabaseEvent.java | 0 .../metastore/events/PreDropISchemaEvent.java | 0 .../events/PreDropPartitionEvent.java | 0 .../events/PreDropSchemaVersionEvent.java | 0 .../metastore/events/PreDropTableEvent.java | 0 .../metastore/events/PreEventContext.java | 0 .../events/PreLoadPartitionDoneEvent.java | 0 .../metastore/events/PreReadCatalogEvent.java | 0 .../events/PreReadDatabaseEvent.java | 0 .../metastore/events/PreReadISchemaEvent.java | 0 .../metastore/events/PreReadTableEvent.java | 0 .../events/PreReadhSchemaVersionEvent.java | 0 .../metastore/hooks/JDOConnectionURLHook.java | 0 .../hive/metastore/hooks/URIResolverHook.java | 0 .../metastore/messaging/AbortTxnMessage.java | 0 .../metastore/messaging/AcidWriteMessage.java | 0 .../messaging/AddForeignKeyMessage.java | 0 .../AddNotNullConstraintMessage.java | 0 .../messaging/AddPartitionMessage.java | 0 .../messaging/AddPrimaryKeyMessage.java | 0 .../messaging/AddUniqueConstraintMessage.java | 0 .../messaging/AllocWriteIdMessage.java | 0 .../messaging/AlterCatalogMessage.java | 0 .../messaging/AlterDatabaseMessage.java | 0 .../messaging/AlterPartitionMessage.java | 0 .../messaging/AlterTableMessage.java | 0 .../metastore/messaging/CommitTxnMessage.java | 0 .../messaging/CreateCatalogMessage.java | 0 .../messaging/CreateDatabaseMessage.java | 0 .../messaging/CreateFunctionMessage.java | 0 .../messaging/CreateTableMessage.java | 0 .../messaging/DropCatalogMessage.java | 0 .../messaging/DropConstraintMessage.java | 0 .../messaging/DropDatabaseMessage.java | 0 .../messaging/DropFunctionMessage.java | 0 .../messaging/DropPartitionMessage.java | 0 .../metastore/messaging/DropTableMessage.java | 0 .../metastore/messaging/EventMessage.java | 0 .../hive/metastore/messaging/EventUtils.java | 0 .../metastore/messaging/InsertMessage.java | 0 .../messaging/MessageDeserializer.java | 0 .../metastore/messaging/MessageFactory.java | 0 .../metastore/messaging/OpenTxnMessage.java | 0 .../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 .../json/JSONAddForeignKeyMessage.java | 0 .../json/JSONAddNotNullConstraintMessage.java | 0 .../json/JSONAddPartitionMessage.java | 0 .../json/JSONAddPrimaryKeyMessage.java | 0 .../json/JSONAddUniqueConstraintMessage.java | 0 .../json/JSONAllocWriteIdMessage.java | 0 .../json/JSONAlterCatalogMessage.java | 0 .../json/JSONAlterDatabaseMessage.java | 0 .../json/JSONAlterPartitionMessage.java | 0 .../messaging/json/JSONAlterTableMessage.java | 0 .../messaging/json/JSONCommitTxnMessage.java | 0 .../json/JSONCreateCatalogMessage.java | 0 .../json/JSONCreateDatabaseMessage.java | 0 .../json/JSONCreateFunctionMessage.java | 0 .../json/JSONCreateTableMessage.java | 0 .../json/JSONDropCatalogMessage.java | 0 .../json/JSONDropConstraintMessage.java | 0 .../json/JSONDropDatabaseMessage.java | 0 .../json/JSONDropFunctionMessage.java | 0 .../json/JSONDropPartitionMessage.java | 0 .../messaging/json/JSONDropTableMessage.java | 0 .../messaging/json/JSONInsertMessage.java | 0 .../json/JSONMessageDeserializer.java | 0 .../messaging/json/JSONMessageFactory.java | 0 .../messaging/json/JSONOpenTxnMessage.java | 0 .../hive/metastore/metrics/JsonReporter.java | 0 .../metastore/metrics/JvmPauseMonitor.java | 0 .../hive/metastore/metrics/Metrics.java | 0 .../metastore/metrics/MetricsConstants.java | 0 .../hive/metastore/metrics/PerfLogger.java | 0 .../hadoop/hive/metastore/model/MCatalog.java | 0 .../metastore/model/MColumnDescriptor.java | 0 .../hive/metastore/model/MConstraint.java | 0 .../metastore/model/MCreationMetadata.java | 0 .../hive/metastore/model/MDBPrivilege.java | 0 .../hive/metastore/model/MDatabase.java | 0 .../metastore/model/MDelegationToken.java | 0 .../hive/metastore/model/MFieldSchema.java | 0 .../hive/metastore/model/MFunction.java | 0 .../metastore/model/MGlobalPrivilege.java | 0 .../hadoop/hive/metastore/model/MISchema.java | 0 .../hadoop/hive/metastore/model/MIndex.java | 0 .../hive/metastore/model/MMasterKey.java | 0 .../model/MMetastoreDBProperties.java | 0 .../metastore/model/MNotificationLog.java | 0 .../metastore/model/MNotificationNextId.java | 0 .../hadoop/hive/metastore/model/MOrder.java | 0 .../hive/metastore/model/MPartition.java | 0 .../model/MPartitionColumnPrivilege.java | 0 .../model/MPartitionColumnStatistics.java | 0 .../hive/metastore/model/MPartitionEvent.java | 0 .../metastore/model/MPartitionPrivilege.java | 0 .../hive/metastore/model/MPrincipalDesc.java | 0 .../hive/metastore/model/MResourceUri.java | 0 .../hadoop/hive/metastore/model/MRole.java | 0 .../hadoop/hive/metastore/model/MRoleMap.java | 0 .../hive/metastore/model/MRuntimeStat.java | 0 .../hive/metastore/model/MSchemaVersion.java | 0 .../hive/metastore/model/MSerDeInfo.java | 0 .../metastore/model/MStorageDescriptor.java | 0 .../hive/metastore/model/MStringList.java | 0 .../hadoop/hive/metastore/model/MTable.java | 0 .../model/MTableColumnPrivilege.java | 0 .../model/MTableColumnStatistics.java | 0 .../hive/metastore/model/MTablePrivilege.java | 0 .../model/MTxnWriteNotificationLog.java | 0 .../hadoop/hive/metastore/model/MType.java | 0 .../hive/metastore/model/MVersionTable.java | 0 .../hive/metastore/model/MWMMapping.java | 0 .../hadoop/hive/metastore/model/MWMPool.java | 0 .../hive/metastore/model/MWMResourcePlan.java | 0 .../hive/metastore/model/MWMTrigger.java | 0 .../hive/metastore/parser/ExpressionTree.java | 0 .../hadoop/hive/metastore/parser/Filter.g | 0 .../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 .../DelegationTokenSecretManager.java | 0 .../security/DelegationTokenSelector.java | 0 .../security/DelegationTokenStore.java | 0 .../security/DelegationTokenTool.java | 0 .../security/HadoopThriftAuthBridge.java | 0 .../security/HadoopThriftAuthBridge23.java | 0 .../metastore/security/MemoryTokenStore.java | 0 .../MetastoreDelegationTokenManager.java | 0 .../metastore/security/TFilterTransport.java | 0 .../security/TUGIAssumingTransport.java | 0 .../security/TUGIContainingTransport.java | 0 ...okenStoreDelegationTokenSecretManager.java | 0 .../security/ZooKeeperTokenStore.java | 0 .../hive/metastore/tools/HiveMetaTool.java | 0 .../metastore/tools/HiveSchemaHelper.java | 0 .../metastore/tools/MetastoreSchemaTool.java | 0 .../hive/metastore/tools/SQLGenerator.java | 0 .../tools/SchemaToolCommandLine.java | 0 .../hive/metastore/tools/SchemaToolTask.java | 0 .../tools/SchemaToolTaskAlterCatalog.java | 0 .../tools/SchemaToolTaskCreateCatalog.java | 0 .../tools/SchemaToolTaskCreateUser.java | 0 .../metastore/tools/SchemaToolTaskInfo.java | 0 .../metastore/tools/SchemaToolTaskInit.java | 0 .../tools/SchemaToolTaskMoveDatabase.java | 0 .../tools/SchemaToolTaskMoveTable.java | 0 .../tools/SchemaToolTaskUpgrade.java | 0 .../tools/SchemaToolTaskValidate.java | 0 .../hive/metastore/tools/SmokeTest.java | 0 .../txn/AcidCompactionHistoryService.java | 0 .../metastore/txn/AcidHouseKeeperService.java | 0 .../txn/AcidOpenTxnsCounterService.java | 0 .../metastore/txn/AcidWriteSetService.java | 0 .../hive/metastore/txn/CompactionInfo.java | 0 .../metastore/txn/CompactionTxnHandler.java | 0 .../hadoop/hive/metastore/txn/TxnDbUtil.java | 0 .../hadoop/hive/metastore/txn/TxnHandler.java | 0 .../hadoop/hive/metastore/txn/TxnStore.java | 0 .../hadoop/hive/metastore/txn/TxnUtils.java | 0 .../metastore/utils/CommonCliOptions.java | 0 .../hive/metastore/utils/FileUtils.java | 0 .../hive/metastore/utils/HdfsUtils.java | 0 .../utils/HiveStrictManagedUtils.java | 0 .../hive/metastore/utils/JavaUtils.java | 0 .../hadoop/hive/metastore/utils/LogUtils.java | 0 .../hive/metastore/utils/MetaStoreUtils.java | 0 .../metastore/utils/MetastoreVersionInfo.java | 0 .../hive/metastore/utils/ObjectPair.java | 0 .../hive/metastore/utils/SecurityUtils.java | 0 .../hive/metastore/utils/StringUtils.java | 0 .../hive/metastore/utils/StringableMap.java | 0 .../MetastoreDelegationTokenSupport.java | 0 .../hadoop/hive/metastore/metastore.proto | 0 .../resources/datanucleus-log4j.properties | 0 .../resources/metastore-log4j2.properties | 0 .../src/main/resources/metastore-site.xml | 0 .../src/main/resources/package.jdo | 0 .../src/main/resources/saveVersion.sh | 0 .../main/resources/thrift-replacements.txt | 2 +- .../src/main/scripts/base | 2 +- .../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 .../sql/derby/hive-schema-1.2.0.derby.sql | 0 .../sql/derby/hive-schema-3.0.0.derby.sql | 0 .../sql/derby/hive-schema-3.1.0.derby.sql | 0 .../sql/derby/hive-schema-4.0.0.derby.sql | 0 .../derby/upgrade-1.2.0-to-2.0.0.derby.sql | 0 .../derby/upgrade-2.0.0-to-2.1.0.derby.sql | 0 .../derby/upgrade-2.1.0-to-2.2.0.derby.sql | 0 .../derby/upgrade-2.2.0-to-2.3.0.derby.sql | 0 .../derby/upgrade-2.3.0-to-3.0.0.derby.sql | 0 .../derby/upgrade-3.0.0-to-3.1.0.derby.sql | 0 .../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 .../sql/mssql/hive-schema-1.2.0.mssql.sql | 0 .../sql/mssql/hive-schema-3.0.0.mssql.sql | 0 .../sql/mssql/hive-schema-3.1.0.mssql.sql | 0 .../sql/mssql/hive-schema-4.0.0.mssql.sql | 0 .../mssql/upgrade-1.2.0-to-2.0.0.mssql.sql | 0 .../mssql/upgrade-2.0.0-to-2.1.0.mssql.sql | 0 .../mssql/upgrade-2.1.0-to-2.2.0.mssql.sql | 0 .../mssql/upgrade-2.2.0-to-2.3.0.mssql.sql | 0 .../mssql/upgrade-2.3.0-to-3.0.0.mssql.sql | 0 .../mssql/upgrade-3.0.0-to-3.1.0.mssql.sql | 0 .../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 .../sql/mysql/hive-schema-1.2.0.mysql.sql | 0 .../sql/mysql/hive-schema-3.0.0.mysql.sql | 0 .../sql/mysql/hive-schema-3.1.0.mysql.sql | 0 .../sql/mysql/hive-schema-4.0.0.mysql.sql | 0 .../mysql/upgrade-1.2.0-to-2.0.0.mysql.sql | 0 .../mysql/upgrade-2.0.0-to-2.1.0.mysql.sql | 0 .../mysql/upgrade-2.1.0-to-2.2.0.mysql.sql | 0 .../mysql/upgrade-2.2.0-to-2.3.0.mysql.sql | 0 .../mysql/upgrade-2.3.0-to-3.0.0.mysql.sql | 0 .../mysql/upgrade-3.0.0-to-3.1.0.mysql.sql | 0 .../mysql/upgrade-3.1.0-to-4.0.0.mysql.sql | 0 .../src/main/sql/mysql/upgrade.order.mysql | 0 .../main/sql/oracle/create-user.oracle.sql | 0 .../sql/oracle/hive-schema-1.2.0.oracle.sql | 0 .../sql/oracle/hive-schema-3.0.0.oracle.sql | 0 .../sql/oracle/hive-schema-3.1.0.oracle.sql | 0 .../sql/oracle/hive-schema-4.0.0.oracle.sql | 0 .../oracle/upgrade-1.2.0-to-2.0.0.oracle.sql | 0 .../oracle/upgrade-2.0.0-to-2.1.0.oracle.sql | 0 .../oracle/upgrade-2.1.0-to-2.2.0.oracle.sql | 0 .../oracle/upgrade-2.2.0-to-2.3.0.oracle.sql | 0 .../oracle/upgrade-2.3.0-to-3.0.0.oracle.sql | 0 .../oracle/upgrade-3.0.0-to-3.1.0.oracle.sql | 0 .../oracle/upgrade-3.1.0-to-4.0.0.oracle.sql | 0 .../src/main/sql/oracle/upgrade.order.oracle | 0 .../sql/postgres/create-user.postgres.sql | 0 .../postgres/hive-schema-1.2.0.postgres.sql | 0 .../postgres/hive-schema-3.0.0.postgres.sql | 0 .../postgres/hive-schema-3.1.0.postgres.sql | 0 .../postgres/hive-schema-4.0.0.postgres.sql | 0 .../upgrade-1.2.0-to-2.0.0.postgres.sql | 0 .../upgrade-2.0.0-to-2.1.0.postgres.sql | 0 .../upgrade-2.1.0-to-2.2.0.postgres.sql | 0 .../upgrade-2.2.0-to-2.3.0.postgres.sql | 0 .../upgrade-2.3.0-to-3.0.0.postgres.sql | 0 .../upgrade-3.0.0-to-3.1.0.postgres.sql | 0 .../upgrade-3.1.0-to-4.0.0.postgres.sql | 0 .../main/sql/postgres/upgrade.order.postgres | 0 .../src/main/thrift/hive_metastore.thrift | 0 .../hive/common/TestStatsSetupConst.java | 0 .../ndv/fm/TestFMSketchSerialization.java | 0 .../hive/common/ndv/hll/TestHLLNoBias.java | 0 .../common/ndv/hll/TestHLLSerialization.java | 0 .../hive/common/ndv/hll/TestHyperLogLog.java | 0 .../common/ndv/hll/TestHyperLogLogDense.java | 0 .../common/ndv/hll/TestHyperLogLogMerge.java | 0 .../common/ndv/hll/TestHyperLogLogSparse.java | 0 .../common/ndv/hll/TestSparseEncodeHash.java | 0 .../AlternateFailurePreListener.java | 0 .../metastore/DummyEndFunctionListener.java | 0 .../metastore/DummyJdoConnectionUrlHook.java | 0 .../hadoop/hive/metastore/DummyListener.java | 0 .../metastore/DummyMetaStoreInitListener.java | 0 .../hive/metastore/DummyPreListener.java | 0 .../DummyRawStoreControlledCommit.java | 0 .../DummyRawStoreForJdoConnection.java | 0 .../hadoop/hive/metastore/FakeDerby.java | 0 .../HiveMetaStoreClientPreCatalog.java | 0 .../InjectableBehaviourObjectStore.java | 0 .../hive/metastore/IpAddressListener.java | 0 .../hive/metastore/MetaStoreTestUtils.java | 0 .../MockPartitionExpressionForMetastore.java | 0 .../metastore/NonCatCallsWithCatalog.java | 0 .../hadoop/hive/metastore/TestAdminUser.java | 0 .../metastore/TestAggregateStatsCache.java | 0 .../TestCatalogNonDefaultClient.java | 0 .../metastore/TestCatalogNonDefaultSvr.java | 0 .../hive/metastore/TestCatalogOldClient.java | 0 .../hadoop/hive/metastore/TestDeadline.java | 0 .../metastore/TestEmbeddedHiveMetaStore.java | 0 .../hive/metastore/TestFilterHooks.java | 0 .../hive/metastore/TestHiveAlterHandler.java | 0 .../hive/metastore/TestHiveMetaStore.java | 0 .../TestHiveMetaStoreGetMetaConf.java | 0 .../TestHiveMetaStorePartitionSpecs.java | 0 .../TestHiveMetaStoreSchemaMethods.java | 0 .../metastore/TestHiveMetaStoreTimeout.java | 0 .../hive/metastore/TestHiveMetaStoreTxns.java | 0 ...stHiveMetaStoreWithEnvironmentContext.java | 0 .../hive/metastore/TestHiveMetastoreCli.java | 0 .../metastore/TestLockRequestBuilder.java | 0 .../hive/metastore/TestMarkPartition.java | 0 .../metastore/TestMarkPartitionRemote.java | 0 .../TestMetaStoreConnectionUrlHook.java | 0 .../TestMetaStoreEndFunctionListener.java | 0 .../metastore/TestMetaStoreEventListener.java | 0 ...estMetaStoreEventListenerOnlyOnCommit.java | 0 ...TestMetaStoreEventListenerWithOldConf.java | 0 .../metastore/TestMetaStoreInitListener.java | 0 .../TestMetaStoreListenersError.java | 0 ...MetaStoreMaterializationsCacheCleaner.java | 0 .../metastore/TestMetaStoreSchemaFactory.java | 0 .../metastore/TestMetaStoreSchemaInfo.java | 0 .../hive/metastore/TestObjectStore.java | 0 .../metastore/TestObjectStoreInitRetry.java | 0 .../TestObjectStoreSchemaMethods.java | 0 .../hadoop/hive/metastore/TestOldSchema.java | 0 .../TestPartitionNameWhitelistValidation.java | 0 .../hive/metastore/TestRawStoreProxy.java | 0 .../metastore/TestRemoteHiveMetaStore.java | 0 .../TestRemoteHiveMetaStoreIpAddress.java | 0 .../TestRemoteUGIHiveMetaStoreIpAddress.java | 0 .../TestRetriesInRetryingHMSHandler.java | 0 .../metastore/TestRetryingHMSHandler.java | 0 .../TestSetUGIOnBothClientServer.java | 0 .../metastore/TestSetUGIOnOnlyClient.java | 0 .../metastore/TestSetUGIOnOnlyServer.java | 0 .../hadoop/hive/metastore/TestStats.java | 0 .../hive/metastore/VerifyingObjectStore.java | 0 .../annotation/MetastoreCheckinTest.java | 0 .../metastore/annotation/MetastoreTest.java | 0 .../annotation/MetastoreUnitTest.java | 0 .../hive/metastore/cache/TestCachedStore.java | 0 .../metastore/cache/TestCatalogCaching.java | 0 .../metastore/client/MetaStoreClientTest.java | 0 .../client/MetaStoreFactoryForTests.java | 0 .../metastore/client/TestAddPartitions.java | 0 .../client/TestAddPartitionsFromPartSpec.java | 0 .../metastore/client/TestAlterPartitions.java | 0 .../client/TestAppendPartitions.java | 0 .../hive/metastore/client/TestCatalogs.java | 0 .../metastore/client/TestCheckConstraint.java | 0 .../hive/metastore/client/TestDatabases.java | 0 .../client/TestDefaultConstraint.java | 0 .../metastore/client/TestDropPartitions.java | 0 .../client/TestExchangePartitions.java | 0 .../hive/metastore/client/TestForeignKey.java | 0 .../hive/metastore/client/TestFunctions.java | 0 .../metastore/client/TestGetPartitions.java | 0 .../metastore/client/TestGetTableMeta.java | 0 .../metastore/client/TestListPartitions.java | 0 .../client/TestNotNullConstraint.java | 0 .../hive/metastore/client/TestPrimaryKey.java | 0 .../metastore/client/TestRuntimeStats.java | 0 .../TestTablesCreateDropAlterTruncate.java | 0 .../metastore/client/TestTablesGetExists.java | 0 .../hive/metastore/client/TestTablesList.java | 0 .../client/TestUniqueConstraint.java | 0 .../hive/metastore/client/package-info.java | 0 .../merge/DecimalColumnStatsMergerTest.java | 0 .../metastore/conf/TestMetastoreConf.java | 0 .../TestDataSourceProviderFactory.java | 0 .../metastore/dbinstall/DbInstallBase.java | 0 .../hive/metastore/dbinstall/ITestMysql.java | 0 .../hive/metastore/dbinstall/ITestOracle.java | 0 .../metastore/dbinstall/ITestPostgres.java | 0 .../metastore/dbinstall/ITestSqlServer.java | 0 .../json/TestJSONMessageDeserializer.java | 0 .../hive/metastore/metrics/TestMetrics.java | 0 .../minihms/AbstractMetaStoreService.java | 0 .../minihms/ClusterMetaStoreForTests.java | 0 .../minihms/EmbeddedMetaStoreForTests.java | 0 .../hive/metastore/minihms/MiniHMS.java | 0 .../minihms/RemoteMetaStoreForTests.java | 0 .../hive/metastore/minihms/package-info.java | 0 .../tools/TestMetastoreSchemaTool.java | 0 .../tools/TestSchemaToolForMetastore.java | 0 .../metastore/txn/TestTxnHandlerNegative.java | 0 .../hive/metastore/txn/TestTxnUtils.java | 0 .../hive/metastore/utils/TestHdfsUtils.java | 0 .../metastore/utils/TestMetaStoreUtils.java | 0 .../src/test/resources/log4j2.properties | 0 .../metastore/annotation/package-info.java | 8 + standalone-metastore/pom.xml | 975 ++++-------------- upgrade-acid/pom.xml | 2 +- 886 files changed, 997 insertions(+), 805 deletions(-) create mode 100644 standalone-metastore/metastore-common/pom.xml rename standalone-metastore/{ => metastore-common}/src/assembly/bin.xml (100%) rename standalone-metastore/{ => metastore-common}/src/assembly/src.xml (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-cpp/hive_metastore_constants.h (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-cpp/hive_metastore_types.cpp (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-cpp/hive_metastore_types.h (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddCheckConstraintRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDefaultConstraintRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterCatalogRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterISchemaRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BinaryColumnStatsData.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BooleanColumnStatsData.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Catalog.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckLockRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapability.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsData.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateCatalogRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CurrentNotificationEventId.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataOperationType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Date.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DateColumnStatsData.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Decimal.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropCatalogRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsExpr.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsRqst.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRuntimeStatsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSerdeRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidInputException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidPartitionException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockComponent.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockLevel.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockState.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MapSchemaVersionToSerdeRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetadataPpdResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchLockException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchTxnException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RuntimeStat.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLDefaultConstraint.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLForeignKey.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLNotNullConstraint.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLPrimaryKey.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLUniqueConstraint.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaCompatibility.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaValidation.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionDescriptor.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionState.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerdeType.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetSchemaVersionStateRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableMeta.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnAbortedException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnOpenException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnState.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnToWriteId.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownPartitionException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnlockRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMMapping.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullablePool.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullableResourcePlan.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPool.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolSchedulingPolicy.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolTrigger.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlan.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlanStatus.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMTrigger.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteEventInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogResponse.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-php/metastore/Types.php (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-py/__init__.py (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-py/hive_metastore/__init__.py (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-py/hive_metastore/constants.py (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-py/hive_metastore/ttypes.py (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-rb/hive_metastore_constants.rb (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-rb/hive_metastore_types.rb (100%) rename standalone-metastore/{ => metastore-common}/src/gen/thrift/gen-rb/thrift_hive_metastore.rb (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/classification/RetrySemantics.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/DefaultHiveMetaHook.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/DefaultMetaStoreFilterHookImpl.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/FileFormatProxy.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/HMSMetricsListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaException.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHook.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHookLoader.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsCacheCleanerTask.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsInvalidationCache.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFilterHook.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/PartitionDropOptions.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/StorageSchemaReader.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/TableType.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/annotation/MetastoreVersionAnnotation.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/annotation/NoReconnect.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/api/InitializeTableWriteIdsRequest.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/conf/ConfTemplatePrinter.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/conf/EnumValidator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/conf/RangeValidator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/conf/SizeValidator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/conf/StringSetValidator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/conf/Validator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/hooks/URIResolverHook.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/TFilterTransport.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIAssumingTransport.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolCommandLine.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTask.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskAlterCatalog.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateCatalog.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateUser.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInit.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveDatabase.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveTable.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskUpgrade.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskValidate.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/JavaUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/ObjectPair.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/StringUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/security/token/delegation/MetastoreDelegationTokenSupport.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/protobuf/org/apache/hadoop/hive/metastore/metastore.proto (100%) rename standalone-metastore/{ => metastore-common}/src/main/resources/datanucleus-log4j.properties (100%) rename standalone-metastore/{ => metastore-common}/src/main/resources/metastore-log4j2.properties (100%) rename standalone-metastore/{ => metastore-common}/src/main/resources/metastore-site.xml (100%) rename standalone-metastore/{ => metastore-common}/src/main/resources/package.jdo (100%) rename standalone-metastore/{ => metastore-common}/src/main/resources/saveVersion.sh (100%) rename standalone-metastore/{ => metastore-common}/src/main/resources/thrift-replacements.txt (98%) rename standalone-metastore/{ => metastore-common}/src/main/scripts/base (98%) rename standalone-metastore/{ => metastore-common}/src/main/scripts/ext/metastore.sh (95%) rename standalone-metastore/{ => metastore-common}/src/main/scripts/ext/schemaTool.sh (94%) rename standalone-metastore/{ => metastore-common}/src/main/scripts/ext/smokeTest.sh (95%) rename standalone-metastore/{ => metastore-common}/src/main/scripts/metastore-config.sh (100%) rename standalone-metastore/{ => metastore-common}/src/main/scripts/schematool (100%) rename standalone-metastore/{ => metastore-common}/src/main/scripts/start-metastore (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/hive-schema-1.2.0.derby.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/hive-schema-3.0.0.derby.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/hive-schema-3.1.0.derby.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/hive-schema-4.0.0.derby.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/derby/upgrade.order.derby (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/create-user.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mssql/upgrade.order.mssql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/create-user.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/mysql/upgrade.order.mysql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/create-user.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/oracle/upgrade.order.oracle (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/create-user.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-common}/src/main/sql/postgres/upgrade.order.postgres (100%) rename standalone-metastore/{ => metastore-common}/src/main/thrift/hive_metastore.thrift (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogMerge.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/AlternateFailurePreListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/DummyEndFunctionListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/DummyJdoConnectionUrlHook.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/DummyListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/DummyMetaStoreInitListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/DummyPreListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMaterializationsCacheCleaner.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreSchemaMethods.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/TestStats.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/VerifyingObjectStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCatalogCaching.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreClientTest.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreFactoryForTests.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/minihms/package-info.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/tools/TestMetastoreSchemaTool.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/tools/TestSchemaToolForMetastore.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java (100%) rename standalone-metastore/{ => metastore-common}/src/test/resources/log4j2.properties (100%) create mode 100644 standalone-metastore/metastore-server/src/gen/version/org/apache/hadoop/hive/metastore/annotation/package-info.java diff --git a/.gitignore b/.gitignore index eb7235cf1e..33f209dd99 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ itests/hive-blobstore/src/test/resources/blobstore-conf.xml .DS_Store patchprocess standalone-metastore/src/gen/version +standalone-metastore/metastore-common/src/gen/version diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml index 431552789e..06e83e1adb 100644 --- a/hcatalog/core/pom.xml +++ b/hcatalog/core/pom.xml @@ -69,7 +69,7 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test-jar test diff --git a/hcatalog/webhcat/java-client/pom.xml b/hcatalog/webhcat/java-client/pom.xml index 56b6d53449..185c785c90 100644 --- a/hcatalog/webhcat/java-client/pom.xml +++ b/hcatalog/webhcat/java-client/pom.xml @@ -76,7 +76,7 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test-jar test diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml index 5c093b0a4f..8e4bc70356 100644 --- a/hcatalog/webhcat/svr/pom.xml +++ b/hcatalog/webhcat/svr/pom.xml @@ -202,7 +202,7 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test-jar test diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml index a1d214981b..0568cf6eaf 100644 --- a/itests/hcatalog-unit/pom.xml +++ b/itests/hcatalog-unit/pom.xml @@ -98,7 +98,7 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml index 9466af231e..b8d5f0d65b 100644 --- a/itests/hive-blobstore/pom.xml +++ b/itests/hive-blobstore/pom.xml @@ -55,13 +55,13 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} tests test diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml index 4d6e8a8985..406c407cdd 100644 --- a/itests/hive-minikdc/pom.xml +++ b/itests/hive-minikdc/pom.xml @@ -74,13 +74,13 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test tests diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml index 04e39b5739..3288659cd0 100644 --- a/itests/hive-unit-hadoop2/pom.xml +++ b/itests/hive-unit-hadoop2/pom.xml @@ -101,7 +101,7 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} tests diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml index 5264617afa..6081884086 100644 --- a/itests/hive-unit/pom.xml +++ b/itests/hive-unit/pom.xml @@ -177,7 +177,7 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} tests @@ -568,7 +568,7 @@ - + diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml index 1a1100cd57..e0c31e480d 100644 --- a/itests/qtest-accumulo/pom.xml +++ b/itests/qtest-accumulo/pom.xml @@ -67,13 +67,13 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} tests test diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml index 8ed3171623..c33aa90a5c 100644 --- a/itests/qtest-spark/pom.xml +++ b/itests/qtest-spark/pom.xml @@ -127,13 +127,13 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} tests test diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index a1400fdea0..8020743302 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -58,13 +58,13 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} tests test diff --git a/itests/util/pom.xml b/itests/util/pom.xml index 9334f90d28..e1aece6430 100644 --- a/itests/util/pom.xml +++ b/itests/util/pom.xml @@ -113,7 +113,7 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test-jar diff --git a/llap-server/pom.xml b/llap-server/pom.xml index 978d79735e..6b52d5da48 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -242,7 +242,7 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test-jar test diff --git a/metastore/pom.xml b/metastore/pom.xml index dc1b4e830e..a75ab97ae7 100644 --- a/metastore/pom.xml +++ b/metastore/pom.xml @@ -46,7 +46,7 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} diff --git a/packaging/src/main/assembly/bin.xml b/packaging/src/main/assembly/bin.xml index 2dd92604e6..373ed99840 100644 --- a/packaging/src/main/assembly/bin.xml +++ b/packaging/src/main/assembly/bin.xml @@ -222,7 +222,7 @@ - ${project.parent.basedir}/standalone-metastore/src/main/sql + ${project.parent.basedir}/standalone-metastore/metastore-common/src/main/sql **/* diff --git a/packaging/src/main/assembly/src.xml b/packaging/src/main/assembly/src.xml index c9aed3b3e6..d9db67df3d 100644 --- a/packaging/src/main/assembly/src.xml +++ b/packaging/src/main/assembly/src.xml @@ -96,7 +96,7 @@ shims/**/* spark-client/**/* storage-api/**/* - standalone-metastore/**/* + standalone-metastore/metastore-common/**/* streaming/**/* testutils/**/* upgrade-acid/**/* diff --git a/ql/pom.xml b/ql/pom.xml index 0c181e515c..fe11d06694 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -458,7 +458,7 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test-jar test @@ -915,7 +915,7 @@ org.apache.hive:hive-llap-common org.apache.hive:hive-llap-client org.apache.hive:hive-metastore - org.apache.hive:hive-standalone-metastore + org.apache.hive:hive-standalone-metastore-common org.apache.hive:hive-service-rpc com.esotericsoftware:kryo-shaded com.esotericsoftware:minlog diff --git a/service/pom.xml b/service/pom.xml index ebe78639f1..702347281b 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -230,7 +230,7 @@ org.apache.hive - hive-standalone-metastore + hive-standalone-metastore-common ${project.version} test-jar test diff --git a/standalone-metastore/DEV-README b/standalone-metastore/DEV-README index 7b65e925c5..9c261171fb 100644 --- a/standalone-metastore/DEV-README +++ b/standalone-metastore/DEV-README @@ -49,7 +49,7 @@ You can download the Oracle driver at http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html You should download Oracle 11g Release 1, ojdbc6.jar -Logs for tests are located under standalone-metastore/target/failsafe-reports +Logs for tests are located under standalone-metastore/metastore-common/target/failsafe-reports If you wish to use one of these containers to run your own tests against a non-Derby version of the metastore, you can do that as well. You must specify diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml new file mode 100644 index 0000000000..d6df15f9c1 --- /dev/null +++ b/standalone-metastore/metastore-common/pom.xml @@ -0,0 +1,754 @@ + + + + hive-standalone-metastore + org.apache.hive + 4.0.0-SNAPSHOT + + 4.0.0 + + hive-standalone-metastore-common + Hive Standalone Metastore Common Code + + + + 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 + + + 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 + + + generate-thrift-sources + generate-sources + + + + + + + + + + + + + + + + + + + + + + run + + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + process-thrift-sources-string-intern + process-sources + + replace + + + ${basedir}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ + + FieldSchema.java + Partition.java + SerDeInfo.java + StorageDescriptor.java + ColumnStatisticsDesc.java + ColumnStatisticsObj.java + + ${basedir}/src/main/resources/thrift-replacements.txt + true + false + + + + process-thrift-sources-interface-annotations + process-sources + + replace + + + ${basedir}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ + *.java + + + public class + @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class + true + + + public static class + @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class + true + + + public interface + @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public interface + true + + + + + + + + + + + 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/src/assembly/bin.xml b/standalone-metastore/metastore-common/src/assembly/bin.xml similarity index 100% rename from standalone-metastore/src/assembly/bin.xml rename to standalone-metastore/metastore-common/src/assembly/bin.xml diff --git a/standalone-metastore/src/assembly/src.xml b/standalone-metastore/metastore-common/src/assembly/src.xml similarity index 100% rename from standalone-metastore/src/assembly/src.xml rename to standalone-metastore/metastore-common/src/assembly/src.xml diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp rename to standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h rename to standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp rename to standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp rename to standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.h similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h rename to standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_constants.h diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp rename to standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.cpp diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h b/standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h rename to standalone-metastore/metastore-common/src/gen/thrift/gen-cpp/hive_metastore_types.h diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddCheckConstraintRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddCheckConstraintRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddCheckConstraintRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddCheckConstraintRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDefaultConstraintRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDefaultConstraintRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDefaultConstraintRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDefaultConstraintRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterCatalogRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterCatalogRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterCatalogRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterCatalogRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterISchemaRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterISchemaRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterISchemaRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterISchemaRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BinaryColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BinaryColumnStatsData.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BinaryColumnStatsData.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BinaryColumnStatsData.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BooleanColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BooleanColumnStatsData.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BooleanColumnStatsData.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BooleanColumnStatsData.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CacheFileMetadataResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Catalog.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Catalog.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Catalog.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Catalog.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckLockRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckLockRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckLockRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckLockRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapability.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapability.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapability.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapability.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CmRecycleResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsData.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsData.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsData.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateCatalogRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateCatalogRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateCatalogRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreateCatalogRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CurrentNotificationEventId.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CurrentNotificationEventId.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CurrentNotificationEventId.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CurrentNotificationEventId.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataOperationType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataOperationType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataOperationType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DataOperationType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Date.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Date.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Date.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Date.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DateColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DateColumnStatsData.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DateColumnStatsData.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DateColumnStatsData.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Decimal.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Decimal.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Decimal.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Decimal.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropCatalogRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropCatalogRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropCatalogRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropCatalogRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsExpr.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsExpr.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsExpr.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsExpr.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FileMetadataExprType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsRqst.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsRqst.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsRqst.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsRqst.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRuntimeStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRuntimeStatsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRuntimeStatsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRuntimeStatsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSerdeRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSerdeRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSerdeRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetSerdeRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidInputException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidInputException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidInputException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidInputException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidPartitionException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidPartitionException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidPartitionException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidPartitionException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockComponent.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockComponent.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockComponent.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockComponent.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockLevel.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockLevel.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockLevel.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockLevel.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockState.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockState.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockState.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockState.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MapSchemaVersionToSerdeRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MapSchemaVersionToSerdeRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MapSchemaVersionToSerdeRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MapSchemaVersionToSerdeRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetadataPpdResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetadataPpdResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetadataPpdResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetadataPpdResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchLockException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchLockException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchLockException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchLockException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchTxnException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchTxnException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchTxnException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchTxnException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RuntimeStat.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RuntimeStat.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RuntimeStat.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RuntimeStat.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLDefaultConstraint.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLDefaultConstraint.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLDefaultConstraint.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLDefaultConstraint.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLForeignKey.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLForeignKey.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLForeignKey.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLForeignKey.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLNotNullConstraint.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLNotNullConstraint.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLNotNullConstraint.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLNotNullConstraint.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLPrimaryKey.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLPrimaryKey.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLPrimaryKey.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLPrimaryKey.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLUniqueConstraint.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLUniqueConstraint.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLUniqueConstraint.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLUniqueConstraint.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaCompatibility.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaCompatibility.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaCompatibility.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaCompatibility.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaValidation.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaValidation.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaValidation.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaValidation.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionDescriptor.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionDescriptor.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionDescriptor.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionDescriptor.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionState.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionState.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionState.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersionState.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerdeType.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerdeType.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerdeType.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerdeType.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetSchemaVersionStateRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetSchemaVersionStateRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetSchemaVersionStateRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetSchemaVersionStateRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponseElement.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableMeta.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableMeta.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableMeta.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableMeta.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnAbortedException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnAbortedException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnAbortedException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnAbortedException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnOpenException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnOpenException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnOpenException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnOpenException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnState.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnState.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnState.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnState.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnToWriteId.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnToWriteId.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnToWriteId.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnToWriteId.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownPartitionException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownPartitionException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownPartitionException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownPartitionException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnlockRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnlockRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnlockRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnlockRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterPoolResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterTriggerResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrUpdateMappingResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreatePoolResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateResourcePlanResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateTriggerResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropMappingResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropPoolResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropResourcePlanResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMDropTriggerResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetActiveResourcePlanResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetResourcePlanResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMMapping.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMMapping.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMMapping.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMMapping.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullablePool.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullablePool.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullablePool.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullablePool.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullableResourcePlan.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullableResourcePlan.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullableResourcePlan.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMNullableResourcePlan.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPool.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPool.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPool.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPool.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolSchedulingPolicy.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolSchedulingPolicy.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolSchedulingPolicy.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolSchedulingPolicy.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolTrigger.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolTrigger.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolTrigger.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMPoolTrigger.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlan.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlan.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlan.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlan.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlanStatus.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlanStatus.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlanStatus.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMResourcePlanStatus.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMTrigger.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMTrigger.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMTrigger.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMTrigger.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteEventInfo.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteEventInfo.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteEventInfo.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteEventInfo.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogRequest.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogRequest.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogRequest.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogResponse.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogResponse.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogResponse.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogResponse.java diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java rename to standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java diff --git a/standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php rename to standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php diff --git a/standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Types.php similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php rename to standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Types.php diff --git a/standalone-metastore/src/gen/thrift/gen-py/__init__.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/__init__.py similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-py/__init__.py rename to standalone-metastore/metastore-common/src/gen/thrift/gen-py/__init__.py diff --git a/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote rename to standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote diff --git a/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py rename to standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py diff --git a/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/__init__.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/__init__.py similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-py/hive_metastore/__init__.py rename to standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/__init__.py diff --git a/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/constants.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/constants.py similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-py/hive_metastore/constants.py rename to standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/constants.py diff --git a/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py rename to standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py diff --git a/standalone-metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_constants.rb similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb rename to standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_constants.rb diff --git a/standalone-metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb rename to standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb diff --git a/standalone-metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/thrift_hive_metastore.rb similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb rename to standalone-metastore/metastore-common/src/gen/thrift/gen-rb/thrift_hive_metastore.rb diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/StatsSetupConst.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/classification/RetrySemantics.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/classification/RetrySemantics.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/classification/RetrySemantics.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/classification/RetrySemantics.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultHiveMetaHook.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultHiveMetaHook.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultHiveMetaHook.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultHiveMetaHook.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultMetaStoreFilterHookImpl.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultMetaStoreFilterHookImpl.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultMetaStoreFilterHookImpl.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultMetaStoreFilterHookImpl.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileFormatProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileFormatProxy.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileFormatProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileFormatProxy.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HMSMetricsListener.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HMSMetricsListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HMSMetricsListener.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HMSMetricsListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaException.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaException.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaException.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaException.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHook.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHook.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHook.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHook.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHookLoader.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHookLoader.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHookLoader.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHookLoader.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsCacheCleanerTask.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsCacheCleanerTask.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsCacheCleanerTask.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsCacheCleanerTask.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsInvalidationCache.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsInvalidationCache.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsInvalidationCache.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsInvalidationCache.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFilterHook.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFilterHook.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFilterHook.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFilterHook.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/PartitionDropOptions.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartitionDropOptions.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/PartitionDropOptions.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartitionDropOptions.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/StorageSchemaReader.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/StorageSchemaReader.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/StorageSchemaReader.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/StorageSchemaReader.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TableType.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TableType.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TableType.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TableType.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/annotation/MetastoreVersionAnnotation.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/annotation/MetastoreVersionAnnotation.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/annotation/MetastoreVersionAnnotation.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/annotation/MetastoreVersionAnnotation.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/annotation/NoReconnect.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/annotation/NoReconnect.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/annotation/NoReconnect.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/annotation/NoReconnect.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/api/InitializeTableWriteIdsRequest.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/api/InitializeTableWriteIdsRequest.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/api/InitializeTableWriteIdsRequest.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/api/InitializeTableWriteIdsRequest.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/ConfTemplatePrinter.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/ConfTemplatePrinter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/ConfTemplatePrinter.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/ConfTemplatePrinter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/EnumValidator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/EnumValidator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/EnumValidator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/EnumValidator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/RangeValidator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/RangeValidator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/RangeValidator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/RangeValidator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/SizeValidator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/SizeValidator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/SizeValidator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/SizeValidator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/StringSetValidator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/StringSetValidator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/StringSetValidator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/StringSetValidator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/TimeValidator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/Validator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/Validator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/conf/Validator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/Validator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/hooks/URIResolverHook.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/hooks/URIResolverHook.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/hooks/URIResolverHook.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/hooks/URIResolverHook.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionListComposingSpecProxy.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecProxy.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/PartitionSpecWithSharedSDProxy.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenIdentifier.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSecretManager.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenSelector.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/HadoopThriftAuthBridge23.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TFilterTransport.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TFilterTransport.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TFilterTransport.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TFilterTransport.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIAssumingTransport.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIAssumingTransport.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIAssumingTransport.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIAssumingTransport.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolCommandLine.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolCommandLine.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolCommandLine.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolCommandLine.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTask.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTask.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTask.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTask.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskAlterCatalog.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskAlterCatalog.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskAlterCatalog.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskAlterCatalog.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateCatalog.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateCatalog.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateCatalog.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateCatalog.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateUser.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateUser.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateUser.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskCreateUser.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInfo.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInfo.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInfo.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInfo.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInit.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInit.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInit.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskInit.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveDatabase.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveDatabase.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveDatabase.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveDatabase.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveTable.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveTable.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveTable.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskMoveTable.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskUpgrade.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskUpgrade.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskUpgrade.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskUpgrade.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskValidate.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskValidate.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskValidate.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SchemaToolTaskValidate.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/FileUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/HdfsUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/JavaUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/JavaUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/JavaUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/JavaUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/ObjectPair.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/ObjectPair.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/ObjectPair.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/ObjectPair.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/SecurityUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/StringUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/StringUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/StringUtils.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/StringUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/security/token/delegation/MetastoreDelegationTokenSupport.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/security/token/delegation/MetastoreDelegationTokenSupport.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/security/token/delegation/MetastoreDelegationTokenSupport.java rename to standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/security/token/delegation/MetastoreDelegationTokenSupport.java diff --git a/standalone-metastore/src/main/protobuf/org/apache/hadoop/hive/metastore/metastore.proto b/standalone-metastore/metastore-common/src/main/protobuf/org/apache/hadoop/hive/metastore/metastore.proto similarity index 100% rename from standalone-metastore/src/main/protobuf/org/apache/hadoop/hive/metastore/metastore.proto rename to standalone-metastore/metastore-common/src/main/protobuf/org/apache/hadoop/hive/metastore/metastore.proto diff --git a/standalone-metastore/src/main/resources/datanucleus-log4j.properties b/standalone-metastore/metastore-common/src/main/resources/datanucleus-log4j.properties similarity index 100% rename from standalone-metastore/src/main/resources/datanucleus-log4j.properties rename to standalone-metastore/metastore-common/src/main/resources/datanucleus-log4j.properties diff --git a/standalone-metastore/src/main/resources/metastore-log4j2.properties b/standalone-metastore/metastore-common/src/main/resources/metastore-log4j2.properties similarity index 100% rename from standalone-metastore/src/main/resources/metastore-log4j2.properties rename to standalone-metastore/metastore-common/src/main/resources/metastore-log4j2.properties diff --git a/standalone-metastore/src/main/resources/metastore-site.xml b/standalone-metastore/metastore-common/src/main/resources/metastore-site.xml similarity index 100% rename from standalone-metastore/src/main/resources/metastore-site.xml rename to standalone-metastore/metastore-common/src/main/resources/metastore-site.xml diff --git a/standalone-metastore/src/main/resources/package.jdo b/standalone-metastore/metastore-common/src/main/resources/package.jdo similarity index 100% rename from standalone-metastore/src/main/resources/package.jdo rename to standalone-metastore/metastore-common/src/main/resources/package.jdo diff --git a/standalone-metastore/src/main/resources/saveVersion.sh b/standalone-metastore/metastore-common/src/main/resources/saveVersion.sh similarity index 100% rename from standalone-metastore/src/main/resources/saveVersion.sh rename to standalone-metastore/metastore-common/src/main/resources/saveVersion.sh diff --git a/standalone-metastore/src/main/resources/thrift-replacements.txt b/standalone-metastore/metastore-common/src/main/resources/thrift-replacements.txt similarity index 98% rename from standalone-metastore/src/main/resources/thrift-replacements.txt rename to standalone-metastore/metastore-common/src/main/resources/thrift-replacements.txt index d985717902..ffa1e168bb 100644 --- a/standalone-metastore/src/main/resources/thrift-replacements.txt +++ b/standalone-metastore/metastore-common/src/main/resources/thrift-replacements.txt @@ -18,7 +18,7 @@ # Used for the internalizing of String instance field assignments in the Thrift generated files # # FieldSchema.java, Partition.java, SerDeInfo.java, and StorageDescriptor.java. # # # -# Look in hive/standalone-metastore/pom.xml for the thriftif profile. # +# Look in hive/standalone-metastore/metastore-common/pom.xml for the thriftif profile. # # Usage: thriftif profile automatically refers to this file. # # # ################################################################################################### diff --git a/standalone-metastore/src/main/scripts/base b/standalone-metastore/metastore-common/src/main/scripts/base similarity index 98% rename from standalone-metastore/src/main/scripts/base rename to standalone-metastore/metastore-common/src/main/scripts/base index 2e37383242..c455b2a6c7 100755 --- a/standalone-metastore/src/main/scripts/base +++ b/standalone-metastore/metastore-common/src/main/scripts/base @@ -82,7 +82,7 @@ CLASSPATH="${METASTORE_CONF_DIR}" METASTORE_LIB=${METASTORE_HOME}/lib # needed for execution -if [ ! -f ${METASTORE_LIB}/hive-standalone-metastore-*.jar ]; then +if [ ! -f ${METASTORE_LIB}/hive-standalone-metastore-common-*.jar ]; then echo "Missing Standalone MetaStore Jar" exit 2; fi diff --git a/standalone-metastore/src/main/scripts/ext/metastore.sh b/standalone-metastore/metastore-common/src/main/scripts/ext/metastore.sh similarity index 95% rename from standalone-metastore/src/main/scripts/ext/metastore.sh rename to standalone-metastore/metastore-common/src/main/scripts/ext/metastore.sh index 6b12991e43..a8d4d804d6 100644 --- a/standalone-metastore/src/main/scripts/ext/metastore.sh +++ b/standalone-metastore/metastore-common/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-*.jar + JAR=${METASTORE_LIB}/hive-standalone-metastore-common-*.jar # hadoop 20 or newer - skip the aux_jars option and hiveconf diff --git a/standalone-metastore/src/main/scripts/ext/schemaTool.sh b/standalone-metastore/metastore-common/src/main/scripts/ext/schemaTool.sh similarity index 94% rename from standalone-metastore/src/main/scripts/ext/schemaTool.sh rename to standalone-metastore/metastore-common/src/main/scripts/ext/schemaTool.sh index bfc8d789da..1863b061bd 100644 --- a/standalone-metastore/src/main/scripts/ext/schemaTool.sh +++ b/standalone-metastore/metastore-common/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-*.jar + JAR=${METASTORE_LIB}/hive-standalone-metastore-common-*.jar # hadoop 20 or newer - skip the aux_jars option and hiveconf exec $HADOOP jar $JAR $CLASS "$@" diff --git a/standalone-metastore/src/main/scripts/ext/smokeTest.sh b/standalone-metastore/metastore-common/src/main/scripts/ext/smokeTest.sh similarity index 95% rename from standalone-metastore/src/main/scripts/ext/smokeTest.sh rename to standalone-metastore/metastore-common/src/main/scripts/ext/smokeTest.sh index ef000e9b5b..cd1eb1d653 100644 --- a/standalone-metastore/src/main/scripts/ext/smokeTest.sh +++ b/standalone-metastore/metastore-common/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-*.jar + JAR=${METASTORE_LIB}/hive-standalone-metastore-common-*.jar # hadoop 20 or newer - skip the aux_jars option and hiveconf exec $HADOOP jar $JAR $CLASS "$@" diff --git a/standalone-metastore/src/main/scripts/metastore-config.sh b/standalone-metastore/metastore-common/src/main/scripts/metastore-config.sh similarity index 100% rename from standalone-metastore/src/main/scripts/metastore-config.sh rename to standalone-metastore/metastore-common/src/main/scripts/metastore-config.sh diff --git a/standalone-metastore/src/main/scripts/schematool b/standalone-metastore/metastore-common/src/main/scripts/schematool similarity index 100% rename from standalone-metastore/src/main/scripts/schematool rename to standalone-metastore/metastore-common/src/main/scripts/schematool diff --git a/standalone-metastore/src/main/scripts/start-metastore b/standalone-metastore/metastore-common/src/main/scripts/start-metastore similarity index 100% rename from standalone-metastore/src/main/scripts/start-metastore rename to standalone-metastore/metastore-common/src/main/scripts/start-metastore diff --git a/standalone-metastore/src/main/sql/derby/hive-schema-1.2.0.derby.sql b/standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-1.2.0.derby.sql similarity index 100% rename from standalone-metastore/src/main/sql/derby/hive-schema-1.2.0.derby.sql rename to standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-1.2.0.derby.sql diff --git a/standalone-metastore/src/main/sql/derby/hive-schema-3.0.0.derby.sql b/standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-3.0.0.derby.sql similarity index 100% rename from standalone-metastore/src/main/sql/derby/hive-schema-3.0.0.derby.sql rename to standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-3.0.0.derby.sql diff --git a/standalone-metastore/src/main/sql/derby/hive-schema-3.1.0.derby.sql b/standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-3.1.0.derby.sql similarity index 100% rename from standalone-metastore/src/main/sql/derby/hive-schema-3.1.0.derby.sql rename to standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-3.1.0.derby.sql diff --git a/standalone-metastore/src/main/sql/derby/hive-schema-4.0.0.derby.sql b/standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-4.0.0.derby.sql similarity index 100% rename from standalone-metastore/src/main/sql/derby/hive-schema-4.0.0.derby.sql rename to standalone-metastore/metastore-common/src/main/sql/derby/hive-schema-4.0.0.derby.sql diff --git a/standalone-metastore/src/main/sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql b/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql similarity index 100% rename from standalone-metastore/src/main/sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql rename to standalone-metastore/metastore-common/src/main/sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql diff --git a/standalone-metastore/src/main/sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql b/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql similarity index 100% rename from standalone-metastore/src/main/sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql rename to standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql diff --git a/standalone-metastore/src/main/sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql b/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql similarity index 100% rename from standalone-metastore/src/main/sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql rename to standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql diff --git a/standalone-metastore/src/main/sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql b/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql similarity index 100% rename from standalone-metastore/src/main/sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql rename to standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql diff --git a/standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql b/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql similarity index 100% rename from standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql rename to standalone-metastore/metastore-common/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql diff --git a/standalone-metastore/src/main/sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql b/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql similarity index 100% rename from standalone-metastore/src/main/sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql rename to standalone-metastore/metastore-common/src/main/sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql diff --git a/standalone-metastore/src/main/sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql b/standalone-metastore/metastore-common/src/main/sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql similarity index 100% rename from standalone-metastore/src/main/sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql rename to standalone-metastore/metastore-common/src/main/sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql diff --git a/standalone-metastore/src/main/sql/derby/upgrade.order.derby b/standalone-metastore/metastore-common/src/main/sql/derby/upgrade.order.derby similarity index 100% rename from standalone-metastore/src/main/sql/derby/upgrade.order.derby rename to standalone-metastore/metastore-common/src/main/sql/derby/upgrade.order.derby diff --git a/standalone-metastore/src/main/sql/mssql/create-user.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/create-user.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/create-user.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/create-user.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql b/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql rename to standalone-metastore/metastore-common/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade.order.mssql b/standalone-metastore/metastore-common/src/main/sql/mssql/upgrade.order.mssql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade.order.mssql rename to standalone-metastore/metastore-common/src/main/sql/mssql/upgrade.order.mssql diff --git a/standalone-metastore/src/main/sql/mysql/create-user.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/create-user.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/create-user.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/create-user.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql b/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql rename to standalone-metastore/metastore-common/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade.order.mysql b/standalone-metastore/metastore-common/src/main/sql/mysql/upgrade.order.mysql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade.order.mysql rename to standalone-metastore/metastore-common/src/main/sql/mysql/upgrade.order.mysql diff --git a/standalone-metastore/src/main/sql/oracle/create-user.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/create-user.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/create-user.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/create-user.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql b/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql rename to standalone-metastore/metastore-common/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade.order.oracle b/standalone-metastore/metastore-common/src/main/sql/oracle/upgrade.order.oracle similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade.order.oracle rename to standalone-metastore/metastore-common/src/main/sql/oracle/upgrade.order.oracle diff --git a/standalone-metastore/src/main/sql/postgres/create-user.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/create-user.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/create-user.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/create-user.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql b/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql rename to standalone-metastore/metastore-common/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade.order.postgres b/standalone-metastore/metastore-common/src/main/sql/postgres/upgrade.order.postgres similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade.order.postgres rename to standalone-metastore/metastore-common/src/main/sql/postgres/upgrade.order.postgres diff --git a/standalone-metastore/src/main/thrift/hive_metastore.thrift b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift similarity index 100% rename from standalone-metastore/src/main/thrift/hive_metastore.thrift rename to standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogMerge.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogMerge.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogMerge.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogMerge.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/AlternateFailurePreListener.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/AlternateFailurePreListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/AlternateFailurePreListener.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/AlternateFailurePreListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyEndFunctionListener.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyEndFunctionListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyEndFunctionListener.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyEndFunctionListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyJdoConnectionUrlHook.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyJdoConnectionUrlHook.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyJdoConnectionUrlHook.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyJdoConnectionUrlHook.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyListener.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyListener.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyMetaStoreInitListener.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyMetaStoreInitListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyMetaStoreInitListener.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyMetaStoreInitListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyPreListener.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyPreListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyPreListener.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyPreListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMaterializationsCacheCleaner.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMaterializationsCacheCleaner.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMaterializationsCacheCleaner.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMaterializationsCacheCleaner.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreSchemaMethods.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreSchemaMethods.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreSchemaMethods.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreSchemaMethods.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestStats.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestStats.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestStats.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/TestStats.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/VerifyingObjectStore.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/VerifyingObjectStore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/VerifyingObjectStore.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/VerifyingObjectStore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCatalogCaching.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCatalogCaching.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCatalogCaching.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCatalogCaching.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreClientTest.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreClientTest.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreClientTest.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreClientTest.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreFactoryForTests.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreFactoryForTests.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreFactoryForTests.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreFactoryForTests.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java diff --git a/standalone-metastore/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 similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/package-info.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/minihms/package-info.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/tools/TestMetastoreSchemaTool.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/tools/TestMetastoreSchemaTool.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/tools/TestMetastoreSchemaTool.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/tools/TestMetastoreSchemaTool.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/tools/TestSchemaToolForMetastore.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/tools/TestSchemaToolForMetastore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/tools/TestSchemaToolForMetastore.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/tools/TestSchemaToolForMetastore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java b/standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java rename to standalone-metastore/metastore-common/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java diff --git a/standalone-metastore/src/test/resources/log4j2.properties b/standalone-metastore/metastore-common/src/test/resources/log4j2.properties similarity index 100% rename from standalone-metastore/src/test/resources/log4j2.properties rename to standalone-metastore/metastore-common/src/test/resources/log4j2.properties diff --git a/standalone-metastore/metastore-server/src/gen/version/org/apache/hadoop/hive/metastore/annotation/package-info.java b/standalone-metastore/metastore-server/src/gen/version/org/apache/hadoop/hive/metastore/annotation/package-info.java new file mode 100644 index 0000000000..cc2a475637 --- /dev/null +++ b/standalone-metastore/metastore-server/src/gen/version/org/apache/hadoop/hive/metastore/annotation/package-info.java @@ -0,0 +1,8 @@ +/* + * Generated by saveVersion.sh + */ +@MetastoreVersionAnnotation(version="4.0.0-SNAPSHOT", shortVersion="3.1.0", + revision="f07a78967fa5559e51611a8bade6b23f4ec72498", branch="HIVE-17751", + user="akolbasov", date="Thu Jul 5 10:28:21 PDT 2018", url="git://AKolbasovs-MacBook-Pro-2.local/Volumes/Dev/apache/hive/standalone-metastore", + srcChecksum="17b1b6e8eef0198ea468ba7e1112b03a") +package org.apache.hadoop.hive.metastore.annotation; diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 67d8fb41d1..58b938ae01 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -16,6 +16,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + metastore-common + org.apache apache @@ -26,7 +29,7 @@ org.apache.hive hive-standalone-metastore 4.0.0-SNAPSHOT - jar + pom Hive Standalone Metastore @@ -93,781 +96,207 @@ - - - org.apache.orc - orc-core - ${orc.version} - - - org.apache.hadoop - hadoop-common - - - org.apache.hive - hive-storage-api - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.github.joshelser - dropwizard-metrics-hadoop-metrics2-reporter - ${dropwizard-metrics-hadoop-metrics2-reporter.version} - - - com.google.guava - guava - ${guava.version} - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.jolbox - bonecp - ${bonecp.version} - - - com.zaxxer - HikariCP - ${hikaricp.version} - - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - io.dropwizard.metrics - metrics-core - ${dropwizard.version} - - - io.dropwizard.metrics - metrics-jvm - ${dropwizard.version} - - - io.dropwizard.metrics - metrics-json - ${dropwizard.version} - - - javolution - javolution - ${javolution.version} - - - org.antlr - antlr-runtime - ${antlr.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.apache.derby - derby - ${derby.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - true - - - org.slf4j - slf4j-log4j12 - - - commons-logging - commons-logging - - - - - org.apache.hadoop - hadoop-distcp - ${hadoop.version} - provided - - - org.apache.hadoop - hadoop-hdfs - ${hadoop.version} - true - - - org.slf4j - slf4j-log4j12 - - - commons-logging - commons-logging - - - - - org.apache.hadoop - hadoop-hdfs-client - ${hadoop.version} - true - - - org.slf4j - slf4j-log4j12 - - - commons-logging - commons-logging - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop.version} - 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 - ${log4j2.version} - - - org.apache.logging.log4j - log4j-1.2-api - ${log4j2.version} - - - org.apache.thrift - libfb303 - ${libfb303.version} - - - org.apache.thrift - libthrift - ${libthrift.version} - - - org.datanucleus - datanucleus-api-jdo - ${datanucleus-api-jdo.version} - - - org.datanucleus - datanucleus-core - ${datanucleus-core.version} - - - org.datanucleus - datanucleus-rdbms - ${datanucleus-rdbms.version} - - - org.datanucleus - javax.jdo - ${datanucleus-jdo.version} - - - org.skyscreamer - jsonassert - 1.4.0 - test - - - sqlline - sqlline - ${sqlline.version} - - - commons-logging - commons-logging - ${commons-logging.version} - - + + + + org.apache.orc + orc-core + ${orc.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.github.joshelser + dropwizard-metrics-hadoop-metrics2-reporter + ${dropwizard-metrics-hadoop-metrics2-reporter.version} + + + com.google.guava + guava + ${guava.version} + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + com.jolbox + bonecp + ${bonecp.version} + + + com.zaxxer + HikariCP + ${hikaricp.version} + + + commons-dbcp + commons-dbcp + ${commons-dbcp.version} + + + io.dropwizard.metrics + metrics-core + ${dropwizard.version} + + + io.dropwizard.metrics + metrics-jvm + ${dropwizard.version} + + + io.dropwizard.metrics + metrics-json + ${dropwizard.version} + + + javolution + javolution + ${javolution.version} + + + org.antlr + antlr-runtime + ${antlr.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.derby + derby + ${derby.version} + + + org.apache.hadoop + hadoop-common + ${hadoop.version} + + + org.apache.hadoop + hadoop-distcp + ${hadoop.version} + provided + + + org.apache.hadoop + hadoop-hdfs + ${hadoop.version} + + + org.apache.hadoop + hadoop-hdfs-client + ${hadoop.version} + + + org.apache.hadoop + hadoop-mapreduce-client-core + ${hadoop.version} + + + + org.apache.hive + hive-storage-api + ${storage-api.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j2.version} + + + org.apache.logging.log4j + log4j-1.2-api + ${log4j2.version} + + + org.apache.thrift + libfb303 + ${libfb303.version} + + + org.apache.thrift + libthrift + ${libthrift.version} + + + org.datanucleus + datanucleus-api-jdo + ${datanucleus-api-jdo.version} + + + org.datanucleus + datanucleus-core + ${datanucleus-core.version} + + + org.datanucleus + datanucleus-rdbms + ${datanucleus-rdbms.version} + + + org.datanucleus + javax.jdo + ${datanucleus-jdo.version} + + + org.skyscreamer + jsonassert + 1.4.0 + test + + + sqlline + sqlline + ${sqlline.version} + + + commons-logging + commons-logging + ${commons-logging.version} + + - - com.microsoft.sqlserver - mssql-jdbc - 6.2.1.jre8 - test - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito-all.version} - test - - + + com.microsoft.sqlserver + mssql-jdbc + 6.2.1.jre8 + test + + + junit + junit + ${junit.version} + test + + + org.mockito + mockito-core + ${mockito-all.version} + test + + - org.mariadb.jdbc - mariadb-java-client - 2.2.0 - test - - - org.postgresql - postgresql - 9.3-1102-jdbc41 - test - - - - - - thriftif - - - - org.apache.maven.plugins - maven-antrun-plugin - - - generate-thrift-sources - generate-sources - - - - - - - - - - - - - - - - - - - - - - run - - - - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - process-thrift-sources-string-intern - process-sources - - replace - - - ${basedir}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ - - FieldSchema.java - Partition.java - SerDeInfo.java - StorageDescriptor.java - ColumnStatisticsDesc.java - ColumnStatisticsObj.java - - ${basedir}/src/main/resources/thrift-replacements.txt - true - false - - - - process-thrift-sources-interface-annotations - process-sources - - replace - - - ${basedir}/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ - *.java - - - public class - @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class - true - - - public static class - @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class - true - - - public interface - @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public interface - true - - - - - - - - - - - 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 - - - - + org.mariadb.jdbc + mariadb-java-client + 2.2.0 + test + + + org.postgresql + postgresql + 9.3-1102-jdbc41 + test + + + diff --git a/upgrade-acid/pom.xml b/upgrade-acid/pom.xml index 77cd24094d..fc68372823 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.18.0