From e7e1273f2f6fbdfb519975919ef6b65506fe7197 Mon Sep 17 00:00:00 2001 From: Alexander Kolbasov Date: Tue, 3 Jul 2018 18:50:17 -0700 Subject: [PATCH 1/1] HIVE-17751: Separate HMS Client and HMS server into separate sub-modules --- .gitignore | 2 + contrib/pom.xml | 5 + .../hadoop/hive/hbase/HBaseStorageHandler.java | 1 - hcatalog/core/pom.xml | 7 +- .../hive/hcatalog/cli/TestSemanticAnalysis.java | 4 +- .../hcatalog/listener/DbNotificationListener.java | 16 +- .../hive/hcatalog/streaming/HiveEndPoint.java | 3 +- .../mutate/worker/MetaStorePartitionHelper.java | 4 +- .../streaming/mutate/StreamingTestUtils.java | 4 +- hcatalog/webhcat/java-client/pom.xml | 9 +- .../apache/hive/hcatalog/api/HCatPartition.java | 3 +- hcatalog/webhcat/svr/pom.xml | 7 +- itests/hcatalog-unit/pom.xml | 8 +- itests/hive-blobstore/pom.xml | 9 +- itests/hive-minikdc/pom.xml | 10 +- itests/hive-unit-hadoop2/pom.xml | 8 +- itests/hive-unit/pom.xml | 10 +- itests/qtest-accumulo/pom.xml | 10 +- itests/qtest-spark/pom.xml | 10 +- itests/qtest/pom.xml | 10 +- itests/util/pom.xml | 10 +- llap-server/pom.xml | 12 +- metastore/pom.xml | 15 +- .../hive/metastore/SerDeStorageSchemaReader.java | 3 +- packaging/src/main/assembly/bin.xml | 2 +- packaging/src/main/assembly/src.xml | 3 +- ql/pom.xml | 9 +- .../apache/hadoop/hive/ql/exec/ArchiveUtils.java | 6 +- .../org/apache/hadoop/hive/ql/exec/DDLTask.java | 2 +- .../bootstrap/events/filesystem/FSTableEvent.java | 5 +- .../hadoop/hive/ql/lockmgr/DbTxnManager.java | 4 +- .../org/apache/hadoop/hive/ql/metadata/Hive.java | 2 +- .../apache/hadoop/hive/ql/metadata/Partition.java | 4 +- .../ql/metadata/SessionHiveMetaStoreClient.java | 6 +- .../hive/ql/parse/ImportSemanticAnalyzer.java | 3 +- .../hadoop/hive/ql/stats/ColStatsProcessor.java | 3 +- .../hadoop/hive/ql/stats/StatsUpdaterThread.java | 8 +- service/pom.xml | 13 +- standalone-metastore/DEV-README | 2 +- standalone-metastore/metastore-client/pom.xml | 39 + .../hadoop/hive/metastore/HiveMetaStoreClient.java | 107 ++- .../hive/metastore/RetryingMetaStoreClient.java | 0 standalone-metastore/metastore-common/pom.xml | 455 ++++++++++ .../gen-py => metastore-common/src}/__init__.py | 0 .../{ => metastore-common}/src/assembly/bin.xml | 0 .../{ => metastore-common}/src/assembly/src.xml | 0 .../src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp | 0 .../src/gen/thrift/gen-cpp/ThriftHiveMetastore.h | 0 .../ThriftHiveMetastore_server.skeleton.cpp | 0 .../thrift/gen-cpp/hive_metastore_constants.cpp | 0 .../gen/thrift/gen-cpp/hive_metastore_constants.h | 0 .../gen/thrift/gen-cpp/hive_metastore_types.cpp | 0 .../src/gen/thrift/gen-cpp/hive_metastore_types.h | 0 .../hadoop/hive/metastore/api/AbortTxnRequest.java | 0 .../hive/metastore/api/AbortTxnsRequest.java | 0 .../metastore/api/AddCheckConstraintRequest.java | 0 .../metastore/api/AddDefaultConstraintRequest.java | 0 .../hive/metastore/api/AddDynamicPartitions.java | 0 .../hive/metastore/api/AddForeignKeyRequest.java | 0 .../metastore/api/AddNotNullConstraintRequest.java | 0 .../hive/metastore/api/AddPartitionsRequest.java | 0 .../hive/metastore/api/AddPartitionsResult.java | 0 .../hive/metastore/api/AddPrimaryKeyRequest.java | 0 .../metastore/api/AddUniqueConstraintRequest.java | 0 .../hadoop/hive/metastore/api/AggrStats.java | 0 .../api/AllocateTableWriteIdsRequest.java | 0 .../api/AllocateTableWriteIdsResponse.java | 0 .../hive/metastore/api/AlreadyExistsException.java | 0 .../hive/metastore/api/AlterCatalogRequest.java | 0 .../hive/metastore/api/AlterISchemaRequest.java | 0 .../hadoop/hive/metastore/api/BasicTxnInfo.java | 0 .../hive/metastore/api/BinaryColumnStatsData.java | 0 .../hive/metastore/api/BooleanColumnStatsData.java | 0 .../metastore/api/CacheFileMetadataRequest.java | 0 .../metastore/api/CacheFileMetadataResult.java | 0 .../apache/hadoop/hive/metastore/api/Catalog.java | 0 .../metastore/api/CheckConstraintsRequest.java | 0 .../metastore/api/CheckConstraintsResponse.java | 0 .../hive/metastore/api/CheckLockRequest.java | 0 .../metastore/api/ClearFileMetadataRequest.java | 0 .../metastore/api/ClearFileMetadataResult.java | 0 .../hive/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 .../hive/metastore/api/ColumnStatisticsData.java | 0 .../hive/metastore/api/ColumnStatisticsDesc.java | 0 .../hive/metastore/api/ColumnStatisticsObj.java | 0 .../hive/metastore/api/CommitTxnRequest.java | 0 .../hive/metastore/api/CompactionRequest.java | 0 .../hive/metastore/api/CompactionResponse.java | 0 .../hadoop/hive/metastore/api/CompactionType.java | 0 .../metastore/api/ConfigValSecurityException.java | 0 .../hive/metastore/api/CreateCatalogRequest.java | 0 .../hive/metastore/api/CreationMetadata.java | 0 .../metastore/api/CurrentNotificationEventId.java | 0 .../hive/metastore/api/DataOperationType.java | 0 .../apache/hadoop/hive/metastore/api/Database.java | 0 .../org/apache/hadoop/hive/metastore/api/Date.java | 0 .../hive/metastore/api/DateColumnStatsData.java | 0 .../apache/hadoop/hive/metastore/api/Decimal.java | 0 .../hive/metastore/api/DecimalColumnStatsData.java | 0 .../metastore/api/DefaultConstraintsRequest.java | 0 .../metastore/api/DefaultConstraintsResponse.java | 0 .../hive/metastore/api/DoubleColumnStatsData.java | 0 .../hive/metastore/api/DropCatalogRequest.java | 0 .../hive/metastore/api/DropConstraintRequest.java | 0 .../hive/metastore/api/DropPartitionsExpr.java | 0 .../hive/metastore/api/DropPartitionsRequest.java | 0 .../hive/metastore/api/DropPartitionsResult.java | 0 .../hive/metastore/api/EnvironmentContext.java | 0 .../hive/metastore/api/EventRequestType.java | 0 .../hadoop/hive/metastore/api/FieldSchema.java | 0 .../hive/metastore/api/FileMetadataExprType.java | 0 .../hive/metastore/api/FindSchemasByColsResp.java | 0 .../hive/metastore/api/FindSchemasByColsRqst.java | 0 .../hive/metastore/api/FireEventRequest.java | 0 .../hive/metastore/api/FireEventRequestData.java | 0 .../hive/metastore/api/FireEventResponse.java | 0 .../hive/metastore/api/ForeignKeysRequest.java | 0 .../hive/metastore/api/ForeignKeysResponse.java | 0 .../apache/hadoop/hive/metastore/api/Function.java | 0 .../hadoop/hive/metastore/api/FunctionType.java | 0 .../metastore/api/GetAllFunctionsResponse.java | 0 .../hive/metastore/api/GetCatalogRequest.java | 0 .../hive/metastore/api/GetCatalogResponse.java | 0 .../hive/metastore/api/GetCatalogsResponse.java | 0 .../api/GetFileMetadataByExprRequest.java | 0 .../metastore/api/GetFileMetadataByExprResult.java | 0 .../hive/metastore/api/GetFileMetadataRequest.java | 0 .../hive/metastore/api/GetFileMetadataResult.java | 0 .../metastore/api/GetOpenTxnsInfoResponse.java | 0 .../hive/metastore/api/GetOpenTxnsResponse.java | 0 .../metastore/api/GetPrincipalsInRoleRequest.java | 0 .../metastore/api/GetPrincipalsInRoleResponse.java | 0 .../api/GetRoleGrantsForPrincipalRequest.java | 0 .../api/GetRoleGrantsForPrincipalResponse.java | 0 .../hive/metastore/api/GetRuntimeStatsRequest.java | 0 .../hadoop/hive/metastore/api/GetSerdeRequest.java | 0 .../hadoop/hive/metastore/api/GetTableRequest.java | 0 .../hadoop/hive/metastore/api/GetTableResult.java | 0 .../hive/metastore/api/GetTablesRequest.java | 0 .../hadoop/hive/metastore/api/GetTablesResult.java | 0 .../metastore/api/GetValidWriteIdsRequest.java | 0 .../metastore/api/GetValidWriteIdsResponse.java | 0 .../metastore/api/GrantRevokePrivilegeRequest.java | 0 .../api/GrantRevokePrivilegeResponse.java | 0 .../hive/metastore/api/GrantRevokeRoleRequest.java | 0 .../metastore/api/GrantRevokeRoleResponse.java | 0 .../hadoop/hive/metastore/api/GrantRevokeType.java | 0 .../hive/metastore/api/HeartbeatRequest.java | 0 .../metastore/api/HeartbeatTxnRangeRequest.java | 0 .../metastore/api/HeartbeatTxnRangeResponse.java | 0 .../hive/metastore/api/HiveObjectPrivilege.java | 0 .../hadoop/hive/metastore/api/HiveObjectRef.java | 0 .../hadoop/hive/metastore/api/HiveObjectType.java | 0 .../apache/hadoop/hive/metastore/api/ISchema.java | 0 .../hadoop/hive/metastore/api/ISchemaName.java | 0 .../hive/metastore/api/InsertEventRequestData.java | 0 .../hive/metastore/api/InvalidInputException.java | 0 .../hive/metastore/api/InvalidObjectException.java | 0 .../metastore/api/InvalidOperationException.java | 0 .../metastore/api/InvalidPartitionException.java | 0 .../hadoop/hive/metastore/api/LockComponent.java | 0 .../hadoop/hive/metastore/api/LockLevel.java | 0 .../hadoop/hive/metastore/api/LockRequest.java | 0 .../hadoop/hive/metastore/api/LockResponse.java | 0 .../hadoop/hive/metastore/api/LockState.java | 0 .../apache/hadoop/hive/metastore/api/LockType.java | 0 .../hive/metastore/api/LongColumnStatsData.java | 0 .../api/MapSchemaVersionToSerdeRequest.java | 0 .../hadoop/hive/metastore/api/Materialization.java | 0 .../hadoop/hive/metastore/api/MetaException.java | 0 .../hive/metastore/api/MetadataPpdResult.java | 0 .../hive/metastore/api/NoSuchLockException.java | 0 .../hive/metastore/api/NoSuchObjectException.java | 0 .../hive/metastore/api/NoSuchTxnException.java | 0 .../metastore/api/NotNullConstraintsRequest.java | 0 .../metastore/api/NotNullConstraintsResponse.java | 0 .../hive/metastore/api/NotificationEvent.java | 0 .../metastore/api/NotificationEventRequest.java | 0 .../metastore/api/NotificationEventResponse.java | 0 .../api/NotificationEventsCountRequest.java | 0 .../api/NotificationEventsCountResponse.java | 0 .../hadoop/hive/metastore/api/OpenTxnRequest.java | 0 .../hive/metastore/api/OpenTxnsResponse.java | 0 .../apache/hadoop/hive/metastore/api/Order.java | 0 .../hadoop/hive/metastore/api/Partition.java | 0 .../hive/metastore/api/PartitionEventType.java | 0 .../metastore/api/PartitionListComposingSpec.java | 0 .../hadoop/hive/metastore/api/PartitionSpec.java | 0 .../metastore/api/PartitionSpecWithSharedSD.java | 0 .../hive/metastore/api/PartitionValuesRequest.java | 0 .../metastore/api/PartitionValuesResponse.java | 0 .../hive/metastore/api/PartitionValuesRow.java | 0 .../hive/metastore/api/PartitionWithoutSD.java | 0 .../metastore/api/PartitionsByExprRequest.java | 0 .../hive/metastore/api/PartitionsByExprResult.java | 0 .../hive/metastore/api/PartitionsStatsRequest.java | 0 .../hive/metastore/api/PartitionsStatsResult.java | 0 .../hive/metastore/api/PrimaryKeysRequest.java | 0 .../hive/metastore/api/PrimaryKeysResponse.java | 0 .../hive/metastore/api/PrincipalPrivilegeSet.java | 0 .../hadoop/hive/metastore/api/PrincipalType.java | 0 .../hadoop/hive/metastore/api/PrivilegeBag.java | 0 .../hive/metastore/api/PrivilegeGrantInfo.java | 0 .../hive/metastore/api/PutFileMetadataRequest.java | 0 .../hive/metastore/api/PutFileMetadataResult.java | 0 .../metastore/api/ReplTblWriteIdStateRequest.java | 0 .../hive/metastore/api/RequestPartsSpec.java | 0 .../hadoop/hive/metastore/api/ResourceType.java | 0 .../hadoop/hive/metastore/api/ResourceUri.java | 0 .../org/apache/hadoop/hive/metastore/api/Role.java | 0 .../hive/metastore/api/RolePrincipalGrant.java | 0 .../hadoop/hive/metastore/api/RuntimeStat.java | 0 .../hive/metastore/api/SQLCheckConstraint.java | 0 .../hive/metastore/api/SQLDefaultConstraint.java | 0 .../hadoop/hive/metastore/api/SQLForeignKey.java | 0 .../hive/metastore/api/SQLNotNullConstraint.java | 0 .../hadoop/hive/metastore/api/SQLPrimaryKey.java | 0 .../hive/metastore/api/SQLUniqueConstraint.java | 0 .../apache/hadoop/hive/metastore/api/Schema.java | 0 .../hive/metastore/api/SchemaCompatibility.java | 0 .../hadoop/hive/metastore/api/SchemaType.java | 0 .../hive/metastore/api/SchemaValidation.java | 0 .../hadoop/hive/metastore/api/SchemaVersion.java | 0 .../metastore/api/SchemaVersionDescriptor.java | 0 .../hive/metastore/api/SchemaVersionState.java | 0 .../hadoop/hive/metastore/api/SerDeInfo.java | 0 .../hadoop/hive/metastore/api/SerdeType.java | 0 .../metastore/api/SetPartitionsStatsRequest.java | 0 .../api/SetSchemaVersionStateRequest.java | 0 .../hive/metastore/api/ShowCompactRequest.java | 0 .../hive/metastore/api/ShowCompactResponse.java | 0 .../metastore/api/ShowCompactResponseElement.java | 0 .../hive/metastore/api/ShowLocksRequest.java | 0 .../hive/metastore/api/ShowLocksResponse.java | 0 .../metastore/api/ShowLocksResponseElement.java | 0 .../hadoop/hive/metastore/api/SkewedInfo.java | 0 .../hive/metastore/api/StorageDescriptor.java | 0 .../hive/metastore/api/StringColumnStatsData.java | 0 .../apache/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 .../hive/metastore/api/TableValidWriteIds.java | 0 .../hive/metastore/api/ThriftHiveMetastore.java | 0 .../hive/metastore/api/TxnAbortedException.java | 0 .../apache/hadoop/hive/metastore/api/TxnInfo.java | 0 .../hive/metastore/api/TxnOpenException.java | 0 .../apache/hadoop/hive/metastore/api/TxnState.java | 0 .../hadoop/hive/metastore/api/TxnToWriteId.java | 0 .../org/apache/hadoop/hive/metastore/api/Type.java | 0 .../metastore/api/UniqueConstraintsRequest.java | 0 .../metastore/api/UniqueConstraintsResponse.java | 0 .../hive/metastore/api/UnknownDBException.java | 0 .../metastore/api/UnknownPartitionException.java | 0 .../hive/metastore/api/UnknownTableException.java | 0 .../hadoop/hive/metastore/api/UnlockRequest.java | 0 .../apache/hadoop/hive/metastore/api/Version.java | 0 .../hive/metastore/api/WMAlterPoolRequest.java | 0 .../hive/metastore/api/WMAlterPoolResponse.java | 0 .../metastore/api/WMAlterResourcePlanRequest.java | 0 .../metastore/api/WMAlterResourcePlanResponse.java | 0 .../hive/metastore/api/WMAlterTriggerRequest.java | 0 .../hive/metastore/api/WMAlterTriggerResponse.java | 0 .../WMCreateOrDropTriggerToPoolMappingRequest.java | 0 ...WMCreateOrDropTriggerToPoolMappingResponse.java | 0 .../api/WMCreateOrUpdateMappingRequest.java | 0 .../api/WMCreateOrUpdateMappingResponse.java | 0 .../hive/metastore/api/WMCreatePoolRequest.java | 0 .../hive/metastore/api/WMCreatePoolResponse.java | 0 .../metastore/api/WMCreateResourcePlanRequest.java | 0 .../api/WMCreateResourcePlanResponse.java | 0 .../hive/metastore/api/WMCreateTriggerRequest.java | 0 .../metastore/api/WMCreateTriggerResponse.java | 0 .../hive/metastore/api/WMDropMappingRequest.java | 0 .../hive/metastore/api/WMDropMappingResponse.java | 0 .../hive/metastore/api/WMDropPoolRequest.java | 0 .../hive/metastore/api/WMDropPoolResponse.java | 0 .../metastore/api/WMDropResourcePlanRequest.java | 0 .../metastore/api/WMDropResourcePlanResponse.java | 0 .../hive/metastore/api/WMDropTriggerRequest.java | 0 .../hive/metastore/api/WMDropTriggerResponse.java | 0 .../hive/metastore/api/WMFullResourcePlan.java | 0 .../api/WMGetActiveResourcePlanRequest.java | 0 .../api/WMGetActiveResourcePlanResponse.java | 0 .../metastore/api/WMGetAllResourcePlanRequest.java | 0 .../api/WMGetAllResourcePlanResponse.java | 0 .../metastore/api/WMGetResourcePlanRequest.java | 0 .../metastore/api/WMGetResourcePlanResponse.java | 0 .../api/WMGetTriggersForResourePlanRequest.java | 0 .../api/WMGetTriggersForResourePlanResponse.java | 0 .../hadoop/hive/metastore/api/WMMapping.java | 0 .../hadoop/hive/metastore/api/WMNullablePool.java | 0 .../hive/metastore/api/WMNullableResourcePlan.java | 0 .../apache/hadoop/hive/metastore/api/WMPool.java | 0 .../hive/metastore/api/WMPoolSchedulingPolicy.java | 0 .../hadoop/hive/metastore/api/WMPoolTrigger.java | 0 .../hadoop/hive/metastore/api/WMResourcePlan.java | 0 .../hive/metastore/api/WMResourcePlanStatus.java | 0 .../hadoop/hive/metastore/api/WMTrigger.java | 0 .../api/WMValidateResourcePlanRequest.java | 0 .../api/WMValidateResourcePlanResponse.java | 0 .../hadoop/hive/metastore/api/WriteEventInfo.java | 0 .../metastore/api/WriteNotificationLogRequest.java | 0 .../api/WriteNotificationLogResponse.java | 0 .../metastore/api/hive_metastoreConstants.java | 0 .../gen-php/metastore/ThriftHiveMetastore.php | 0 .../src/gen/thrift/gen-php/metastore/Types.php | 0 .../src/gen/thrift/gen-py/__init__.py | 0 .../hive_metastore/ThriftHiveMetastore-remote | 0 .../gen-py/hive_metastore/ThriftHiveMetastore.py | 0 .../gen/thrift/gen-py/hive_metastore/__init__.py | 0 .../gen/thrift/gen-py/hive_metastore/constants.py | 0 .../src/gen/thrift/gen-py/hive_metastore/ttypes.py | 0 .../gen/thrift/gen-rb/hive_metastore_constants.rb | 0 .../src/gen/thrift/gen-rb/hive_metastore_types.rb | 0 .../src/gen/thrift/gen-rb/thrift_hive_metastore.rb | 0 .../apache/hadoop/hive/common/StatsSetupConst.java | 0 .../hive/common/classification/RetrySemantics.java | 0 .../apache/hadoop/hive/metastore/ColumnType.java | 2 - .../hadoop/hive/metastore/DefaultHiveMetaHook.java | 0 .../metastore/DefaultMetaStoreFilterHookImpl.java | 0 .../hadoop/hive/metastore/HiveMetaException.java | 0 .../apache/hadoop/hive/metastore/HiveMetaHook.java | 2 +- .../hadoop/hive/metastore/HiveMetaHookLoader.java | 0 .../hadoop/hive/metastore/IMetaStoreClient.java | 0 .../hadoop/hive/metastore/MetaStoreFilterHook.java | 0 .../hive/metastore/PartitionDropOptions.java | 0 .../hadoop/hive/metastore/StorageSchemaReader.java | 0 .../apache/hadoop/hive/metastore/TableType.java | 0 .../annotation/MetastoreVersionAnnotation.java | 0 .../hive/metastore/annotation/NoReconnect.java | 0 .../api/InitializeTableWriteIdsRequest.java | 0 .../hive/metastore/conf/ConfTemplatePrinter.java | 0 .../hadoop/hive/metastore/conf/EnumValidator.java | 0 .../hadoop/hive/metastore/conf/MetastoreConf.java | 37 +- .../hadoop/hive/metastore/conf/RangeValidator.java | 0 .../hadoop/hive/metastore/conf/SizeValidator.java | 0 .../hive/metastore/conf/StringSetValidator.java | 0 .../hadoop/hive/metastore/conf/TimeValidator.java | 0 .../hadoop/hive/metastore/conf/Validator.java | 0 .../hive/metastore/hooks/URIResolverHook.java | 0 .../spec/CompositePartitionSpecProxy.java | 3 +- .../spec/PartitionListComposingSpecProxy.java | 0 .../partition/spec/PartitionSpecProxy.java | 0 .../spec/PartitionSpecWithSharedSDProxy.java | 0 .../security/DelegationTokenIdentifier.java | 0 .../security/DelegationTokenSecretManager.java | 0 .../security/DelegationTokenSelector.java | 0 .../metastore/security/HadoopThriftAuthBridge.java | 0 .../security/HadoopThriftAuthBridge23.java | 0 .../hive/metastore/security/TFilterTransport.java | 0 .../metastore/security/TUGIAssumingTransport.java | 0 .../hadoop/hive/metastore/txn/TxnCommonUtils.java | 127 +++ .../hadoop/hive/metastore/utils/FileUtils.java | 0 .../hadoop/hive/metastore/utils/HdfsUtils.java | 0 .../hadoop/hive/metastore/utils/JavaUtils.java | 0 .../hive/metastore/utils/MetaStoreUtils.java | 995 +++++++++++++++++++++ .../hadoop/hive/metastore/utils/ObjectPair.java | 0 .../hadoop/hive/metastore/utils/SecurityUtils.java | 11 +- .../hadoop/hive/metastore/utils/StringUtils.java | 0 .../MetastoreDelegationTokenSupport.java | 0 .../src/main/resources/metastore-log4j2.properties | 0 .../src/main/resources/saveVersion.sh | 0 .../src/main/resources/thrift-replacements.txt | 2 +- standalone-metastore/metastore-server/pom.xml | 689 ++++++++++++++ .../metastore-server/src/assembly/bin.xml | 136 +++ .../metastore-server/src/assembly/src.xml | 53 ++ .../hive/common/ndv/NumDistinctValueEstimator.java | 0 .../ndv/NumDistinctValueEstimatorFactory.java | 0 .../apache/hadoop/hive/common/ndv/fm/FMSketch.java | 0 .../hadoop/hive/common/ndv/fm/FMSketchUtils.java | 0 .../hadoop/hive/common/ndv/hll/HLLConstants.java | 0 .../hive/common/ndv/hll/HLLDenseRegister.java | 0 .../hadoop/hive/common/ndv/hll/HLLRegister.java | 0 .../hive/common/ndv/hll/HLLSparseRegister.java | 0 .../hadoop/hive/common/ndv/hll/HyperLogLog.java | 1 - .../hive/common/ndv/hll/HyperLogLogUtils.java | 0 .../hadoop/hive/metastore/AcidEventListener.java | 5 +- .../hadoop/hive/metastore/AggregateStatsCache.java | 0 .../apache/hadoop/hive/metastore/AlterHandler.java | 0 .../apache/hadoop/hive/metastore/Batchable.java | 0 .../hadoop/hive/metastore/DatabaseProduct.java | 0 .../org/apache/hadoop/hive/metastore/Deadline.java | 0 .../hadoop/hive/metastore/DeadlineException.java | 0 .../metastore/DefaultPartitionExpressionProxy.java | 0 .../hive/metastore/DefaultStorageSchemaReader.java | 0 .../hadoop/hive/metastore/FileFormatProxy.java | 0 .../hadoop/hive/metastore/FileMetadataHandler.java | 0 .../hadoop/hive/metastore/FileMetadataManager.java | 0 .../hadoop/hive/metastore/HMSMetricsListener.java | 0 .../hadoop/hive/metastore/HiveAlterHandler.java | 37 +- .../hadoop/hive/metastore/HiveMetaStore.java | 93 +- .../hadoop/hive/metastore/HiveMetaStoreFsImpl.java | 0 .../hive/metastore/IExtrapolatePartStatus.java | 0 .../apache/hadoop/hive/metastore/IHMSHandler.java | 1 - .../hive/metastore/IMetaStoreSchemaInfo.java | 0 .../metastore/LinearExtrapolatePartStatus.java | 0 .../hive/metastore/LockComponentBuilder.java | 0 .../hadoop/hive/metastore/LockRequestBuilder.java | 0 .../MaterializationsCacheCleanerTask.java | 0 .../MaterializationsInvalidationCache.java | 10 + .../MaterializationsRebuildLockCleanerTask.java | 0 .../MaterializationsRebuildLockHandler.java | 0 .../hadoop/hive/metastore/MetaStoreDirectSql.java | 13 +- .../metastore/MetaStoreEndFunctionContext.java | 0 .../metastore/MetaStoreEndFunctionListener.java | 0 .../hive/metastore/MetaStoreEventListener.java | 0 .../metastore/MetaStoreEventListenerConstants.java | 0 .../apache/hadoop/hive/metastore/MetaStoreFS.java | 0 .../hadoop/hive/metastore/MetaStoreInit.java | 0 .../hive/metastore/MetaStoreInitContext.java | 0 .../hive/metastore/MetaStoreInitListener.java | 0 .../hive/metastore/MetaStoreListenerNotifier.java | 0 .../hive/metastore/MetaStorePreEventListener.java | 0 .../hadoop/hive/metastore/MetaStoreSchemaInfo.java | 0 .../hive/metastore/MetaStoreSchemaInfoFactory.java | 0 .../hadoop/hive/metastore/MetaStoreThread.java | 0 .../hadoop/hive/metastore/MetadataStore.java | 0 .../hadoop/hive/metastore/MetastoreTaskThread.java | 0 .../apache/hadoop/hive/metastore/ObjectStore.java | 35 +- .../hadoop/hive/metastore/PartFilterExprUtil.java | 0 .../hive/metastore/PartitionExpressionProxy.java | 0 .../org/apache/hadoop/hive/metastore/RawStore.java | 2 +- .../hadoop/hive/metastore/RawStoreProxy.java | 0 .../hadoop/hive/metastore/ReplChangeManager.java | 0 .../hadoop/hive/metastore/RetryingHMSHandler.java | 0 .../hive/metastore/RuntimeStatsCleanerTask.java | 0 .../hive/metastore/SessionPropertiesListener.java | 0 .../hadoop/hive/metastore/StatObjectConverter.java | 0 .../hive/metastore/TServerSocketKeepAlive.java | 0 .../hive/metastore/TSetIpAddressProcessor.java | 0 .../hadoop/hive/metastore/TUGIBasedProcessor.java | 0 .../apache/hadoop/hive/metastore/ThreadPool.java | 0 .../TransactionalMetaStoreEventListener.java | 0 .../metastore/TransactionalValidationListener.java | 6 +- .../apache/hadoop/hive/metastore/Warehouse.java | 34 - .../hive/metastore/api/utils/DecimalUtils.java | 0 .../hive/metastore/cache/ByteArrayWrapper.java | 0 .../hadoop/hive/metastore/cache/CacheUtils.java | 0 .../hadoop/hive/metastore/cache/CachedStore.java | 20 +- .../hadoop/hive/metastore/cache/SharedCache.java | 8 +- .../metastore/client/builder/CatalogBuilder.java | 0 .../client/builder/ConstraintBuilder.java | 6 +- .../metastore/client/builder/DatabaseBuilder.java | 5 +- .../metastore/client/builder/FunctionBuilder.java | 4 +- .../GrantRevokePrivilegeRequestBuilder.java | 0 .../client/builder/HiveObjectPrivilegeBuilder.java | 0 .../client/builder/HiveObjectRefBuilder.java | 0 .../metastore/client/builder/ISchemaBuilder.java | 0 .../metastore/client/builder/PartitionBuilder.java | 5 +- .../client/builder/PrivilegeGrantInfoBuilder.java | 0 .../hive/metastore/client/builder/RoleBuilder.java | 0 .../client/builder/SQLCheckConstraintBuilder.java | 0 .../builder/SQLDefaultConstraintBuilder.java | 0 .../client/builder/SQLForeignKeyBuilder.java | 0 .../builder/SQLNotNullConstraintBuilder.java | 0 .../client/builder/SQLPrimaryKeyBuilder.java | 0 .../client/builder/SQLUniqueConstraintBuilder.java | 0 .../client/builder/SchemaVersionBuilder.java | 0 .../client/builder/SerdeAndColsBuilder.java | 0 .../client/builder/StorageDescriptorBuilder.java | 0 .../metastore/client/builder/TableBuilder.java | 4 +- .../aggr/BinaryColumnStatsAggregator.java | 2 +- .../aggr/BooleanColumnStatsAggregator.java | 2 +- .../columnstats/aggr/ColumnStatsAggregator.java | 2 +- .../aggr/ColumnStatsAggregatorFactory.java | 0 .../aggr/DateColumnStatsAggregator.java | 2 +- .../aggr/DecimalColumnStatsAggregator.java | 31 +- .../aggr/DoubleColumnStatsAggregator.java | 2 +- .../columnstats/aggr/IExtrapolatePartStatus.java | 0 .../aggr/LongColumnStatsAggregator.java | 3 +- .../aggr/StringColumnStatsAggregator.java | 3 +- .../cache/DateColumnStatsDataInspector.java | 0 .../cache/DecimalColumnStatsDataInspector.java | 0 .../cache/DoubleColumnStatsDataInspector.java | 0 .../cache/LongColumnStatsDataInspector.java | 0 .../cache/StringColumnStatsDataInspector.java | 0 .../columnstats/merge/BinaryColumnStatsMerger.java | 0 .../merge/BooleanColumnStatsMerger.java | 0 .../columnstats/merge/ColumnStatsMerger.java | 0 .../merge/ColumnStatsMergerFactory.java | 0 .../columnstats/merge/DateColumnStatsMerger.java | 0 .../merge/DecimalColumnStatsMerger.java | 0 .../columnstats/merge/DoubleColumnStatsMerger.java | 0 .../columnstats/merge/LongColumnStatsMerger.java | 0 .../columnstats/merge/StringColumnStatsMerger.java | 0 .../datasource/BoneCPDataSourceProvider.java | 0 .../metastore/datasource/DataSourceProvider.java | 0 .../datasource/DataSourceProviderFactory.java | 0 .../datasource/DbCPDataSourceProvider.java | 0 .../datasource/HikariCPDataSourceProvider.java | 0 .../hive/metastore/datasource/package-info.java | 0 .../hive/metastore/events/AbortTxnEvent.java | 0 .../hive/metastore/events/AcidWriteEvent.java | 0 .../hive/metastore/events/AddForeignKeyEvent.java | 0 .../events/AddNotNullConstraintEvent.java | 0 .../hive/metastore/events/AddPartitionEvent.java | 0 .../hive/metastore/events/AddPrimaryKeyEvent.java | 0 .../metastore/events/AddSchemaVersionEvent.java | 0 .../metastore/events/AddUniqueConstraintEvent.java | 0 .../hive/metastore/events/AllocWriteIdEvent.java | 0 .../hive/metastore/events/AlterCatalogEvent.java | 0 .../hive/metastore/events/AlterDatabaseEvent.java | 0 .../hive/metastore/events/AlterISchemaEvent.java | 0 .../hive/metastore/events/AlterPartitionEvent.java | 0 .../metastore/events/AlterSchemaVersionEvent.java | 0 .../hive/metastore/events/AlterTableEvent.java | 0 .../hive/metastore/events/CommitTxnEvent.java | 0 .../hive/metastore/events/ConfigChangeEvent.java | 0 .../hive/metastore/events/CreateCatalogEvent.java | 0 .../hive/metastore/events/CreateDatabaseEvent.java | 0 .../hive/metastore/events/CreateFunctionEvent.java | 0 .../hive/metastore/events/CreateISchemaEvent.java | 0 .../hive/metastore/events/CreateTableEvent.java | 0 .../hive/metastore/events/DropCatalogEvent.java | 0 .../hive/metastore/events/DropConstraintEvent.java | 0 .../hive/metastore/events/DropDatabaseEvent.java | 0 .../hive/metastore/events/DropFunctionEvent.java | 0 .../hive/metastore/events/DropISchemaEvent.java | 0 .../hive/metastore/events/DropPartitionEvent.java | 0 .../metastore/events/DropSchemaVersionEvent.java | 0 .../hive/metastore/events/DropTableEvent.java | 0 .../hive/metastore/events/EventCleanerTask.java | 0 .../hadoop/hive/metastore/events/InsertEvent.java | 0 .../hive/metastore/events/ListenerEvent.java | 0 .../metastore/events/LoadPartitionDoneEvent.java | 0 .../hadoop/hive/metastore/events/OpenTxnEvent.java | 0 .../metastore/events/PreAddPartitionEvent.java | 0 .../metastore/events/PreAddSchemaVersionEvent.java | 0 .../metastore/events/PreAlterCatalogEvent.java | 0 .../metastore/events/PreAlterDatabaseEvent.java | 0 .../metastore/events/PreAlterISchemaEvent.java | 0 .../metastore/events/PreAlterPartitionEvent.java | 0 .../events/PreAlterSchemaVersionEvent.java | 0 .../hive/metastore/events/PreAlterTableEvent.java | 0 .../events/PreAuthorizationCallEvent.java | 0 .../metastore/events/PreCreateCatalogEvent.java | 0 .../metastore/events/PreCreateDatabaseEvent.java | 0 .../metastore/events/PreCreateISchemaEvent.java | 0 .../hive/metastore/events/PreCreateTableEvent.java | 0 .../hive/metastore/events/PreDropCatalogEvent.java | 0 .../metastore/events/PreDropDatabaseEvent.java | 0 .../hive/metastore/events/PreDropISchemaEvent.java | 0 .../metastore/events/PreDropPartitionEvent.java | 0 .../events/PreDropSchemaVersionEvent.java | 0 .../hive/metastore/events/PreDropTableEvent.java | 0 .../hive/metastore/events/PreEventContext.java | 0 .../events/PreLoadPartitionDoneEvent.java | 0 .../hive/metastore/events/PreReadCatalogEvent.java | 0 .../metastore/events/PreReadDatabaseEvent.java | 0 .../hive/metastore/events/PreReadISchemaEvent.java | 0 .../hive/metastore/events/PreReadTableEvent.java | 0 .../events/PreReadhSchemaVersionEvent.java | 0 .../hive/metastore/hooks/JDOConnectionURLHook.java | 0 .../hive/metastore/messaging/AbortTxnMessage.java | 0 .../hive/metastore/messaging/AcidWriteMessage.java | 0 .../metastore/messaging/AddForeignKeyMessage.java | 0 .../messaging/AddNotNullConstraintMessage.java | 0 .../metastore/messaging/AddPartitionMessage.java | 0 .../metastore/messaging/AddPrimaryKeyMessage.java | 0 .../messaging/AddUniqueConstraintMessage.java | 0 .../metastore/messaging/AllocWriteIdMessage.java | 0 .../metastore/messaging/AlterCatalogMessage.java | 0 .../metastore/messaging/AlterDatabaseMessage.java | 0 .../metastore/messaging/AlterPartitionMessage.java | 0 .../metastore/messaging/AlterTableMessage.java | 0 .../hive/metastore/messaging/CommitTxnMessage.java | 0 .../metastore/messaging/CreateCatalogMessage.java | 0 .../metastore/messaging/CreateDatabaseMessage.java | 0 .../metastore/messaging/CreateFunctionMessage.java | 0 .../metastore/messaging/CreateTableMessage.java | 0 .../metastore/messaging/DropCatalogMessage.java | 0 .../metastore/messaging/DropConstraintMessage.java | 0 .../metastore/messaging/DropDatabaseMessage.java | 0 .../metastore/messaging/DropFunctionMessage.java | 0 .../metastore/messaging/DropPartitionMessage.java | 0 .../hive/metastore/messaging/DropTableMessage.java | 0 .../hive/metastore/messaging/EventMessage.java | 0 .../hive/metastore/messaging/EventUtils.java | 0 .../hive/metastore/messaging/InsertMessage.java | 0 .../metastore/messaging/MessageDeserializer.java | 0 .../hive/metastore/messaging/MessageFactory.java | 0 .../hive/metastore/messaging/OpenTxnMessage.java | 0 .../hive/metastore/messaging/PartitionFiles.java | 0 .../messaging/event/filters/AndFilter.java | 0 .../messaging/event/filters/BasicFilter.java | 0 .../event/filters/DatabaseAndTableFilter.java | 0 .../event/filters/EventBoundaryFilter.java | 0 .../event/filters/MessageFormatFilter.java | 0 .../messaging/json/JSONAbortTxnMessage.java | 0 .../messaging/json/JSONAcidWriteMessage.java | 0 .../messaging/json/JSONAddForeignKeyMessage.java | 0 .../json/JSONAddNotNullConstraintMessage.java | 0 .../messaging/json/JSONAddPartitionMessage.java | 0 .../messaging/json/JSONAddPrimaryKeyMessage.java | 0 .../json/JSONAddUniqueConstraintMessage.java | 0 .../messaging/json/JSONAllocWriteIdMessage.java | 0 .../messaging/json/JSONAlterCatalogMessage.java | 0 .../messaging/json/JSONAlterDatabaseMessage.java | 0 .../messaging/json/JSONAlterPartitionMessage.java | 0 .../messaging/json/JSONAlterTableMessage.java | 0 .../messaging/json/JSONCommitTxnMessage.java | 0 .../messaging/json/JSONCreateCatalogMessage.java | 0 .../messaging/json/JSONCreateDatabaseMessage.java | 0 .../messaging/json/JSONCreateFunctionMessage.java | 0 .../messaging/json/JSONCreateTableMessage.java | 0 .../messaging/json/JSONDropCatalogMessage.java | 0 .../messaging/json/JSONDropConstraintMessage.java | 0 .../messaging/json/JSONDropDatabaseMessage.java | 0 .../messaging/json/JSONDropFunctionMessage.java | 0 .../messaging/json/JSONDropPartitionMessage.java | 0 .../messaging/json/JSONDropTableMessage.java | 0 .../messaging/json/JSONInsertMessage.java | 0 .../messaging/json/JSONMessageDeserializer.java | 0 .../messaging/json/JSONMessageFactory.java | 0 .../messaging/json/JSONOpenTxnMessage.java | 0 .../hive/metastore/metrics/JsonReporter.java | 0 .../hive/metastore/metrics/JvmPauseMonitor.java | 0 .../hadoop/hive/metastore/metrics/Metrics.java | 0 .../hive/metastore/metrics/MetricsConstants.java | 0 .../hadoop/hive/metastore/metrics/PerfLogger.java | 0 .../hadoop/hive/metastore/model/MCatalog.java | 0 .../hive/metastore/model/MColumnDescriptor.java | 0 .../hadoop/hive/metastore/model/MConstraint.java | 0 .../hive/metastore/model/MCreationMetadata.java | 0 .../hadoop/hive/metastore/model/MDBPrivilege.java | 0 .../hadoop/hive/metastore/model/MDatabase.java | 0 .../hive/metastore/model/MDelegationToken.java | 0 .../hadoop/hive/metastore/model/MFieldSchema.java | 0 .../hadoop/hive/metastore/model/MFunction.java | 0 .../hive/metastore/model/MGlobalPrivilege.java | 0 .../hadoop/hive/metastore/model/MISchema.java | 0 .../apache/hadoop/hive/metastore/model/MIndex.java | 0 .../hadoop/hive/metastore/model/MMasterKey.java | 0 .../metastore/model/MMetastoreDBProperties.java | 0 .../hive/metastore/model/MNotificationLog.java | 0 .../hive/metastore/model/MNotificationNextId.java | 0 .../apache/hadoop/hive/metastore/model/MOrder.java | 0 .../hadoop/hive/metastore/model/MPartition.java | 0 .../metastore/model/MPartitionColumnPrivilege.java | 0 .../model/MPartitionColumnStatistics.java | 0 .../hive/metastore/model/MPartitionEvent.java | 0 .../hive/metastore/model/MPartitionPrivilege.java | 0 .../hive/metastore/model/MPrincipalDesc.java | 0 .../hadoop/hive/metastore/model/MResourceUri.java | 0 .../apache/hadoop/hive/metastore/model/MRole.java | 0 .../hadoop/hive/metastore/model/MRoleMap.java | 0 .../hadoop/hive/metastore/model/MRuntimeStat.java | 0 .../hive/metastore/model/MSchemaVersion.java | 0 .../hadoop/hive/metastore/model/MSerDeInfo.java | 0 .../hive/metastore/model/MStorageDescriptor.java | 0 .../hadoop/hive/metastore/model/MStringList.java | 0 .../apache/hadoop/hive/metastore/model/MTable.java | 0 .../metastore/model/MTableColumnPrivilege.java | 0 .../metastore/model/MTableColumnStatistics.java | 0 .../hive/metastore/model/MTablePrivilege.java | 0 .../metastore/model/MTxnWriteNotificationLog.java | 0 .../apache/hadoop/hive/metastore/model/MType.java | 0 .../hadoop/hive/metastore/model/MVersionTable.java | 0 .../hadoop/hive/metastore/model/MWMMapping.java | 0 .../hadoop/hive/metastore/model/MWMPool.java | 0 .../hive/metastore/model/MWMResourcePlan.java | 0 .../hadoop/hive/metastore/model/MWMTrigger.java | 0 .../hive/metastore/parser/ExpressionTree.java | 0 .../apache/hadoop/hive/metastore/parser/Filter.g | 0 .../hadoop/hive/metastore/parser/package-info.java | 0 .../hive/metastore/security/DBTokenStore.java | 0 .../metastore/security/DelegationTokenStore.java | 0 .../metastore/security/DelegationTokenTool.java | 0 .../hive/metastore/security/MemoryTokenStore.java | 0 .../security/MetastoreDelegationTokenManager.java | 0 .../security/TUGIContainingTransport.java | 0 .../TokenStoreDelegationTokenSecretManager.java | 0 .../metastore/security/ZooKeeperTokenStore.java | 0 .../hadoop/hive/metastore/tools/HiveMetaTool.java | 0 .../hive/metastore/tools/HiveSchemaHelper.java | 0 .../hive/metastore/tools/MetastoreSchemaTool.java | 0 .../hadoop/hive/metastore/tools/SQLGenerator.java | 0 .../hadoop/hive/metastore/tools/SmokeTest.java | 0 .../txn/AcidCompactionHistoryService.java | 0 .../hive/metastore/txn/AcidHouseKeeperService.java | 0 .../metastore/txn/AcidOpenTxnsCounterService.java | 0 .../hive/metastore/txn/AcidWriteSetService.java | 0 .../hadoop/hive/metastore/txn/CompactionInfo.java | 0 .../hive/metastore/txn/CompactionTxnHandler.java | 0 .../hadoop/hive/metastore/txn/TxnDbUtil.java | 0 .../hadoop/hive/metastore/txn/TxnHandler.java | 7 +- .../apache/hadoop/hive/metastore/txn/TxnStore.java | 0 .../apache/hadoop/hive/metastore/txn/TxnUtils.java | 121 +-- .../hive/metastore/utils/CommonCliOptions.java | 0 .../metastore/utils/HiveStrictManagedUtils.java | 0 .../hadoop/hive/metastore/utils/LogUtils.java | 0 .../metastore/utils/MetaStoreServerUtils.java} | 936 +------------------ .../hive/metastore/utils/MetastoreVersionInfo.java | 0 .../hadoop/hive/metastore/utils/StringableMap.java | 0 .../apache/hadoop/hive/metastore/metastore.proto | 0 .../main/resources/datanucleus-log4j.properties | 0 .../src/main/resources/metastore-log4j2.properties | 71 ++ .../src/main/resources/metastore-site.xml | 0 .../src/main/resources/package.jdo | 0 .../src/main/resources/saveVersion.sh | 91 ++ .../src/main/resources/thrift-replacements.txt | 106 +++ .../{ => metastore-server}/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 .../src/main/sql/derby/hive-schema-1.2.0.derby.sql | 0 .../src/main/sql/derby/hive-schema-3.0.0.derby.sql | 0 .../src/main/sql/derby/hive-schema-3.1.0.derby.sql | 0 .../src/main/sql/derby/hive-schema-4.0.0.derby.sql | 0 .../sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql | 0 .../sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql | 0 .../sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql | 0 .../sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql | 0 .../sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql | 0 .../sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql | 0 .../sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql | 0 .../src/main/sql/derby/upgrade.order.derby | 0 .../src/main/sql/mssql/create-user.mssql.sql | 0 .../src/main/sql/mssql/hive-schema-1.2.0.mssql.sql | 0 .../src/main/sql/mssql/hive-schema-3.0.0.mssql.sql | 0 .../src/main/sql/mssql/hive-schema-3.1.0.mssql.sql | 0 .../src/main/sql/mssql/hive-schema-4.0.0.mssql.sql | 0 .../sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql | 0 .../sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql | 0 .../sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql | 0 .../sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql | 0 .../sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql | 0 .../sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql | 0 .../sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql | 0 .../src/main/sql/mssql/upgrade.order.mssql | 0 .../src/main/sql/mysql/create-user.mysql.sql | 0 .../src/main/sql/mysql/hive-schema-1.2.0.mysql.sql | 0 .../src/main/sql/mysql/hive-schema-3.0.0.mysql.sql | 0 .../src/main/sql/mysql/hive-schema-3.1.0.mysql.sql | 0 .../src/main/sql/mysql/hive-schema-4.0.0.mysql.sql | 0 .../sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql | 0 .../sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql | 0 .../sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql | 0 .../sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql | 0 .../sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql | 0 .../sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql | 0 .../sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql | 0 .../src/main/sql/mysql/upgrade.order.mysql | 0 .../src/main/sql/oracle/create-user.oracle.sql | 0 .../main/sql/oracle/hive-schema-1.2.0.oracle.sql | 0 .../main/sql/oracle/hive-schema-3.0.0.oracle.sql | 0 .../main/sql/oracle/hive-schema-3.1.0.oracle.sql | 0 .../main/sql/oracle/hive-schema-4.0.0.oracle.sql | 0 .../sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql | 0 .../sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql | 0 .../sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql | 0 .../sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql | 0 .../sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql | 0 .../sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql | 0 .../sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql | 0 .../src/main/sql/oracle/upgrade.order.oracle | 0 .../src/main/sql/postgres/create-user.postgres.sql | 0 .../sql/postgres/hive-schema-1.2.0.postgres.sql | 0 .../sql/postgres/hive-schema-3.0.0.postgres.sql | 0 .../sql/postgres/hive-schema-3.1.0.postgres.sql | 0 .../sql/postgres/hive-schema-4.0.0.postgres.sql | 0 .../postgres/upgrade-1.2.0-to-2.0.0.postgres.sql | 0 .../postgres/upgrade-2.0.0-to-2.1.0.postgres.sql | 0 .../postgres/upgrade-2.1.0-to-2.2.0.postgres.sql | 0 .../postgres/upgrade-2.2.0-to-2.3.0.postgres.sql | 0 .../postgres/upgrade-2.3.0-to-3.0.0.postgres.sql | 0 .../postgres/upgrade-3.0.0-to-3.1.0.postgres.sql | 0 .../postgres/upgrade-3.1.0-to-4.0.0.postgres.sql | 0 .../src/main/sql/postgres/upgrade.order.postgres | 0 .../src/main/thrift/hive_metastore.thrift | 0 .../hadoop/hive/common/TestStatsSetupConst.java | 0 .../common/ndv/fm/TestFMSketchSerialization.java | 0 .../hadoop/hive/common/ndv/hll/TestHLLNoBias.java | 0 .../hive/common/ndv/hll/TestHLLSerialization.java | 0 .../hive/common/ndv/hll/TestHyperLogLog.java | 0 .../hive/common/ndv/hll/TestHyperLogLogDense.java | 0 .../hive/common/ndv/hll/TestHyperLogLogMerge.java | 0 .../hive/common/ndv/hll/TestHyperLogLogSparse.java | 0 .../hive/common/ndv/hll/TestSparseEncodeHash.java | 0 .../metastore/AlternateFailurePreListener.java | 0 .../hive/metastore/DummyEndFunctionListener.java | 0 .../hive/metastore/DummyJdoConnectionUrlHook.java | 0 .../hadoop/hive/metastore/DummyListener.java | 0 .../hive/metastore/DummyMetaStoreInitListener.java | 0 .../hadoop/hive/metastore/DummyPreListener.java | 0 .../metastore/DummyRawStoreControlledCommit.java | 2 +- .../metastore/DummyRawStoreForJdoConnection.java | 4 +- .../apache/hadoop/hive/metastore/FakeDerby.java | 0 .../metastore/HiveMetaStoreClientPreCatalog.java | 32 +- .../metastore/InjectableBehaviourObjectStore.java | 0 .../hadoop/hive/metastore/IpAddressListener.java | 0 .../hadoop/hive/metastore/MetaStoreTestUtils.java | 0 .../MockPartitionExpressionForMetastore.java | 0 .../hive/metastore/NonCatCallsWithCatalog.java | 0 .../hadoop/hive/metastore/TestAdminUser.java | 0 .../hive/metastore/TestAggregateStatsCache.java | 0 .../metastore/TestCatalogNonDefaultClient.java | 0 .../hive/metastore/TestCatalogNonDefaultSvr.java | 0 .../hive/metastore/TestCatalogOldClient.java | 0 .../apache/hadoop/hive/metastore/TestDeadline.java | 0 .../hive/metastore/TestEmbeddedHiveMetaStore.java | 0 .../hadoop/hive/metastore/TestFilterHooks.java | 0 .../hive/metastore/TestHiveAlterHandler.java | 1 - .../hadoop/hive/metastore/TestHiveMetaStore.java | 5 +- .../metastore/TestHiveMetaStoreGetMetaConf.java | 4 +- .../metastore/TestHiveMetaStorePartitionSpecs.java | 0 .../metastore/TestHiveMetaStoreSchemaMethods.java | 0 .../hive/metastore/TestHiveMetaStoreTimeout.java | 0 .../hive/metastore/TestHiveMetaStoreTxns.java | 0 .../TestHiveMetaStoreWithEnvironmentContext.java | 0 .../hive/metastore/TestHiveMetastoreCli.java | 0 .../hive/metastore/TestLockRequestBuilder.java | 0 .../hadoop/hive/metastore/TestMarkPartition.java | 0 .../hive/metastore/TestMarkPartitionRemote.java | 0 .../metastore/TestMetaStoreConnectionUrlHook.java | 0 .../TestMetaStoreEndFunctionListener.java | 0 .../hive/metastore/TestMetaStoreEventListener.java | 0 .../TestMetaStoreEventListenerOnlyOnCommit.java | 0 .../TestMetaStoreEventListenerWithOldConf.java | 0 .../hive/metastore/TestMetaStoreInitListener.java | 0 .../metastore/TestMetaStoreListenersError.java | 0 .../TestMetaStoreMaterializationsCacheCleaner.java | 0 .../hive/metastore/TestMetaStoreSchemaFactory.java | 0 .../hive/metastore/TestMetaStoreSchemaInfo.java | 0 .../hadoop/hive/metastore/TestObjectStore.java | 0 .../hive/metastore/TestObjectStoreInitRetry.java | 0 .../metastore/TestObjectStoreSchemaMethods.java | 0 .../hadoop/hive/metastore/TestOldSchema.java | 0 .../TestPartitionNameWhitelistValidation.java | 0 .../hadoop/hive/metastore/TestRawStoreProxy.java | 0 .../hive/metastore/TestRemoteHiveMetaStore.java | 0 .../TestRemoteHiveMetaStoreIpAddress.java | 0 .../TestRemoteUGIHiveMetaStoreIpAddress.java | 0 .../metastore/TestRetriesInRetryingHMSHandler.java | 0 .../hive/metastore/TestRetryingHMSHandler.java | 0 .../metastore/TestSetUGIOnBothClientServer.java | 0 .../hive/metastore/TestSetUGIOnOnlyClient.java | 0 .../hive/metastore/TestSetUGIOnOnlyServer.java | 0 .../apache/hadoop/hive/metastore/TestStats.java | 0 .../hive/metastore/VerifyingObjectStore.java | 0 .../metastore/annotation/MetastoreCheckinTest.java | 0 .../hive/metastore/annotation/MetastoreTest.java | 0 .../metastore/annotation/MetastoreUnitTest.java | 0 .../hive/metastore/cache/TestCachedStore.java | 0 .../hive/metastore/cache/TestCatalogCaching.java | 0 .../hive/metastore/client/MetaStoreClientTest.java | 0 .../metastore/client/MetaStoreFactoryForTests.java | 0 .../hive/metastore/client/TestAddPartitions.java | 0 .../client/TestAddPartitionsFromPartSpec.java | 0 .../hive/metastore/client/TestAlterPartitions.java | 0 .../metastore/client/TestAppendPartitions.java | 0 .../hadoop/hive/metastore/client/TestCatalogs.java | 0 .../hive/metastore/client/TestCheckConstraint.java | 0 .../hive/metastore/client/TestDatabases.java | 0 .../metastore/client/TestDefaultConstraint.java | 0 .../hive/metastore/client/TestDropPartitions.java | 0 .../metastore/client/TestExchangePartitions.java | 12 +- .../hive/metastore/client/TestForeignKey.java | 0 .../hive/metastore/client/TestFunctions.java | 0 .../hive/metastore/client/TestGetPartitions.java | 0 .../hive/metastore/client/TestGetTableMeta.java | 4 +- .../hive/metastore/client/TestListPartitions.java | 0 .../metastore/client/TestNotNullConstraint.java | 0 .../hive/metastore/client/TestPrimaryKey.java | 0 .../hive/metastore/client/TestRuntimeStats.java | 0 .../client/TestTablesCreateDropAlterTruncate.java | 0 .../hive/metastore/client/TestTablesGetExists.java | 0 .../hive/metastore/client/TestTablesList.java | 0 .../metastore/client/TestUniqueConstraint.java | 0 .../hadoop/hive/metastore/client/package-info.java | 0 .../merge/DecimalColumnStatsMergerTest.java | 0 .../hive/metastore/conf/TestMetastoreConf.java | 0 .../datasource/TestDataSourceProviderFactory.java | 0 .../hive/metastore/dbinstall/DbInstallBase.java | 0 .../hive/metastore/dbinstall/ITestMysql.java | 0 .../hive/metastore/dbinstall/ITestOracle.java | 0 .../hive/metastore/dbinstall/ITestPostgres.java | 0 .../hive/metastore/dbinstall/ITestSqlServer.java | 0 .../json/TestJSONMessageDeserializer.java | 0 .../hadoop/hive/metastore/metrics/TestMetrics.java | 0 .../minihms/AbstractMetaStoreService.java | 0 .../minihms/ClusterMetaStoreForTests.java | 0 .../minihms/EmbeddedMetaStoreForTests.java | 0 .../hadoop/hive/metastore/minihms/MiniHMS.java | 0 .../metastore/minihms/RemoteMetaStoreForTests.java | 0 .../hive/metastore/minihms/package-info.java | 0 .../metastore/tools/TestMetastoreSchemaTool.java | 0 .../tools/TestSchemaToolForMetastore.java | 0 .../hive/metastore/txn/TestTxnHandlerNegative.java | 0 .../hadoop/hive/metastore/txn/TestTxnUtils.java | 0 .../hadoop/hive/metastore/utils/TestHdfsUtils.java | 0 .../hive/metastore/utils/TestMetaStoreUtils.java | 20 +- .../src/test/resources/log4j2.properties | 0 standalone-metastore/pom.xml | 988 +++++--------------- .../apache/hadoop/hive/common/DatabaseName.java | 4 +- .../org/apache/hadoop/hive/common/TableName.java | 4 +- .../hive/streaming/HiveStreamingConnection.java | 5 +- upgrade-acid/pom.xml | 2 +- 906 files changed, 3508 insertions(+), 2165 deletions(-) create mode 100644 standalone-metastore/metastore-client/pom.xml rename standalone-metastore/{ => metastore-client}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (96%) rename standalone-metastore/{ => metastore-client}/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java (100%) create mode 100644 standalone-metastore/metastore-common/pom.xml rename standalone-metastore/{src/gen/thrift/gen-py => metastore-common/src}/__init__.py (100%) 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%) create mode 100644 standalone-metastore/metastore-common/src/gen/thrift/gen-py/__init__.py 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/metastore/ColumnType.java (99%) 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/HiveMetaException.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHook.java (97%) 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/IMetaStoreClient.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/PartitionDropOptions.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/TableType.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/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 (98%) 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/hooks/URIResolverHook.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java (98%) 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/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/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/TFilterTransport.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIAssumingTransport.java (100%) create mode 100644 standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnCommonUtils.java 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/JavaUtils.java (100%) create mode 100644 standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java 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 (97%) 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/security/token/delegation/MetastoreDelegationTokenSupport.java (100%) rename standalone-metastore/{ => metastore-common}/src/main/resources/metastore-log4j2.properties (100%) rename standalone-metastore/{ => metastore-common}/src/main/resources/saveVersion.sh (100%) rename standalone-metastore/{ => metastore-common}/src/main/resources/thrift-replacements.txt (98%) create mode 100644 standalone-metastore/metastore-server/pom.xml create mode 100644 standalone-metastore/metastore-server/src/assembly/bin.xml create mode 100644 standalone-metastore/metastore-server/src/assembly/src.xml rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java (95%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/FileFormatProxy.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataHandler.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/FileMetadataManager.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/HMSMetricsListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java (96%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java (98%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsCacheCleanerTask.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsInvalidationCache.java (98%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java (95%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java (94%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java (96%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java (96%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java (96%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java (97%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java (96%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java (96%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java (93%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java (91%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java (98%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java (99%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java (75%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java (100%) rename standalone-metastore/{src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java => metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreServerUtils.java} (50%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java (100%) rename standalone-metastore/{ => metastore-server}/src/main/protobuf/org/apache/hadoop/hive/metastore/metastore.proto (100%) rename standalone-metastore/{ => metastore-server}/src/main/resources/datanucleus-log4j.properties (100%) create mode 100644 standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties rename standalone-metastore/{ => metastore-server}/src/main/resources/metastore-site.xml (100%) rename standalone-metastore/{ => metastore-server}/src/main/resources/package.jdo (100%) create mode 100755 standalone-metastore/metastore-server/src/main/resources/saveVersion.sh create mode 100644 standalone-metastore/metastore-server/src/main/resources/thrift-replacements.txt rename standalone-metastore/{ => metastore-server}/src/main/scripts/base (98%) rename standalone-metastore/{ => metastore-server}/src/main/scripts/ext/metastore.sh (96%) rename standalone-metastore/{ => metastore-server}/src/main/scripts/ext/schemaTool.sh (95%) rename standalone-metastore/{ => metastore-server}/src/main/scripts/ext/smokeTest.sh (95%) rename standalone-metastore/{ => metastore-server}/src/main/scripts/metastore-config.sh (100%) rename standalone-metastore/{ => metastore-server}/src/main/scripts/schematool (100%) rename standalone-metastore/{ => metastore-server}/src/main/scripts/start-metastore (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/hive-schema-1.2.0.derby.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/hive-schema-3.0.0.derby.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/hive-schema-3.1.0.derby.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/hive-schema-4.0.0.derby.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/derby/upgrade.order.derby (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/create-user.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mssql/upgrade.order.mssql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/create-user.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/mysql/upgrade.order.mysql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/create-user.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/oracle/upgrade.order.oracle (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/create-user.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql (100%) rename standalone-metastore/{ => metastore-server}/src/main/sql/postgres/upgrade.order.postgres (100%) rename standalone-metastore/{ => metastore-server}/src/main/thrift/hive_metastore.thrift (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/common/TestStatsSetupConst.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/fm/TestFMSketchSerialization.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLNoBias.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHLLSerialization.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLog.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogDense.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogMerge.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestHyperLogLogSparse.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/common/ndv/hll/TestSparseEncodeHash.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/AlternateFailurePreListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyEndFunctionListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyJdoConnectionUrlHook.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyMetaStoreInitListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyPreListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java (99%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java (99%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java (99%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java (98%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java (99%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java (96%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMaterializationsCacheCleaner.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaFactory.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreSchemaInfo.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreInitRetry.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestObjectStoreSchemaMethods.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestOldSchema.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestPartitionNameWhitelistValidation.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRawStoreProxy.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStoreIpAddress.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRemoteUGIHiveMetaStoreIpAddress.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRetriesInRetryingHMSHandler.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnBothClientServer.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyClient.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestSetUGIOnOnlyServer.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/TestStats.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/VerifyingObjectStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreCheckinTest.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreTest.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/annotation/MetastoreUnitTest.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCachedStore.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/cache/TestCatalogCaching.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreClientTest.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/MetaStoreFactoryForTests.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitions.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAddPartitionsFromPartSpec.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestAppendPartitions.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestCheckConstraint.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestDatabases.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestDefaultConstraint.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestDropPartitions.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java (99%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java (98%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/minihms/package-info.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/tools/TestMetastoreSchemaTool.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/tools/TestSchemaToolForMetastore.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnHandlerNegative.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/txn/TestTxnUtils.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java (100%) rename standalone-metastore/{ => metastore-server}/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java (88%) rename standalone-metastore/{ => metastore-server}/src/test/resources/log4j2.properties (100%) diff --git a/.gitignore b/.gitignore index eb7235cf1e..c1560b5f45 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,6 @@ conf/hive-default.xml.template itests/hive-blobstore/src/test/resources/blobstore-conf.xml .DS_Store patchprocess +standalone-metastore/metastore-common/src/gen/version +standalone-metastore/metastore-server/src/gen/version standalone-metastore/src/gen/version diff --git a/contrib/pom.xml b/contrib/pom.xml index df5e5d7c00..1b1c230101 100644 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -67,6 +67,11 @@ ${hadoop.version} true + + org.apache.hive + metastore-common + ${project.version} + diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java index 8c9271c51e..db6762a82a 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java @@ -42,7 +42,6 @@ import org.apache.hadoop.hive.metastore.HiveMetaHook; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.exec.FunctionRegistry; import org.apache.hadoop.hive.ql.index.IndexPredicateAnalyzer; import org.apache.hadoop.hive.ql.index.IndexSearchCondition; diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml index 431552789e..865346e714 100644 --- a/hcatalog/core/pom.xml +++ b/hcatalog/core/pom.xml @@ -60,6 +60,11 @@ hive-exec ${project.version} + + org.apache.hive + metastore-common + ${project.version} + org.apache.hive hive-exec @@ -69,7 +74,7 @@ org.apache.hive - hive-standalone-metastore + metastore-server ${project.version} test-jar test diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestSemanticAnalysis.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestSemanticAnalysis.java index d6386ab67e..0ee0499abd 100644 --- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestSemanticAnalysis.java +++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestSemanticAnalysis.java @@ -410,7 +410,7 @@ public void testCTLPass() throws Exception { query = "create table like_table like junit_sem_analysis"; CommandProcessorResponse resp = hcatDriver.run(query); assertEquals(0, resp.getResponseCode()); -// Table tbl = client.getTable(MetaStoreUtils.DEFAULT_DATABASE_NAME, likeTbl); +// Table tbl = client.getTable(MetaStoreServerUtils.DEFAULT_DATABASE_NAME, likeTbl); // assertEquals(likeTbl,tbl.getTableName()); // List cols = tbl.getSd().getCols(); // assertEquals(1, cols.size()); @@ -436,7 +436,7 @@ public void testCTLPass() throws Exception { // List partVals = new ArrayList(1); // partVals.add("2010-10-10"); // -// Map map = client.getPartition(MetaStoreUtils.DEFAULT_DATABASE_NAME, TBL_NAME, partVals).getParameters(); +// Map map = client.getPartition(MetaStoreServerUtils.DEFAULT_DATABASE_NAME, TBL_NAME, partVals).getParameters(); // assertEquals(map.get(InitializeInput.HOWL_ISD_CLASS), RCFileInputStorageDriver.class.getName()); // assertEquals(map.get(InitializeInput.HOWL_OSD_CLASS), RCFileOutputStorageDriver.class.getName()); // } diff --git a/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java b/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java index 717cc8afa8..349c58a3de 100644 --- a/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java +++ b/hcatalog/server-extensions/src/main/java/org/apache/hive/hcatalog/listener/DbNotificationListener.java @@ -39,7 +39,6 @@ import org.apache.hadoop.hive.metastore.RawStoreProxy; import org.apache.hadoop.hive.metastore.ReplChangeManager; import org.apache.hadoop.hive.metastore.TransactionalMetaStoreEventListener; -import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.Function; import org.apache.hadoop.hive.metastore.api.MetaException; @@ -83,7 +82,8 @@ import org.apache.hadoop.hive.metastore.messaging.OpenTxnMessage; import org.apache.hadoop.hive.metastore.messaging.PartitionFiles; import org.apache.hadoop.hive.metastore.tools.SQLGenerator; -import org.apache.hadoop.hive.metastore.txn.TxnUtils; +import org.apache.hadoop.hive.metastore.txn.TxnCommonUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -273,16 +273,10 @@ public boolean hasNext() { public PartitionFiles next() { try { Partition p = partitionIter.next(); - Iterator fileIterator; - //For transactional tables, the actual file copy will be done by acid write event during replay of commit txn. - if (!TxnUtils.isTransactionalTable(t)) { - List files = Lists.newArrayList(new FileIterator(p.getSd().getLocation())); - fileIterator = files.iterator(); - } else { - fileIterator = Collections.emptyIterator(); - } + List files = Lists.newArrayList(new FileIterator(p.getSd().getLocation())); PartitionFiles partitionFiles = - new PartitionFiles(Warehouse.makePartName(t.getPartitionKeys(), p.getValues()), fileIterator); + new PartitionFiles(MetaStoreUtils.makePartName(t.getPartitionKeys(), p.getValues()), + files.iterator()); return partitionFiles; } catch (MetaException e) { throw new RuntimeException(e); diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java index 3604630c43..9a90e85525 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/HiveEndPoint.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.DataOperationType; import org.apache.hadoop.hive.metastore.api.Partition; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.io.AcidUtils; import org.apache.hadoop.hive.ql.metadata.Hive; import org.apache.hadoop.hive.ql.metadata.HiveException; @@ -583,7 +584,7 @@ private TransactionBatchImpl(final String user, UserGroupInformation ugi, HiveEn if ( endPt.partitionVals!=null && !endPt.partitionVals.isEmpty() ) { Table tableObj = msClient.getTable(endPt.database, endPt.table); List partKeys = tableObj.getPartitionKeys(); - partNameForLock = Warehouse.makePartName(partKeys, endPt.partitionVals); + partNameForLock = MetaStoreUtils.makePartName(partKeys, endPt.partitionVals); } else { partNameForLock = null; } diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/MetaStorePartitionHelper.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/MetaStorePartitionHelper.java index fb88f2d081..97e7d91dc0 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/MetaStorePartitionHelper.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/MetaStorePartitionHelper.java @@ -22,12 +22,12 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.IMetaStoreClient; -import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.metastore.api.Table; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -94,7 +94,7 @@ public void createPartitionIfNotExists(List newPartitionValues) throws W partition.setTableName(table.getTableName()); StorageDescriptor partitionSd = new StorageDescriptor(table.getSd()); partitionSd.setLocation(table.getSd().getLocation() + Path.SEPARATOR - + Warehouse.makePartName(table.getPartitionKeys(), newPartitionValues)); + + MetaStoreUtils.makePartName(table.getPartitionKeys(), newPartitionValues)); partition.setSd(partitionSd); partition.setValues(newPartitionValues); diff --git a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/StreamingTestUtils.java b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/StreamingTestUtils.java index 63690f9a24..148357c857 100644 --- a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/StreamingTestUtils.java +++ b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/StreamingTestUtils.java @@ -37,7 +37,6 @@ import org.apache.hadoop.hive.metastore.HiveMetaStoreClient; import org.apache.hadoop.hive.metastore.IMetaStoreClient; import org.apache.hadoop.hive.metastore.TableType; -import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.Partition; @@ -45,6 +44,7 @@ import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.txn.TxnDbUtil; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat; import org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat; import org.apache.hadoop.hive.ql.io.orc.OrcSerde; @@ -268,7 +268,7 @@ private Table internalCreate(IMetaStoreClient metaStoreClient) throws Exception partition.setTableName(table.getTableName()); StorageDescriptor partitionSd = new StorageDescriptor(table.getSd()); partitionSd.setLocation(table.getSd().getLocation() + Path.SEPARATOR - + Warehouse.makePartName(table.getPartitionKeys(), partitionValues)); + + MetaStoreUtils.makePartName(table.getPartitionKeys(), partitionValues)); partition.setSd(partitionSd); partition.setValues(partitionValues); diff --git a/hcatalog/webhcat/java-client/pom.xml b/hcatalog/webhcat/java-client/pom.xml index 56b6d53449..cf18492508 100644 --- a/hcatalog/webhcat/java-client/pom.xml +++ b/hcatalog/webhcat/java-client/pom.xml @@ -66,6 +66,11 @@ hadoop-mapreduce-client-core ${hadoop.version} + + org.apache.hive + metastore-common + ${project.version} + org.apache.hive @@ -76,12 +81,12 @@ org.apache.hive - hive-standalone-metastore + metastore-server ${project.version} test-jar test - + org.apache.hive.hcatalog hive-hcatalog-core ${project.version} diff --git a/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatPartition.java b/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatPartition.java index 796ebc5948..b830942838 100644 --- a/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatPartition.java +++ b/hcatalog/webhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/HCatPartition.java @@ -33,6 +33,7 @@ import org.apache.hadoop.hive.metastore.api.Order; import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.hadoop.hive.metastore.api.StorageDescriptor; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hive.hcatalog.common.HCatException; import org.apache.hive.hcatalog.data.schema.HCatFieldSchema; import org.apache.hive.hcatalog.data.schema.HCatSchemaUtils; @@ -138,7 +139,7 @@ Partition toHivePartition() throws HCatException { if (sd.getLocation() == null) { LOG.warn("Partition location is not set! Attempting to construct default partition location."); try { - String partName = Warehouse.makePartName(HCatSchemaUtils.getFieldSchemas(hcatTable.getPartCols()), values); + String partName = MetaStoreUtils.makePartName(HCatSchemaUtils.getFieldSchemas(hcatTable.getPartCols()), values); sd.setLocation(new Path(hcatTable.getSd().getLocation(), partName).toString()); } catch(MetaException exception) { diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml index 5c093b0a4f..3098aa11ca 100644 --- a/hcatalog/webhcat/svr/pom.xml +++ b/hcatalog/webhcat/svr/pom.xml @@ -199,10 +199,15 @@ + + org.apache.hive + metastore-common + ${project.version} + org.apache.hive - hive-standalone-metastore + metastore-server ${project.version} test-jar test diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml index a1d214981b..b31a3d25e7 100644 --- a/itests/hcatalog-unit/pom.xml +++ b/itests/hcatalog-unit/pom.xml @@ -98,7 +98,13 @@ org.apache.hive - hive-standalone-metastore + metastore-common + ${project.version} + test + + + org.apache.hive + metastore-server ${project.version} test diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml index 9466af231e..9b19448dcb 100644 --- a/itests/hive-blobstore/pom.xml +++ b/itests/hive-blobstore/pom.xml @@ -55,13 +55,18 @@ org.apache.hive - hive-standalone-metastore + metastore-common + ${project.version} + + + org.apache.hive + metastore-server ${project.version} test org.apache.hive - hive-standalone-metastore + metastore-server ${project.version} tests test diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml index 4d6e8a8985..fd0217ed5f 100644 --- a/itests/hive-minikdc/pom.xml +++ b/itests/hive-minikdc/pom.xml @@ -74,13 +74,19 @@ org.apache.hive - hive-standalone-metastore + metastore-common ${project.version} test org.apache.hive - hive-standalone-metastore + metastore-server + ${project.version} + test + + + org.apache.hive + metastore-server ${project.version} test tests diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml index 04e39b5739..bcc781dff8 100644 --- a/itests/hive-unit-hadoop2/pom.xml +++ b/itests/hive-unit-hadoop2/pom.xml @@ -101,7 +101,13 @@ org.apache.hive - hive-standalone-metastore + metastore-common + ${project.version} + test + + + org.apache.hive + metastore-server ${project.version} tests diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml index 5264617afa..5fa89723ca 100644 --- a/itests/hive-unit/pom.xml +++ b/itests/hive-unit/pom.xml @@ -175,9 +175,15 @@ ${project.version} test - + + org.apache.hive + metastore-common + ${project.version} + test + + org.apache.hive - hive-standalone-metastore + metastore-server ${project.version} tests diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml index 1a1100cd57..becd32a860 100644 --- a/itests/qtest-accumulo/pom.xml +++ b/itests/qtest-accumulo/pom.xml @@ -67,13 +67,19 @@ org.apache.hive - hive-standalone-metastore + metastore-common ${project.version} test org.apache.hive - hive-standalone-metastore + metastore-server + ${project.version} + test + + + org.apache.hive + metastore-server ${project.version} tests test diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml index 8ed3171623..5655d64814 100644 --- a/itests/qtest-spark/pom.xml +++ b/itests/qtest-spark/pom.xml @@ -127,13 +127,19 @@ org.apache.hive - hive-standalone-metastore + metastore-common ${project.version} test org.apache.hive - hive-standalone-metastore + metastore-server + ${project.version} + test + + + org.apache.hive + metastore-server ${project.version} tests test diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index a1400fdea0..7743d8a796 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -58,13 +58,19 @@ org.apache.hive - hive-standalone-metastore + metastore-common ${project.version} test org.apache.hive - hive-standalone-metastore + metastore-server + ${project.version} + test + + + org.apache.hive + metastore-server ${project.version} tests test diff --git a/itests/util/pom.xml b/itests/util/pom.xml index 9334f90d28..6a7a9b64d9 100644 --- a/itests/util/pom.xml +++ b/itests/util/pom.xml @@ -111,9 +111,15 @@ ${project.version} tests - + + org.apache.hive + metastore-common + ${project.version} + test + + org.apache.hive - hive-standalone-metastore + metastore-server ${project.version} test-jar diff --git a/llap-server/pom.xml b/llap-server/pom.xml index 978d79735e..4175ad699d 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -104,6 +104,11 @@ com.tdunning json + + org.apache.hive + metastore-common + ${project.version} + org.apache.hadoop hadoop-common @@ -231,6 +236,11 @@ jetty-util ${jetty.version} + + org.apache.hive + metastore-common + ${project.version} + @@ -242,7 +252,7 @@ org.apache.hive - hive-standalone-metastore + metastore-server ${project.version} test-jar test diff --git a/metastore/pom.xml b/metastore/pom.xml index dc1b4e830e..8fd6f43502 100644 --- a/metastore/pom.xml +++ b/metastore/pom.xml @@ -46,8 +46,9 @@ org.apache.hive - hive-standalone-metastore - ${project.version} + metastore-common + 4.0.0-SNAPSHOT + compile javolution @@ -95,6 +96,16 @@ commons-lang ${commons-lang.version} + + org.apache.hive + metastore-common + ${project.version} + + + org.apache.hive + metastore-server + 4.0.0-SNAPSHOT + org.apache.derby diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/SerDeStorageSchemaReader.java b/metastore/src/java/org/apache/hadoop/hive/metastore/SerDeStorageSchemaReader.java index 59bcd5ca34..956e876bb6 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/SerDeStorageSchemaReader.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/SerDeStorageSchemaReader.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hive.metastore; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.serde2.Deserializer; import org.apache.hadoop.hive.metastore.api.EnvironmentContext; import org.apache.hadoop.hive.metastore.api.FieldSchema; @@ -38,7 +39,7 @@ if (org.apache.commons.lang.StringUtils.isNotBlank(addedJars)) { //for thread safe orgHiveLoader = conf.getClassLoader(); - ClassLoader loader = org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.addToClassPath( + ClassLoader loader = MetaStoreUtils.addToClassPath( orgHiveLoader, org.apache.commons.lang.StringUtils.split(addedJars, ",")); conf.setClassLoader(loader); } diff --git a/packaging/src/main/assembly/bin.xml b/packaging/src/main/assembly/bin.xml index a9557cfb60..767752461f 100644 --- a/packaging/src/main/assembly/bin.xml +++ b/packaging/src/main/assembly/bin.xml @@ -221,7 +221,7 @@ - ${project.parent.basedir}/standalone-metastore/src/main/sql + ${project.parent.basedir}/standalone-metastore/metastore-server/src/main/sql **/* diff --git a/packaging/src/main/assembly/src.xml b/packaging/src/main/assembly/src.xml index c9aed3b3e6..09315536d9 100644 --- a/packaging/src/main/assembly/src.xml +++ b/packaging/src/main/assembly/src.xml @@ -96,7 +96,8 @@ shims/**/* spark-client/**/* storage-api/**/* - standalone-metastore/**/* + standalone-metastore/metastore-server/**/* + standalone-metastore/metastore-common/**/* streaming/**/* testutils/**/* upgrade-acid/**/* diff --git a/ql/pom.xml b/ql/pom.xml index 0c181e515c..f67c4ff7a0 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -448,6 +448,11 @@ opencsv ${opencsv.version} + + org.apache.hive + metastore-common + ${project.version} + org.apache.hive @@ -458,7 +463,7 @@ org.apache.hive - hive-standalone-metastore + metastore-server ${project.version} test-jar test @@ -915,7 +920,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:metastore-client org.apache.hive:hive-service-rpc com.esotericsoftware:kryo-shaded com.esotericsoftware:minlog diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java index 5576d11f8d..bb5b2cd37e 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java @@ -100,7 +100,7 @@ static public PartSpecInfo create(Table tbl, Map partSpec) public Path createPath(Table tbl) throws HiveException { String prefixSubdir; try { - prefixSubdir = Warehouse.makePartName(fields, values); + prefixSubdir = MetaStoreUtils.makePartName(fields, values); } catch (MetaException e) { throw new HiveException("Unable to get partitions directories prefix", e); } @@ -115,7 +115,7 @@ public Path createPath(Table tbl) throws HiveException { */ public String getName() throws HiveException { try { - return Warehouse.makePartName(fields, values); + return MetaStoreUtils.makePartName(fields, values); } catch (MetaException e) { throw new HiveException("Unable to create partial name", e); } @@ -241,7 +241,7 @@ public static String getPartialName(Partition p, int level) throws HiveException values.add(s); } try { - return Warehouse.makePartName(fields, values); + return MetaStoreUtils.makePartName(fields, values); } catch (MetaException e) { throw new HiveException("Wasn't able to generate name" + " for partial specification"); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java index b7babd623d..aee542a414 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java @@ -1606,7 +1606,7 @@ boolean partitionInCustomLocation(Table tbl, Partition p) throws HiveException { String subdir = null; try { - subdir = Warehouse.makePartName(tbl.getPartCols(), p.getValues()); + subdir = MetaStoreUtils.makePartName(tbl.getPartCols(), p.getValues()); } catch (MetaException e) { throw new HiveException("Unable to get partition's directory", e); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/bootstrap/events/filesystem/FSTableEvent.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/bootstrap/events/filesystem/FSTableEvent.java index d203ae4aa9..ec98e75baf 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/bootstrap/events/filesystem/FSTableEvent.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/bootstrap/events/filesystem/FSTableEvent.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.Partition; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.exec.repl.bootstrap.events.TableEvent; import org.apache.hadoop.hive.ql.metadata.Table; import org.apache.hadoop.hive.ql.parse.EximUtil; @@ -95,7 +96,7 @@ public ImportTableDesc tableDesc(String dbName) throws SemanticException { List partitions = new ArrayList<>(); try { for (Partition partition : metadata.getPartitions()) { - String partName = Warehouse.makePartName(tblDesc.getPartCols(), partition.getValues()); + String partName = MetaStoreUtils.makePartName(tblDesc.getPartCols(), partition.getValues()); partitions.add(partName); } } catch (MetaException e) { @@ -121,7 +122,7 @@ private AddPartitionDesc partitionDesc(Path fromPath, partDesc.setBucketCols(partition.getSd().getBucketCols()); partDesc.setSortCols(partition.getSd().getSortCols()); partDesc.setLocation(new Path(fromPath, - Warehouse.makePartName(tblDesc.getPartCols(), partition.getValues())).toString()); + MetaStoreUtils.makePartName(tblDesc.getPartCols(), partition.getValues())).toString()); partsDesc.setReplicationSpec(replicationSpec()); return partsDesc; } catch (Exception e) { diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java index 78980fad93..5f935c42e0 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java @@ -38,7 +38,7 @@ Licensed to the Apache Software Foundation (ASF) under one import org.apache.hadoop.hive.metastore.api.TxnAbortedException; import org.apache.hadoop.hive.metastore.api.TxnToWriteId; import org.apache.hadoop.hive.metastore.api.CommitTxnRequest; -import org.apache.hadoop.hive.metastore.txn.TxnUtils; +import org.apache.hadoop.hive.metastore.txn.TxnCommonUtils; import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.Context; import org.apache.hadoop.hive.ql.ErrorMsg; @@ -869,7 +869,7 @@ public ValidTxnWriteIdList getValidWriteIds(List tableList, assert isTxnOpen(); assert validTxnList != null && !validTxnList.isEmpty(); try { - return TxnUtils.createValidTxnWriteIdList( + return TxnCommonUtils.createValidTxnWriteIdList( txnId, getMS().getValidWriteIds(tableList, validTxnList)); } catch (TException e) { throw new LockException(ErrorMsg.METASTORE_COMMUNICATION_FAILED.getMsg(), e); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java index c2ffe024da..84b94c4f2a 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java @@ -2472,7 +2472,7 @@ public Partition createPartition(Table tbl, Map partSpec) throws List partsToAlter = new ArrayList<>(); List part_names = new ArrayList<>(); for (org.apache.hadoop.hive.metastore.api.Partition p: in){ - part_names.add(Warehouse.makePartName(tbl.getPartitionKeys(), p.getValues())); + part_names.add(MetaStoreUtils.makePartName(tbl.getPartitionKeys(), p.getValues())); try { org.apache.hadoop.hive.metastore.api.Partition ptn = getMSC().getPartition(addPartitionDesc.getDbName(), addPartitionDesc.getTableName(), p.getValues()); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java index 136709c6dc..be36c44727 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java @@ -170,7 +170,7 @@ protected void initialize(Table table, // set default if location is not set and this is a physical // table partition (not a view partition) if (table.getDataLocation() != null) { - Path partPath = new Path(table.getDataLocation(), Warehouse.makePartName(table.getPartCols(), tPartition.getValues())); + Path partPath = new Path(table.getDataLocation(), MetaStoreUtils.makePartName(table.getPartCols(), tPartition.getValues())); tPartition.getSd().setLocation(partPath.toString()); } } @@ -197,7 +197,7 @@ protected void initialize(Table table, public String getName() { try { - return Warehouse.makePartName(table.getPartCols(), tPartition.getValues()); + return MetaStoreUtils.makePartName(table.getPartCols(), tPartition.getValues()); } catch (MetaException e) { throw new RuntimeException(e); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/SessionHiveMetaStoreClient.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/SessionHiveMetaStoreClient.java index 58c8960c09..4c016be6b1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/SessionHiveMetaStoreClient.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/SessionHiveMetaStoreClient.java @@ -859,13 +859,13 @@ private PartitionTree(org.apache.hadoop.hive.metastore.api.Table t) { this.tTable = t; } private void addPartition(Partition p) throws AlreadyExistsException, MetaException { - String partName = Warehouse.makePartName(tTable.getPartitionKeys(), p.getValues()); + String partName = MetaStoreUtils.makePartName(tTable.getPartitionKeys(), p.getValues()); if(parts.putIfAbsent(partName, p) != null) { throw new AlreadyExistsException("Partition " + partName + " already exists"); } } /** - * @param partName - "p=1/q=2" full partition name {@link Warehouse#makePartName(List, List)} + * @param partName - "p=1/q=2" full partition name {@link MetaStoreUtils#makePartName(List, List)} * @return null if doesn't exist */ private Partition getPartition(String partName) { @@ -968,7 +968,7 @@ private Partition getPartition(String partName) { List matchedParts = new ArrayList<>(); for(int i = 0; i < (maxParts <= 0 ? parts.size() : maxParts); i++) { matchedParts.add( - Warehouse.makePartName(tt.tTable.getPartitionKeys(), parts.get(i).getValues())); + MetaStoreUtils.makePartName(tt.tTable.getPartitionKeys(), parts.get(i).getValues())); } return matchedParts; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java index eb594f825d..e9d29d2780 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java @@ -33,6 +33,7 @@ import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.Order; import org.apache.hadoop.hive.metastore.api.Partition; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.ErrorMsg; import org.apache.hadoop.hive.ql.QueryState; import org.apache.hadoop.hive.ql.exec.ReplCopyTask; @@ -375,7 +376,7 @@ private static AddPartitionDesc getBaseAddPartitionDescFromPartition( partDesc.setBucketCols(partition.getSd().getBucketCols()); partDesc.setSortCols(partition.getSd().getSortCols()); partDesc.setLocation(new Path(fromPath, - Warehouse.makePartName(tblDesc.getPartCols(), partition.getValues())).toString()); + MetaStoreUtils.makePartName(tblDesc.getPartCols(), partition.getValues())).toString()); return partsDesc; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/stats/ColStatsProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/stats/ColStatsProcessor.java index d4cfd0ad62..7a00326cc6 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/stats/ColStatsProcessor.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/stats/ColStatsProcessor.java @@ -32,6 +32,7 @@ import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.SetPartitionsStatsRequest; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.CompilationOpContext; import org.apache.hadoop.hive.ql.exec.FetchOperator; import org.apache.hadoop.hive.ql.metadata.Hive; @@ -135,7 +136,7 @@ public int process(Hive db, Table tbl) throws Exception { partVals.add(partVal == null ? // could be null for default partition this.conf.getVar(ConfVars.DEFAULTPARTITIONNAME) : partVal.toString()); } - partName = Warehouse.makePartName(partColSchema, partVals); + partName = MetaStoreUtils.makePartName(partColSchema, partVals); } ColumnStatisticsDesc statsDesc = buildColumnStatsDesc(tbl, partName, isTblLevel); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/stats/StatsUpdaterThread.java b/ql/src/java/org/apache/hadoop/hive/ql/stats/StatsUpdaterThread.java index ddca70497a..59201604a5 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/stats/StatsUpdaterThread.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/stats/StatsUpdaterThread.java @@ -51,8 +51,10 @@ import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.StatsUpdateMode; +import org.apache.hadoop.hive.metastore.txn.TxnCommonUtils; import org.apache.hadoop.hive.metastore.txn.TxnStore; import org.apache.hadoop.hive.metastore.txn.TxnUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.DriverUtils; import org.apache.hadoop.hive.ql.io.AcidUtils; import org.apache.hadoop.hive.ql.session.SessionState; @@ -303,7 +305,7 @@ private void stopWorkers() { } int currentIxInBatch = nextIxInBatch++; Partition part = currentBatch.get(currentIxInBatch); - String partName = Warehouse.makePartName(t.getPartitionKeys(), part.getValues()); + String partName = MetaStoreUtils.makePartName(t.getPartitionKeys(), part.getValues()); LOG.debug("Processing partition ({} in batch), {}", currentIxInBatch, partName); // Skip the partitions in progress, and the ones for which stats update is disabled. @@ -387,7 +389,7 @@ private void addPreviousPartitions(Table t, List allPartNames, } // Current match may be out of order w.r.t. the global name list, so add specific parts. for (int i = 0; i < currentIxInBatch; ++i) { - String name = Warehouse.makePartName(t.getPartitionKeys(), currentBatch.get(i).getValues()); + String name = MetaStoreUtils.makePartName(t.getPartitionKeys(), currentBatch.get(i).getValues()); LOG.trace("Adding previous {}, {}", name, cols); partsToAnalyze.put(name, cols); } @@ -460,7 +462,7 @@ private ValidReaderWriteIdList getWriteIds( TableName fullTableName) throws NoSuchTxnException, MetaException { GetValidWriteIdsRequest req = new GetValidWriteIdsRequest(); req.setFullTableNames(Lists.newArrayList(fullTableName.toString())); - return TxnUtils.createValidReaderWriteIdList( + return TxnCommonUtils.createValidReaderWriteIdList( txnHandler.getValidWriteIds(req).getTblValidWriteIds().get(0)); } diff --git a/service/pom.xml b/service/pom.xml index ebe78639f1..c7ae5dd27e 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -121,7 +121,12 @@ javax.servlet javax.servlet-api - + + org.apache.hive + metastore-common + ${project.version} + + commons-lang commons-lang @@ -147,7 +152,7 @@ curator-recipes ${curator.version} - + org.apache.hadoop hadoop-common ${hadoop.version} @@ -228,9 +233,9 @@ test test-jar - + org.apache.hive - hive-standalone-metastore + metastore-server ${project.version} test-jar test diff --git a/standalone-metastore/DEV-README b/standalone-metastore/DEV-README index 7b65e925c5..0424187c50 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-server/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-client/pom.xml b/standalone-metastore/metastore-client/pom.xml new file mode 100644 index 0000000000..465992df9e --- /dev/null +++ b/standalone-metastore/metastore-client/pom.xml @@ -0,0 +1,39 @@ + + + + hive-standalone-metastore + org.apache.hive + 4.0.0-SNAPSHOT + + 4.0.0 + + metastore-client + + + + org.apache.hive + metastore-common + 4.0.0-SNAPSHOT + compile + + + org.apache.hadoop + hadoop-common + true + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + + + + + \ No newline at end of file diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/standalone-metastore/metastore-client/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java similarity index 96% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java rename to standalone-metastore/metastore-client/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java index bfd7141a8b..96b11f3247 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java +++ b/standalone-metastore/metastore-client/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java @@ -18,8 +18,12 @@ package org.apache.hadoop.hive.metastore; -import static org.apache.hadoop.hive.metastore.Warehouse.DEFAULT_DATABASE_NAME; +import static org.apache.hadoop.hive.metastore.txn.TxnCommonUtils.createValidReadTxnList; +import static org.apache.hadoop.hive.metastore.txn.TxnCommonUtils.createValidReaderWriteIdList; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.DEFAULT_DATABASE_NAME; import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getMetaStoreSaslProperties; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.logAndThrowMetaException; import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.prependCatalogToDbName; import java.io.IOException; @@ -62,9 +66,7 @@ import org.apache.hadoop.hive.metastore.hooks.URIResolverHook; import org.apache.hadoop.hive.metastore.partition.spec.PartitionSpecProxy; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; -import org.apache.hadoop.hive.metastore.txn.TxnUtils; import org.apache.hadoop.hive.metastore.utils.JavaUtils; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.metastore.utils.ObjectPair; import org.apache.hadoop.hive.metastore.utils.SecurityUtils; import org.apache.hadoop.security.UserGroupInformation; @@ -133,6 +135,27 @@ static final protected Logger LOG = LoggerFactory.getLogger(HiveMetaStoreClient.class); + // Name of the HiveMetaStore class. It is used to initialize embedded metastore + private static final String HIVE_METASTORE_CLASS = + "org.apache.hadoop.hive.metastore.HiveMetaStore"; + + // Method used to create Hive Metastore client. It is called as + // HiveMetaStore.newRetryingHMSHandler("hive client", this.conf, true); + private static final String HIVE_METASTORE_CREATE_HANDLER_METHOD = "newRetryingHMSHandler"; + + // Name of MaterializationsInvalidationCache class + private final String MATERIALIZATIONS_INVALIDATION_CACHE_CLASS = + "org.apache.hadoop.hive.metastore.MaterializationsInvalidationCache"; + + // Name of the method to get singleton instance of MaterializationsInvalidationCache + private static final String MATERIALIZATION_GET_METHOD = "get"; + + // Name of the method to initializa MaterializationsInvalidationCache instance + private static final String MATERIALIZATION_INIT_METHOD = "init"; + + // Name of IHMSHandler class + private static final String IHMSHANDLER_CLASS = "org.apache.hadoop.hive.metastore.IHMSHandler"; + public HiveMetaStoreClient(Configuration conf) throws MetaException { this(conf, null, true); } @@ -164,11 +187,60 @@ public HiveMetaStoreClient(Configuration conf, HiveMetaHookLoader hookLoader, Bo throw new MetaException("Embedded metastore is not allowed here. Please configure " + ConfVars.THRIFT_URIS.toString() + "; it is currently set to [" + msUri + "]"); } + + // // instantiate the metastore server handler directly instead of connecting // through the network - client = HiveMetaStore.newRetryingHMSHandler("hive client", this.conf, true); - // Initialize materializations invalidation cache (only for local metastore) - MaterializationsInvalidationCache.get().init(conf, (IHMSHandler) client); + // + // The code below simulates the following code + // + // client = HiveMetaStore.newRetryingHMSHandler("hive client", this.conf, true); + // + // using reflection API. This is done to avoid dependency of MetastoreClient on Hive Metastore. + // Note that newRetryingHMSHandler is static method, so we pass null as the object reference. + // + try { + Class clazz = Class.forName(HIVE_METASTORE_CLASS); + //noinspection JavaReflectionMemberAccess + Method method = clazz.getDeclaredMethod(HIVE_METASTORE_CREATE_HANDLER_METHOD, + String.class, Configuration.class, Boolean.TYPE); + method.setAccessible(true); + + client = + (ThriftHiveMetastore.Iface)method.invoke(null, "hive client", this.conf, true); + + } catch (ClassNotFoundException + | NoSuchMethodException + | InvocationTargetException + | IllegalAccessException e) { + logAndThrowMetaException(e); + } + + // The code below simulates the following code + // + // MaterializationsInvalidationCache.get().init(conf, (IHMSHandler) client); + // + // using reflection API. This is done to avoid package dependency of HiveMetastoreCLient + // on MaterializationInvalidation cache + try { + Class cacheClazz = Class.forName(MATERIALIZATIONS_INVALIDATION_CACHE_CLASS); + Class IhmsHandlerClazz = Class.forName(IHMSHANDLER_CLASS); + Method getMethod = cacheClazz.getDeclaredMethod(MATERIALIZATION_GET_METHOD); + getMethod.setAccessible(true); + Method initMethod = cacheClazz.getDeclaredMethod(MATERIALIZATION_INIT_METHOD, + Configuration.class, IhmsHandlerClazz); + initMethod.setAccessible(true); + // cache = MaterializationsInvalidationCache.get() + Object materializationInvalidationCache = getMethod.invoke(null); + // cache.init(conf, client) + initMethod.invoke(materializationInvalidationCache, this.conf, client); + } catch (ClassNotFoundException + | NoSuchMethodException + | InvocationTargetException + | IllegalAccessException e) { + logAndThrowMetaException(e); + } + isConnected = true; snapshotActiveConf(); return; @@ -266,7 +338,7 @@ private void resolveUris() throws MetaException { } catch (IllegalArgumentException e) { throw (e); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } } @@ -487,14 +559,14 @@ private void open() throws MetaException { // authenticate using delegation tokens via the "DIGEST" mechanism transport = authBridge.createClientTransport(null, store.getHost(), "DIGEST", tokenStrForm, transport, - MetaStoreUtils.getMetaStoreSaslProperties(conf, useSSL)); + getMetaStoreSaslProperties(conf, useSSL)); } else { LOG.info("HMSC::open(): Could not find delegation token. Creating KERBEROS-based thrift connection."); String principalConfig = MetastoreConf.getVar(conf, ConfVars.KERBEROS_PRINCIPAL); transport = authBridge.createClientTransport( principalConfig, store.getHost(), "KERBEROS", null, - transport, MetaStoreUtils.getMetaStoreSaslProperties(conf, useSSL)); + transport, getMetaStoreSaslProperties(conf, useSSL)); } } catch (IOException ioe) { LOG.error("Couldn't create client transport", ioe); @@ -1661,7 +1733,7 @@ public Type getType(String name) throws NoSuchObjectException, MetaException, TE try { return getTables(getDefaultCatalog(conf), dbname, tablePattern); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -1678,7 +1750,7 @@ public Type getType(String name) throws NoSuchObjectException, MetaException, TE try { return getTables(getDefaultCatalog(conf), dbname, tablePattern, tableType); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -1703,7 +1775,7 @@ public Type getType(String name) throws NoSuchObjectException, MetaException, TE return filterHook.filterTableNames(catName, dbname, client.get_materialized_views_for_rewriting(prependCatalogToDbName(catName, dbname, conf))); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -1714,7 +1786,7 @@ public Type getType(String name) throws NoSuchObjectException, MetaException, TE try { return getTableMeta(getDefaultCatalog(conf), dbPatterns, tablePatterns, tableTypes); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -1731,7 +1803,7 @@ public Type getType(String name) throws NoSuchObjectException, MetaException, TE try { return getAllTables(getDefaultCatalog(conf), dbname); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -2424,19 +2496,19 @@ public boolean removeMasterKey(Integer keySeq) throws TException { @Override public ValidTxnList getValidTxns() throws TException { - return TxnUtils.createValidReadTxnList(client.get_open_txns(), 0); + return createValidReadTxnList(client.get_open_txns(), 0); } @Override public ValidTxnList getValidTxns(long currentTxn) throws TException { - return TxnUtils.createValidReadTxnList(client.get_open_txns(), currentTxn); + return createValidReadTxnList(client.get_open_txns(), currentTxn); } @Override public ValidWriteIdList getValidWriteIds(String fullTableName) throws TException { GetValidWriteIdsRequest rqst = new GetValidWriteIdsRequest(Collections.singletonList(fullTableName), null); GetValidWriteIdsResponse validWriteIds = client.get_valid_write_ids(rqst); - return TxnUtils.createValidReaderWriteIdList(validWriteIds.getTblValidWriteIds().get(0)); + return createValidReaderWriteIdList(validWriteIds.getTblValidWriteIds().get(0)); } @Override @@ -3323,4 +3395,5 @@ public void addRuntimeStat(RuntimeStat stat) throws TException { req.setMaxCreateTime(maxCreateTime); return client.get_runtime_stats(req); } + } diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java b/standalone-metastore/metastore-client/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-client/src/main/java/org/apache/hadoop/hive/metastore/RetryingMetaStoreClient.java diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml new file mode 100644 index 0000000000..063780641c --- /dev/null +++ b/standalone-metastore/metastore-common/pom.xml @@ -0,0 +1,455 @@ + + + + hive-standalone-metastore + org.apache.hive + 4.0.0-SNAPSHOT + + 4.0.0 + + metastore-common + + + + org.apache.thrift + libfb303 + + + org.apache.thrift + libthrift + + + com.google.guava + guava + + + org.apache.hadoop + hadoop-common + 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.hadoop + hadoop-distcp + provided + + + + org.apache.hive + hive-storage-api + ${storage-api.version} + + + + junit + junit + 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 + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + setup-test-dirs + process-test-resources + + run + + + + generate-version-annotation + generate-sources + + + + + + + + + + + + run + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${checkstyle.conf.dir}/checkstyle.xml + config_loc=${checkstyle.conf.dir} + true + + + + + 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} + ${test.tmp.dir}/derby.log + true + ${test.tmp.dir} + ${test.tmp.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.antlr + antlr3-maven-plugin + ${antlr.version} + + + + antlr + + + + + ${project.build.directory}/generated-sources + ${basedir}/src/main/java + + + + + + + diff --git a/standalone-metastore/src/gen/thrift/gen-py/__init__.py b/standalone-metastore/metastore-common/src/__init__.py similarity index 100% rename from standalone-metastore/src/gen/thrift/gen-py/__init__.py rename to standalone-metastore/metastore-common/src/__init__.py 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/metastore-common/src/gen/thrift/gen-py/__init__.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/__init__.py new file mode 100644 index 0000000000..e69de29bb2 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/metastore/ColumnType.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java similarity index 99% 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 index d5dea4dc3c..f08f249b17 100644 --- 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 @@ -246,8 +246,6 @@ public static boolean areColTypesCompatible(String from, String to) { public static final String SERIALIZATION_DDL = "serialization.ddl"; - public static final char COLUMN_COMMENTS_DELIMITER = '\0'; - private static HashMap typeToThriftTypeMap; static { typeToThriftTypeMap = new HashMap<>(); 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/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 97% 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 index ad596d11d7..c9ef5a3037 100644 --- 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 @@ -31,7 +31,7 @@ /** * HiveMetaHook defines notification methods which are invoked as part * of transactions against the metastore, allowing external catalogs - * such as HBase to be kept in sync with Hive's metastore. + * such as HBase to be kept in sync with Hive's metastore.NumDistinctValueEstimatorFactory * *

* 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/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/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/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/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/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/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/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 98% 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 index 19da432bb8..02e7e84bff 100644 --- 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 @@ -19,18 +19,6 @@ import com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hive.metastore.DefaultStorageSchemaReader; -import org.apache.hadoop.hive.metastore.HiveAlterHandler; -import org.apache.hadoop.hive.metastore.MaterializationsCacheCleanerTask; -import org.apache.hadoop.hive.metastore.MaterializationsRebuildLockCleanerTask; -import org.apache.hadoop.hive.metastore.MetastoreTaskThread; -import org.apache.hadoop.hive.metastore.RuntimeStatsCleanerTask; -import org.apache.hadoop.hive.metastore.events.EventCleanerTask; -import org.apache.hadoop.hive.metastore.security.MetastoreDelegationTokenManager; -import org.apache.hadoop.hive.metastore.txn.AcidCompactionHistoryService; -import org.apache.hadoop.hive.metastore.txn.AcidHouseKeeperService; -import org.apache.hadoop.hive.metastore.txn.AcidOpenTxnsCounterService; -import org.apache.hadoop.hive.metastore.txn.AcidWriteSetService; import org.apache.hadoop.hive.metastore.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -261,7 +249,7 @@ public static ConfVars getMetaConf(String name) { "hive.metastore.aggregate.stats.cache.ttl", 600, TimeUnit.SECONDS, "Number of seconds for a cached node to be active in the cache before they become stale."), ALTER_HANDLER("metastore.alter.handler", "hive.metastore.alter.impl", - HiveAlterHandler.class.getName(), + "org.apache.hadoop.hive.metastore.HiveAlterHandler", "Alter handler. For now defaults to the Hive one. Really need a better default option"), ASYNC_LOG_ENABLED("metastore.async.log.enabled", "hive.async.log.enabled", true, "Whether to enable Log4j2's asynchronous logging. Asynchronous logging can give\n" + @@ -437,7 +425,8 @@ public static ConfVars getMetaConf(String name) { DELEGATION_TOKEN_RENEW_INTERVAL("metastore.cluster.delegation.token.renew-interval", "hive.cluster.delegation.token.renew-interval", 1, TimeUnit.DAYS, ""), DELEGATION_TOKEN_STORE_CLS("metastore.cluster.delegation.token.store.class", - "hive.cluster.delegation.token.store.class", MetastoreDelegationTokenManager.class.getName(), + "hive.cluster.delegation.token.store.class", + "org.apache.hadoop.hive.metastore.security.MetastoreDelegationTokenManager", "Class to store delegation tokens"), DETACH_ALL_ON_COMMIT("javax.jdo.option.DetachAllOnCommit", "javax.jdo.option.DetachAllOnCommit", true, @@ -746,7 +735,7 @@ public static ConfVars getMetaConf(String name) { "hive.metastore.stats.auto.analyze.worker.count", 1, "Number of parallel analyze commands to run for background stats update."), STORAGE_SCHEMA_READER_IMPL("metastore.storage.schema.reader.impl", "metastore.storage.schema.reader.impl", - DefaultStorageSchemaReader.class.getName(), + "org.apache.hadoop.hive.metastore.DefaultStorageSchemaReader", "The class to use to read schemas from storage. It must implement " + "org.apache.hadoop.hive.metastore.StorageSchemaReader"), STORE_MANAGER_TYPE("datanucleus.storeManagerType", "datanucleus.storeManagerType", "rdbms", "metadata store type"), @@ -760,21 +749,21 @@ public static ConfVars getMetaConf(String name) { + "The only supported special character right now is '/'. This flag applies only to quoted table names.\n" + "The default value is true."), TASK_THREADS_ALWAYS("metastore.task.threads.always", "metastore.task.threads.always", - EventCleanerTask.class.getName() + "," + RuntimeStatsCleanerTask.class.getName() + "," + + "org.apache.hadoop.hive.metastore.events.EventCleanerTask" + "," + "org.apache.hadoop.hive.metastore.RuntimeStatsCleanerTask" + "," + "org.apache.hadoop.hive.metastore.repl.DumpDirCleanerTask" + "," + - MaterializationsCacheCleanerTask.class.getName() + "," + - MaterializationsRebuildLockCleanerTask.class.getName() + "," + RuntimeStatsCleanerTask.class.getName(), + "org.apache.hadoop.hive.metastore.MaterializationsCacheCleanerTask" + "," + + "org.apache.hadoop.hive.metastore.MaterializationsRebuildLockCleanerTask" + "," + "org.apache.hadoop.hive.metastore.RuntimeStatsCleanerTask", "Comma separated list of tasks that will be started in separate threads. These will " + "always be started, regardless of whether the metastore is running in embedded mode " + - "or in server mode. They must implement " + MetastoreTaskThread.class.getName()), + "or in server mode. They must implement " + "org.apache.hadoop.hive.metastore.MetastoreTaskThread"), TASK_THREADS_REMOTE_ONLY("metastore.task.threads.remote", "metastore.task.threads.remote", - AcidHouseKeeperService.class.getName() + "," + - AcidOpenTxnsCounterService.class.getName() + "," + - AcidCompactionHistoryService.class.getName() + "," + - AcidWriteSetService.class.getName(), + "org.apache.hadoop.hive.metastore.txn.AcidHouseKeeperService" + "," + + "org.apache.hadoop.hive.metastore.txn.AcidOpenTxnsCounterService" + "," + + "org.apache.hadoop.hive.metastore.txn.AcidCompactionHistoryService" + "," + + "org.apache.hadoop.hive.metastore.txn.AcidWriteSetService", "Command separated list of tasks that will be started in separate threads. These will be" + " started only when the metastore is running as a separate service. They must " + - "implement " + MetastoreTaskThread.class.getName()), + "implement " + "org.apache.hadoop.hive.metastore.MetastoreTaskThread"), TCP_KEEP_ALIVE("metastore.server.tcp.keepalive", "hive.metastore.server.tcp.keepalive", true, "Whether to enable TCP keepalive for the metastore server. Keepalive will prevent accumulation of half-open connections."), 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/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/partition/spec/CompositePartitionSpecProxy.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/partition/spec/CompositePartitionSpecProxy.java similarity index 98% 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 index 91d790aa64..2f203354a8 100644 --- 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 @@ -26,12 +26,11 @@ import java.util.List; import java.util.Map; -import static org.apache.hadoop.hive.metastore.Warehouse.DEFAULT_CATALOG_NAME; - /** * Implementation of PartitionSpecProxy that composes a list of PartitionSpecProxy. */ public class CompositePartitionSpecProxy extends PartitionSpecProxy { + private static final String DEFAULT_CATALOG_NAME = "hive"; private String catName; private String dbName; 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/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/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/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/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnCommonUtils.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnCommonUtils.java new file mode 100644 index 0000000000..ec294477ce --- /dev/null +++ b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnCommonUtils.java @@ -0,0 +1,127 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hive.metastore.txn; + +import org.apache.hadoop.hive.common.ValidReadTxnList; +import org.apache.hadoop.hive.common.ValidReaderWriteIdList; +import org.apache.hadoop.hive.common.ValidTxnList; +import org.apache.hadoop.hive.common.ValidTxnWriteIdList; +import org.apache.hadoop.hive.metastore.api.GetOpenTxnsResponse; +import org.apache.hadoop.hive.metastore.api.TableValidWriteIds; + +import java.util.BitSet; +import java.util.Collections; +import java.util.List; + + +public class TxnCommonUtils { + /** + * Transform a {@link org.apache.hadoop.hive.metastore.api.GetOpenTxnsResponse} to a + * {@link org.apache.hadoop.hive.common.ValidTxnList}. This assumes that the caller intends to + * read the files, and thus treats both open and aborted transactions as invalid. + * @param txns txn list from the metastore + * @param currentTxn Current transaction that the user has open. If this is greater than 0 it + * will be removed from the exceptions list so that the user sees his own + * transaction as valid. + * @return a valid txn list. + */ + public static ValidTxnList createValidReadTxnList(GetOpenTxnsResponse txns, long currentTxn) { + /* + * The highWaterMark should be min(currentTxn,txns.getTxn_high_water_mark()) assuming currentTxn>0 + * otherwise if currentTxn=7 and 8 commits before 7, then 7 will see result of 8 which + * doesn't make sense for Snapshot Isolation. Of course for Read Committed, the list should + * include the latest committed set. + */ + long highWaterMark = (currentTxn > 0) ? Math.min(currentTxn, txns.getTxn_high_water_mark()) + : txns.getTxn_high_water_mark(); + + // Open txns are already sorted in ascending order. This list may or may not include HWM + // but it is guaranteed that list won't have txn > HWM. But, if we overwrite the HWM with currentTxn + // then need to truncate the exceptions list accordingly. + List openTxns = txns.getOpen_txns(); + + // We care only about open/aborted txns below currentTxn and hence the size should be determined + // for the exceptions list. The currentTxn will be missing in openTxns list only in rare case like + // txn is aborted by AcidHouseKeeperService and compactor actually cleans up the aborted txns. + // So, for such cases, we get negative value for sizeToHwm with found position for currentTxn, and so, + // we just negate it to get the size. + int sizeToHwm = (currentTxn > 0) ? Collections.binarySearch(openTxns, currentTxn) : openTxns.size(); + sizeToHwm = (sizeToHwm < 0) ? (-sizeToHwm) : sizeToHwm; + long[] exceptions = new long[sizeToHwm]; + BitSet inAbortedBits = BitSet.valueOf(txns.getAbortedBits()); + BitSet outAbortedBits = new BitSet(); + long minOpenTxnId = Long.MAX_VALUE; + int i = 0; + for (long txn : openTxns) { + // For snapshot isolation, we don't care about txns greater than current txn and so stop here. + // Also, we need not include current txn to exceptions list. + if ((currentTxn > 0) && (txn >= currentTxn)) { + break; + } + if (inAbortedBits.get(i)) { + outAbortedBits.set(i); + } else if (minOpenTxnId == Long.MAX_VALUE) { + minOpenTxnId = txn; + } + exceptions[i++] = txn; + } + return new ValidReadTxnList(exceptions, outAbortedBits, highWaterMark, minOpenTxnId); + } + + /** + * Transform a {@link org.apache.hadoop.hive.metastore.api.TableValidWriteIds} to a + * {@link org.apache.hadoop.hive.common.ValidReaderWriteIdList}. This assumes that the caller intends to + * read the files, and thus treats both open and aborted write ids as invalid. + * @param tableWriteIds valid write ids for the given table from the metastore + * @return a valid write IDs list for the input table + */ + public static ValidReaderWriteIdList createValidReaderWriteIdList(TableValidWriteIds tableWriteIds) { + String fullTableName = tableWriteIds.getFullTableName(); + long highWater = tableWriteIds.getWriteIdHighWaterMark(); + List invalids = tableWriteIds.getInvalidWriteIds(); + BitSet abortedBits = BitSet.valueOf(tableWriteIds.getAbortedBits()); + long[] exceptions = new long[invalids.size()]; + int i = 0; + for (long writeId : invalids) { + exceptions[i++] = writeId; + } + if (tableWriteIds.isSetMinOpenWriteId()) { + return new ValidReaderWriteIdList(fullTableName, exceptions, abortedBits, highWater, + tableWriteIds.getMinOpenWriteId()); + } else { + return new ValidReaderWriteIdList(fullTableName, exceptions, abortedBits, highWater); + } + } + + /** + * Transform a {@link org.apache.hadoop.hive.metastore.api.GetValidWriteIdsResponse} to a + * {@link org.apache.hadoop.hive.common.ValidTxnWriteIdList}. This assumes that the caller intends to + * read the files, and thus treats both open and aborted transactions as invalid. + * @param currentTxnId current txn ID for which we get the valid write ids list + * @param list valid write ids list from the metastore + * @return a valid write IDs list for the whole transaction. + */ + public static ValidTxnWriteIdList createValidTxnWriteIdList(Long currentTxnId, + List validIds) { + ValidTxnWriteIdList validTxnWriteIdList = new ValidTxnWriteIdList(currentTxnId); + for (TableValidWriteIds tableWriteIds : validIds) { + validTxnWriteIdList.addTableValidWriteIdList(createValidReaderWriteIdList(tableWriteIds)); + } + return validTxnWriteIdList; + } +} 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/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/metastore-common/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 new file mode 100644 index 0000000000..87e88bb54d --- /dev/null +++ b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java @@ -0,0 +1,995 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hive.metastore.utils; + +import com.google.common.base.Joiner; +import org.apache.commons.lang.StringUtils; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.CommonConfigurationKeysPublic; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hive.common.StatsSetupConst; +import org.apache.hadoop.hive.metastore.ColumnType; +import org.apache.hadoop.hive.metastore.TableType; +import org.apache.hadoop.hive.metastore.api.FieldSchema; +import org.apache.hadoop.hive.metastore.api.MetaException; +import org.apache.hadoop.hive.metastore.api.Partition; +import org.apache.hadoop.hive.metastore.api.StorageDescriptor; +import org.apache.hadoop.hive.metastore.api.Table; +import org.apache.hadoop.hive.metastore.api.WMPoolSchedulingPolicy; +import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; +import org.apache.hadoop.hive.metastore.conf.MetastoreConf; +import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; +import org.apache.hadoop.security.SaslRpcServer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.Nullable; +import java.io.File; +import java.net.URL; +import java.net.URLClassLoader; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.TimeZone; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class MetaStoreUtils { + public static final String DEFAULT_CATALOG_NAME = "hive"; + public static final String DEFAULT_DATABASE_NAME = "default"; + + // The following two are public for any external users who wish to use them. + + /** + * This character is used to mark a database name as having a catalog name prepended. This + * marker should be placed first in the String to make it easy to determine that this has both + * a catalog and a database name. @ is chosen as it is not used in regular expressions. This + * is only intended for use when making old Thrift calls that do not support catalog names. + */ + public static final char CATALOG_DB_THRIFT_NAME_MARKER = '@'; + /** + * This String is used to seaprate the catalog name from the database name. This should only + * be used in Strings that are prepended with CATALOG_DB_THRIFT_NAME_MARKER. # is + * chosen because it is not used in regular expressions. this is only intended for use when + * making old Thrift calls that do not support catalog names. + */ + public static final String CATALOG_DB_SEPARATOR = "#"; + /** + * Mark a database as being empty (as distinct from null). + */ + public static final String DB_EMPTY_MARKER = "!"; + + public static final String EXTERNAL_TABLE_PURGE = "external.table.purge"; + + public static final char COLUMN_COMMENTS_DELIMITER = '\0'; + /** + * Position in the array returned by {@link #parseDbName} that has the catalog name. + */ + public static final int CAT_NAME = 0; + /** + * Position in the array returned by {@link #parseDbName} that has the database name. + */ + public static final int DB_NAME = 1; + // Indicates a type was derived from the deserializer rather than Hive's metadata. + public static final String TYPE_FROM_DESERIALIZER = ""; + /** A fixed date format to be used for hive partition column values. */ + public static final ThreadLocal PARTITION_DATE_FORMAT = + new ThreadLocal() { + @Override + protected DateFormat initialValue() { + DateFormat val = new SimpleDateFormat("yyyy-MM-dd"); + val.setLenient(false); // Without this, 2020-20-20 becomes 2021-08-20. + val.setTimeZone(TimeZone.getTimeZone("UTC")); + return val; + } + }; + + private static final Logger LOG = LoggerFactory.getLogger(MetaStoreUtils.class); + private final static String[] nullCatalogAndDatabase = {null, null}; + // Right now we only support one special character '/'. + // More special characters can be added accordingly in the future. + // NOTE: + // If the following array is updated, please also be sure to update the + // configuration parameter documentation + // HIVE_SUPPORT_SPECICAL_CHARACTERS_IN_TABLE_NAMES in HiveConf as well. + private static final char[] specialCharactersInTableNames = new char[] { '/' }; + private static String ARCHIVING_LEVEL = "archiving_level"; + + // Get default catalog name - either from configuration or hard-coded value. + public static String getDefaultCatalog(Configuration conf) { + if (conf == null) { + LOG.warn("Configuration is null, so going with default catalog."); + return DEFAULT_CATALOG_NAME; + } + String catName = MetastoreConf.getVar(conf, MetastoreConf.ConfVars.CATALOG_DEFAULT); + if (catName == null || "".equals(catName)) catName = DEFAULT_CATALOG_NAME; + return catName; + } + + /** + * Given a catalog name and database name cram them together into one string. This method can + * be used if you do not know the catalog name, in which case the default catalog will be + * retrieved from the conf object. The resulting string can be parsed apart again via + *

parseDbName(String, Configuration).
+   * @param catalogName catalog name, can be null if no known.
+   * @param dbName database name, can be null or empty.
+   * @param conf configuration object, used to determine default catalog if catalogName is null
+   * @return one string that contains both.
+   */
+  public static String prependCatalogToDbName(@Nullable String catalogName, @Nullable String dbName,
+                                              Configuration conf) {
+    if (catalogName == null) catalogName = getDefaultCatalog(conf);
+    StringBuilder buf = new StringBuilder()
+        .append(CATALOG_DB_THRIFT_NAME_MARKER)
+        .append(catalogName)
+        .append(CATALOG_DB_SEPARATOR);
+    if (dbName != null) {
+      if (dbName.isEmpty()) buf.append(DB_EMPTY_MARKER);
+      else buf.append(dbName);
+    }
+    return buf.toString();
+  }
+
+  /**
+   * Prepend the default 'hive' catalog onto the database name.
+   * @param dbName database name
+   * @param conf configuration object, used to determine default catalog
+   * @return one string with the 'hive' catalog name prepended.
+   */
+  public static String prependCatalogToDbName(String dbName, Configuration conf) {
+    return prependCatalogToDbName(null, dbName, conf);
+  }
+
+  /**
+   * Catches exceptions that can't be handled and bundles them to MetaException
+   *
+   * @param e exception to wrap.
+   * @throws MetaException wrapper for the exception
+   */
+  public static void logAndThrowMetaException(Exception e) throws MetaException {
+    String exInfo = "Got exception: " + e.getClass().getName() + " "
+        + e.getMessage();
+    LOG.error(exInfo, e);
+    LOG.error("Converting exception to MetaException");
+    throw new MetaException(exInfo);
+  }
+
+  /**
+   * Read and return the meta store Sasl configuration. Currently it uses the default
+   * Hadoop SASL configuration and can be configured using "hadoop.rpc.protection"
+   * HADOOP-10211, made a backward incompatible change due to which this call doesn't
+   * work with Hadoop 2.4.0 and later.
+   * @param conf
+   * @return The SASL configuration
+   */
+  public static Map getMetaStoreSaslProperties(Configuration conf, boolean useSSL) {
+    // As of now Hive Meta Store uses the same configuration as Hadoop SASL configuration
+
+    // If SSL is enabled, override the given value of "hadoop.rpc.protection" and set it to "authentication"
+    // This disables any encryption provided by SASL, since SSL already provides it
+    String hadoopRpcProtectionVal = conf.get(CommonConfigurationKeysPublic.HADOOP_RPC_PROTECTION);
+    String hadoopRpcProtectionAuth = SaslRpcServer.QualityOfProtection.AUTHENTICATION.toString();
+
+    if (useSSL && hadoopRpcProtectionVal != null && !hadoopRpcProtectionVal.equals(hadoopRpcProtectionAuth)) {
+      LOG.warn("Overriding value of " + CommonConfigurationKeysPublic.HADOOP_RPC_PROTECTION + " setting it from "
+          + hadoopRpcProtectionVal + " to " + hadoopRpcProtectionAuth + " because SSL is enabled");
+      conf.set(CommonConfigurationKeysPublic.HADOOP_RPC_PROTECTION, hadoopRpcProtectionAuth);
+    }
+    return HadoopThriftAuthBridge.getBridge().getHadoopSaslProperties(conf);
+  }
+
+  public static List getColumnNames(List schema) {
+    List cols = new ArrayList<>(schema.size());
+    for (FieldSchema fs : schema) {
+      cols.add(fs.getName());
+    }
+    return cols;
+  }
+
+  /**
+   * Determines whether a table is an external table.
+   *
+   * @param table table of interest
+   *
+   * @return true if external
+   */
+  public static boolean isExternalTable(Table table) {
+    if (table == null) {
+      return false;
+    }
+    Map params = table.getParameters();
+    if (params == null) {
+      return false;
+    }
+
+    return isExternal(params);
+  }
+
+  public static boolean isExternal(Map tableParams){
+    return isPropertyTrue(tableParams, "EXTERNAL");
+  }
+
+  public static boolean isPropertyTrue(Map tableParams, String prop) {
+    return "TRUE".equalsIgnoreCase(tableParams.get(prop));
+  }
+
+  public static boolean isMaterializedViewTable(Table table) {
+    if (table == null) {
+      return false;
+    }
+    return TableType.MATERIALIZED_VIEW.toString().equals(table.getTableType());
+  }
+
+  public static String encodeTableName(String name) {
+    // The encoding method is simple, e.g., replace
+    // all the special characters with the corresponding number in ASCII.
+    // Note that unicode is not supported in table names. And we have explicit
+    // checks for it.
+    StringBuilder sb = new StringBuilder();
+    for (char ch : name.toCharArray()) {
+      if (Character.isLetterOrDigit(ch) || ch == '_') {
+        sb.append(ch);
+      } else {
+        sb.append('-').append((int) ch).append('-');
+      }
+    }
+    return sb.toString();
+  }
+
+  public static boolean isArchived(Partition part) {
+    Map params = part.getParameters();
+    return "TRUE".equalsIgnoreCase(params.get(hive_metastoreConstants.IS_ARCHIVED));
+  }
+
+  public static int getArchivingLevel(Partition part) throws MetaException {
+    if (!isArchived(part)) {
+      throw new MetaException("Getting level of unarchived partition");
+    }
+
+    String lv = part.getParameters().get(ARCHIVING_LEVEL);
+    if (lv != null) {
+      return Integer.parseInt(lv);
+    }
+    // partitions archived before introducing multiple archiving
+    return part.getValues().size();
+  }
+
+  /**
+   * Given a list of partition columns and a partial mapping from
+   * some partition columns to values the function returns the values
+   * for the column.
+   * @param partCols the list of table partition columns
+   * @param partSpec the partial mapping from partition column to values
+   * @return list of values of for given partition columns, any missing
+   *         values in partSpec is replaced by an empty string
+   */
+  public static List getPvals(List partCols,
+                                      Map partSpec) {
+    List pvals = new ArrayList<>(partCols.size());
+    for (FieldSchema field : partCols) {
+      String val = StringUtils.defaultString(partSpec.get(field.getName()));
+      pvals.add(val);
+    }
+    return pvals;
+  }
+
+  /**
+   * Convert FieldSchemas to columnNames.
+   */
+  public static String getColumnNamesFromFieldSchema(List fieldSchemas) {
+    String delimiter = getColumnNameDelimiter(fieldSchemas);
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < fieldSchemas.size(); i++) {
+      if (i > 0) {
+        sb.append(delimiter);
+      }
+      sb.append(fieldSchemas.get(i).getName());
+    }
+    return sb.toString();
+  }
+
+  public static String getColumnNameDelimiter(List fieldSchemas) {
+    // we first take a look if any fieldSchemas contain COMMA
+    for (int i = 0; i < fieldSchemas.size(); i++) {
+      if (fieldSchemas.get(i).getName().contains(",")) {
+        return String.valueOf(COLUMN_COMMENTS_DELIMITER);
+      }
+    }
+    return String.valueOf(',');
+  }
+
+  /**
+   * Convert FieldSchemas to columnTypes.
+   */
+  public static String getColumnTypesFromFieldSchema(
+      List fieldSchemas) {
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < fieldSchemas.size(); i++) {
+      if (i > 0) {
+        sb.append(",");
+      }
+      sb.append(fieldSchemas.get(i).getType());
+    }
+    return sb.toString();
+  }
+
+  public static boolean isValidSchedulingPolicy(String str) {
+    try {
+      parseSchedulingPolicy(str);
+      return true;
+    } catch (IllegalArgumentException ex) {
+    }
+    return false;
+  }
+
+  public static WMPoolSchedulingPolicy parseSchedulingPolicy(String schedulingPolicy) {
+    if (schedulingPolicy == null) {
+      return WMPoolSchedulingPolicy.FAIR;
+    }
+    schedulingPolicy = schedulingPolicy.trim().toUpperCase();
+    if ("DEFAULT".equals(schedulingPolicy)) {
+      return WMPoolSchedulingPolicy.FAIR;
+    }
+    return Enum.valueOf(WMPoolSchedulingPolicy.class, schedulingPolicy);
+  }
+
+  private static boolean hasCatalogName(String dbName) {
+    return dbName != null && dbName.length() > 0 &&
+        dbName.charAt(0) == CATALOG_DB_THRIFT_NAME_MARKER;
+  }
+
+  /**
+   * Given a catalog name and database name, cram them together into one string.  These can be
+   * parsed apart again via {@link #parseDbName(String, Configuration)}.
+   * @param catalogName catalog name.  This cannot be null.  If this might be null use
+   *                    {@link MetaStoreUtils#prependCatalogToDbName(String, String, Configuration)} instead.
+   * @param dbName database name.
+   * @return one string that contains both.
+   */
+  public static String prependNotNullCatToDbName(String catalogName, String dbName) {
+    assert catalogName != null;
+    return prependCatalogToDbName(catalogName, dbName, null);
+  }
+
+  /**
+   * Parse the catalog name out of the database name.  If no catalog name is present then the
+   * default catalog (as set in configuration file) will be assumed.
+   * @param dbName name of the database.  This may or may not contain the catalog name.
+   * @param conf configuration object, used to determine the default catalog if it is not present
+   *            in the database name.
+   * @return an array of two elements, the first being the catalog name, the second the database
+   * name.
+   * @throws MetaException if the name is not either just a database name or a catalog plus
+   * database name with the proper delimiters.
+   */
+  public static String[] parseDbName(String dbName, Configuration conf) throws MetaException {
+    if (dbName == null) return nullCatalogAndDatabase;
+    if (hasCatalogName(dbName)) {
+      if (dbName.endsWith(CATALOG_DB_SEPARATOR)) {
+        // This means the DB name is null
+        return new String[] {dbName.substring(1, dbName.length() - 1), null};
+      } else if (dbName.endsWith(DB_EMPTY_MARKER)) {
+        // This means the DB name is empty
+        return new String[] {dbName.substring(1, dbName.length() - DB_EMPTY_MARKER.length() - 1), ""};
+      }
+      String[] names = dbName.substring(1).split(CATALOG_DB_SEPARATOR, 2);
+      if (names.length != 2) {
+        throw new MetaException(dbName + " is prepended with the catalog marker but does not " +
+            "appear to have a catalog name in it");
+      }
+      return names;
+    } else {
+      return new String[] {getDefaultCatalog(conf), dbName};
+    }
+  }
+
+  public static boolean isNonNativeTable(Table table) {
+    if (table == null || table.getParameters() == null) {
+      return false;
+    }
+    return (table.getParameters().get(hive_metastoreConstants.META_TABLE_STORAGE) != null);
+  }
+
+  /**
+   * convert Exception to MetaException, which sets the cause to such exception
+   * @param e cause of the exception
+   * @return  the MetaException with the specified exception as the cause
+   */
+  public static MetaException newMetaException(Exception e) {
+    return newMetaException(e != null ? e.getMessage() : null, e);
+  }
+
+  /**
+   * convert Exception to MetaException, which sets the cause to such exception
+   * @param errorMessage  the error message for this MetaException
+   * @param e             cause of the exception
+   * @return  the MetaException with the specified exception as the cause
+   */
+  public static MetaException newMetaException(String errorMessage, Exception e) {
+    MetaException metaException = new MetaException(errorMessage);
+    if (e != null) {
+      metaException.initCause(e);
+    }
+    return metaException;
+  }
+
+  /** This method is invalid for MM and ACID tables unless fileStatus comes from AcidUtils. */
+  public static void populateQuickStats(List fileStatus, Map params) {
+    // Why is this even in metastore?
+    LOG.trace("Populating quick stats based on {} files", fileStatus.size());
+    int numFiles = 0;
+    long tableSize = 0L;
+    for (FileStatus status : fileStatus) {
+      // don't take directories into account for quick stats TODO: wtf?
+      if (!status.isDir()) {
+        tableSize += status.getLen();
+        numFiles += 1;
+      }
+    }
+    params.put(StatsSetupConst.NUM_FILES, Integer.toString(numFiles));
+    params.put(StatsSetupConst.TOTAL_SIZE, Long.toString(tableSize));
+  }
+
+  public static void clearQuickStats(Map params) {
+    params.remove(StatsSetupConst.NUM_FILES);
+    params.remove(StatsSetupConst.TOTAL_SIZE);
+  }
+
+  public static Properties getSchema(
+      Partition part,
+      Table table) {
+    return getSchema(part.getSd(), table.getSd(), table
+        .getParameters(), table.getDbName(), table.getTableName(), table.getPartitionKeys());
+  }
+
+  public static Properties getSchemaWithoutCols(StorageDescriptor sd,
+                                                Map parameters, String databaseName, String tableName,
+                                                List partitionKeys) {
+    Properties schema = new Properties();
+    String inputFormat = sd.getInputFormat();
+    if (inputFormat == null || inputFormat.length() == 0) {
+      inputFormat = org.apache.hadoop.mapred.SequenceFileInputFormat.class
+          .getName();
+    }
+    schema.setProperty(
+        hive_metastoreConstants.FILE_INPUT_FORMAT,
+        inputFormat);
+    String outputFormat = sd.getOutputFormat();
+    if (outputFormat == null || outputFormat.length() == 0) {
+      outputFormat = org.apache.hadoop.mapred.SequenceFileOutputFormat.class
+          .getName();
+    }
+    schema.setProperty(
+        hive_metastoreConstants.FILE_OUTPUT_FORMAT,
+        outputFormat);
+
+    schema.setProperty(
+        hive_metastoreConstants.META_TABLE_NAME,
+        databaseName + "." + tableName);
+
+    if (sd.getLocation() != null) {
+      schema.setProperty(
+          hive_metastoreConstants.META_TABLE_LOCATION,
+          sd.getLocation());
+    }
+    schema.setProperty(
+        hive_metastoreConstants.BUCKET_COUNT, Integer
+            .toString(sd.getNumBuckets()));
+    if (sd.getBucketCols() != null && sd.getBucketCols().size() > 0) {
+      schema.setProperty(
+          hive_metastoreConstants.BUCKET_FIELD_NAME,
+        Joiner.on(",").join(sd.getBucketCols()));
+    }
+    if (sd.getSerdeInfo() != null) {
+      for (Map.Entry param : sd.getSerdeInfo().getParameters().entrySet()) {
+        schema.put(param.getKey(), (param.getValue() != null) ? param.getValue() : StringUtils.EMPTY);
+      }
+
+      if (sd.getSerdeInfo().getSerializationLib() != null) {
+        schema.setProperty(ColumnType.SERIALIZATION_LIB, sd .getSerdeInfo().getSerializationLib());
+      }
+    }
+
+    if (sd.getCols() != null) {
+      schema.setProperty(ColumnType.SERIALIZATION_DDL, getDDLFromFieldSchema(tableName, sd.getCols()));
+    }
+
+    String partString = StringUtils.EMPTY;
+    String partStringSep = StringUtils.EMPTY;
+    String partTypesString = StringUtils.EMPTY;
+    String partTypesStringSep = StringUtils.EMPTY;
+    for (FieldSchema partKey : partitionKeys) {
+      partString = partString.concat(partStringSep);
+      partString = partString.concat(partKey.getName());
+      partTypesString = partTypesString.concat(partTypesStringSep);
+      partTypesString = partTypesString.concat(partKey.getType());
+      if (partStringSep.length() == 0) {
+        partStringSep = "/";
+        partTypesStringSep = ":";
+      }
+    }
+    if (partString.length() > 0) {
+      schema
+          .setProperty(
+              hive_metastoreConstants.META_TABLE_PARTITION_COLUMNS,
+              partString);
+      schema
+          .setProperty(
+              hive_metastoreConstants.META_TABLE_PARTITION_COLUMN_TYPES,
+              partTypesString);
+    }
+
+    if (parameters != null) {
+      for (Map.Entry e : parameters.entrySet()) {
+        // add non-null parameters to the schema
+        if ( e.getValue() != null) {
+          schema.setProperty(e.getKey(), e.getValue());
+        }
+      }
+    }
+
+    return schema;
+  }
+
+  public static Properties getSchema(
+      StorageDescriptor sd,
+      StorageDescriptor tblsd,
+      Map parameters, String databaseName, String tableName,
+      List partitionKeys) {
+
+    return addCols(getSchemaWithoutCols(sd, parameters, databaseName, tableName, partitionKeys), tblsd.getCols());
+  }
+
+  /**
+   * Convert FieldSchemas to Thrift DDL.
+   */
+  public static String getDDLFromFieldSchema(String structName,
+                                             List fieldSchemas) {
+    StringBuilder ddl = new StringBuilder();
+    ddl.append("struct ");
+    ddl.append(structName);
+    ddl.append(" { ");
+    boolean first = true;
+    for (FieldSchema col : fieldSchemas) {
+      if (first) {
+        first = false;
+      } else {
+        ddl.append(", ");
+      }
+      ddl.append(ColumnType.typeToThriftType(col.getType()));
+      ddl.append(' ');
+      ddl.append(col.getName());
+    }
+    ddl.append("}");
+
+    LOG.trace("DDL: {}", ddl);
+    return ddl.toString();
+  }
+
+  private static Properties addCols(Properties schema, List cols) {
+
+    StringBuilder colNameBuf = new StringBuilder();
+    StringBuilder colTypeBuf = new StringBuilder();
+    StringBuilder colComment = new StringBuilder();
+
+    boolean first = true;
+    String columnNameDelimiter = getColumnNameDelimiter(cols);
+    for (FieldSchema col : cols) {
+      if (!first) {
+        colNameBuf.append(columnNameDelimiter);
+        colTypeBuf.append(":");
+        colComment.append('\0');
+      }
+      colNameBuf.append(col.getName());
+      colTypeBuf.append(col.getType());
+      colComment.append((null != col.getComment()) ? col.getComment() : StringUtils.EMPTY);
+      first = false;
+    }
+    schema.setProperty(
+        hive_metastoreConstants.META_TABLE_COLUMNS,
+        colNameBuf.toString());
+    schema.setProperty(ColumnType.COLUMN_NAME_DELIMITER, columnNameDelimiter);
+    String colTypes = colTypeBuf.toString();
+    schema.setProperty(
+        hive_metastoreConstants.META_TABLE_COLUMN_TYPES,
+        colTypes);
+    schema.setProperty("columns.comments", colComment.toString());
+
+    return schema;
+
+  }
+
+  public static Properties getTableMetadata(
+      Table table) {
+    return getSchema(table.getSd(), table.getSd(), table
+        .getParameters(), table.getDbName(), table.getTableName(), table.getPartitionKeys());
+  }
+
+  public static Properties getPartitionMetadata(
+      Partition partition,
+      Table table) {
+    return getSchema(partition.getSd(), partition.getSd(), partition
+                .getParameters(), table.getDbName(), table.getTableName(),
+            table.getPartitionKeys());
+  }
+
+  /**
+   * Get partition level schema from table level schema.
+   * This function will use the same column names, column types and partition keys for
+   * each partition Properties. Their values are copied from the table Properties. This
+   * is mainly to save CPU and memory. CPU is saved because the first time the
+   * StorageDescriptor column names are accessed, JDO needs to execute a SQL query to
+   * retrieve the data. If we know the data will be the same as the table level schema
+   * and they are immutable, we should just reuse the table level schema objects.
+   *
+   * @param sd The Partition level Storage Descriptor.
+   * @param parameters partition level parameters
+   * @param tblSchema The table level schema from which this partition should be copied.
+   * @return the properties
+   */
+  public static Properties getPartSchemaFromTableSchema(
+      StorageDescriptor sd,
+      Map parameters,
+      Properties tblSchema) {
+
+    // Inherent most properties from table level schema and overwrite some properties
+    // in the following code.
+    // This is mainly for saving CPU and memory to reuse the column names, types and
+    // partition columns in the table level schema.
+    Properties schema = (Properties) tblSchema.clone();
+
+    // InputFormat
+    String inputFormat = sd.getInputFormat();
+    if (inputFormat == null || inputFormat.length() == 0) {
+      String tblInput =
+          schema.getProperty(hive_metastoreConstants.FILE_INPUT_FORMAT);
+      if (tblInput == null) {
+        inputFormat = org.apache.hadoop.mapred.SequenceFileInputFormat.class.getName();
+      } else {
+        inputFormat = tblInput;
+      }
+    }
+    schema.setProperty(hive_metastoreConstants.FILE_INPUT_FORMAT,
+        inputFormat);
+
+    // OutputFormat
+    String outputFormat = sd.getOutputFormat();
+    if (outputFormat == null || outputFormat.length() == 0) {
+      String tblOutput =
+          schema.getProperty(hive_metastoreConstants.FILE_OUTPUT_FORMAT);
+      if (tblOutput == null) {
+        outputFormat = org.apache.hadoop.mapred.SequenceFileOutputFormat.class.getName();
+      } else {
+        outputFormat = tblOutput;
+      }
+    }
+    schema.setProperty(hive_metastoreConstants.FILE_OUTPUT_FORMAT,
+        outputFormat);
+
+    // Location
+    if (sd.getLocation() != null) {
+      schema.setProperty(hive_metastoreConstants.META_TABLE_LOCATION,
+          sd.getLocation());
+    }
+
+    // Bucket count
+    schema.setProperty(hive_metastoreConstants.BUCKET_COUNT,
+        Integer.toString(sd.getNumBuckets()));
+
+    if (sd.getBucketCols() != null && sd.getBucketCols().size() > 0) {
+      schema.setProperty(hive_metastoreConstants.BUCKET_FIELD_NAME,
+        Joiner.on(",").join(sd.getBucketCols()));
+    }
+
+    // SerdeInfo
+    if (sd.getSerdeInfo() != null) {
+
+      // We should not update the following 3 values if SerDeInfo contains these.
+      // This is to keep backward compatible with getSchema(), where these 3 keys
+      // are updated after SerDeInfo properties got copied.
+      String cols = hive_metastoreConstants.META_TABLE_COLUMNS;
+      String colTypes = hive_metastoreConstants.META_TABLE_COLUMN_TYPES;
+      String parts = hive_metastoreConstants.META_TABLE_PARTITION_COLUMNS;
+
+      for (Map.Entry param : sd.getSerdeInfo().getParameters().entrySet()) {
+        String key = param.getKey();
+        if (schema.get(key) != null &&
+                (key.equals(cols) || key.equals(colTypes) || key.equals(parts) ||
+                        // skip Druid properties which are used in DruidSerde, since they are also updated
+                        // after SerDeInfo properties are copied.
+                        key.startsWith("druid."))) {
+          continue;
+        }
+        schema.put(key, (param.getValue() != null) ? param.getValue() : StringUtils.EMPTY);
+      }
+
+      if (sd.getSerdeInfo().getSerializationLib() != null) {
+        schema.setProperty(ColumnType.SERIALIZATION_LIB, sd.getSerdeInfo().getSerializationLib());
+      }
+    }
+
+    // skipping columns since partition level field schemas are the same as table level's
+    // skipping partition keys since it is the same as table level partition keys
+
+    if (parameters != null) {
+      for (Map.Entry e : parameters.entrySet()) {
+        schema.setProperty(e.getKey(), e.getValue());
+      }
+    }
+
+    return schema;
+  }
+
+  public static String getColumnCommentsFromFieldSchema(List fieldSchemas) {
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < fieldSchemas.size(); i++) {
+      if (i > 0) {
+        sb.append(COLUMN_COMMENTS_DELIMITER);
+      }
+      sb.append(fieldSchemas.get(i).getComment());
+    }
+    return sb.toString();
+  }
+
+  public static List getColumnNamesForTable(Table table) {
+    List colNames = new ArrayList<>();
+    Iterator colsIterator = table.getSd().getColsIterator();
+    while (colsIterator.hasNext()) {
+      colNames.add(colsIterator.next().getName());
+    }
+    return colNames;
+  }
+
+  public static List getColumnNamesForPartition(Partition partition) {
+    List colNames = new ArrayList<>();
+    Iterator colsIterator = partition.getSd().getColsIterator();
+    while (colsIterator.hasNext()) {
+      colNames.add(colsIterator.next().getName());
+    }
+    return colNames;
+  }
+
+  public static String makePartName(List partCols,
+      List vals) throws MetaException {
+    return makePartName(partCols, vals, null);
+  }
+
+  /**
+   * Makes a valid partition name.
+   * @param partCols The partition columns
+   * @param vals The partition values
+   * @param defaultStr
+   *    The default name given to a partition value if the respective value is empty or null.
+   * @return An escaped, valid partition name.
+   * @throws MetaException
+   */
+  public static String makePartName(List partCols,
+      List vals, String defaultStr) throws MetaException {
+    if ((partCols.size() != vals.size()) || (partCols.size() == 0)) {
+      String errorStr = "Invalid partition key & values; keys [";
+      for (FieldSchema fs : partCols) {
+        errorStr += (fs.getName() + ", ");
+      }
+      errorStr += "], values [";
+      for (String val : vals) {
+        errorStr += (val + ", ");
+      }
+      throw new MetaException(errorStr + "]");
+    }
+    List colNames = new ArrayList<>();
+    for (FieldSchema col: partCols) {
+      colNames.add(col.getName());
+    }
+    return FileUtils.makePartName(colNames, vals, defaultStr);
+  }
+
+  public static String makePartNameMatcher(Table table, List partVals) throws MetaException {
+    List partCols = table.getPartitionKeys();
+    int numPartKeys = partCols.size();
+    if (partVals.size() > numPartKeys) {
+      throw new MetaException("Incorrect number of partition values."
+          + " numPartKeys=" + numPartKeys + ", part_val=" + partVals);
+    }
+    partCols = partCols.subList(0, partVals.size());
+    // Construct a pattern of the form: partKey=partVal/partKey2=partVal2/...
+    // where partVal is either the escaped partition value given as input,
+    // or a regex of the form ".*"
+    // This works because the "=" and "/" separating key names and partition key/values
+    // are not escaped.
+    String partNameMatcher = makePartName(partCols, partVals, ".*");
+    // add ".*" to the regex to match anything else afterwards the partial spec.
+    if (partVals.size() < numPartKeys) {
+      partNameMatcher += ".*";
+    }
+    return partNameMatcher;
+  }
+
+  /**
+   * validateName
+   *
+   * Checks the name conforms to our standars which are: "[a-zA-z_0-9]+". checks
+   * this is just characters and numbers and _
+   *
+   * @param name
+   *          the name to validate
+   * @param conf
+   *          hive configuration
+   * @return true or false depending on conformance
+   *              if it doesn't match the pattern.
+   */
+  public static boolean validateName(String name, Configuration conf) {
+    Pattern tpat;
+    String allowedCharacters = "\\w_";
+    if (conf != null
+        && MetastoreConf.getBoolVar(conf,
+        MetastoreConf.ConfVars.SUPPORT_SPECICAL_CHARACTERS_IN_TABLE_NAMES)) {
+      for (Character c : specialCharactersInTableNames) {
+        allowedCharacters += c;
+      }
+    }
+    tpat = Pattern.compile("[" + allowedCharacters + "]+");
+    Matcher m = tpat.matcher(name);
+    return m.matches();
+  }
+
+  /*
+   * At the Metadata level there are no restrictions on Column Names.
+   */
+  public static boolean validateColumnName(String name) {
+    return true;
+  }
+
+  static public String validateTblColumns(List cols) {
+    for (FieldSchema fieldSchema : cols) {
+      // skip this, as validateColumnName always returns true
+      /*
+      if (!validateColumnName(fieldSchema.getName())) {
+        return "name: " + fieldSchema.getName();
+      }
+      */
+      String typeError = validateColumnType(fieldSchema.getType());
+      if (typeError != null) {
+        return typeError;
+      }
+    }
+    return null;
+  }
+
+  private static String validateColumnType(String type) {
+    if (type.equals(TYPE_FROM_DESERIALIZER)) {
+      return null;
+    }
+    int last = 0;
+    boolean lastAlphaDigit = isValidTypeChar(type.charAt(last));
+    for (int i = 1; i <= type.length(); i++) {
+      if (i == type.length()
+          || isValidTypeChar(type.charAt(i)) != lastAlphaDigit) {
+        String token = type.substring(last, i);
+        last = i;
+        if (!ColumnType.AllTypes.contains(token)) {
+          return "type: " + type;
+        }
+        break;
+      }
+    }
+    return null;
+  }
+
+  private static boolean isValidTypeChar(char c) {
+    return Character.isLetterOrDigit(c) || c == '_';
+  }
+
+  /**
+   * @param schema1: The first schema to be compared
+   * @param schema2: The second schema to be compared
+   * @return true if the two schemas are the same else false
+   *         for comparing a field we ignore the comment it has
+   */
+  public static boolean compareFieldColumns(List schema1, List schema2) {
+    if (schema1.size() != schema2.size()) {
+      return false;
+    }
+    Iterator its1 = schema1.iterator();
+    Iterator its2 = schema2.iterator();
+    while (its1.hasNext()) {
+      FieldSchema f1 = its1.next();
+      FieldSchema f2 = its2.next();
+      // The default equals provided by thrift compares the comments too for
+      // equality, thus we need to compare the relevant fields here.
+      if (!StringUtils.equals(f1.getName(), f2.getName()) ||
+          !StringUtils.equals(f1.getType(), f2.getType())) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  public static Path getOriginalLocation(Partition part) {
+    Map params = part.getParameters();
+    assert(isArchived(part));
+    String originalLocation = params.get(hive_metastoreConstants.ORIGINAL_LOCATION);
+    assert( originalLocation != null);
+
+    return new Path(originalLocation);
+  }
+
+  /**
+   * Add new elements to the classpath.
+   *
+   * @param newPaths
+   *          Array of classpath elements
+   */
+  public static ClassLoader addToClassPath(ClassLoader cloader, String[] newPaths) throws Exception {
+    URLClassLoader loader = (URLClassLoader) cloader;
+    List curPath = Arrays.asList(loader.getURLs());
+    ArrayList newPath = new ArrayList<>(curPath.size());
+
+    // get a list with the current classpath components
+    for (URL onePath : curPath) {
+      newPath.add(onePath);
+    }
+    curPath = newPath;
+
+    for (String onestr : newPaths) {
+      URL oneurl = urlFromPathString(onestr);
+      if (oneurl != null && !curPath.contains(oneurl)) {
+        curPath.add(oneurl);
+      }
+    }
+
+    return new URLClassLoader(curPath.toArray(new URL[0]), loader);
+  }
+
+  /**
+   * Create a URL from a string representing a path to a local file.
+   * The path string can be just a path, or can start with file:/, file:///
+   * @param onestr  path string
+   * @return
+   */
+  private static URL urlFromPathString(String onestr) {
+    URL oneurl = null;
+    try {
+      if (onestr.startsWith("file:/")) {
+        oneurl = new URL(onestr);
+      } else {
+        oneurl = new File(onestr).toURL();
+      }
+    } catch (Exception err) {
+      LOG.error("Bad URL " + onestr + ", ignoring path");
+    }
+    return oneurl;
+  }
+
+  /** Duplicates AcidUtils; used in a couple places in metastore. */
+  public static boolean isTransactionalTable(Map params) {
+    String transactionalProp = params.get(hive_metastoreConstants.TABLE_IS_TRANSACTIONAL);
+    return (transactionalProp != null && "true".equalsIgnoreCase(transactionalProp));
+  }
+
+  /** Duplicates AcidUtils; used in a couple places in metastore. */
+  public static boolean isInsertOnlyTableParam(Map params) {
+    String transactionalProp = params.get(hive_metastoreConstants.TABLE_TRANSACTIONAL_PROPERTIES);
+    return (transactionalProp != null && "insert_only".equalsIgnoreCase(transactionalProp));
+  }
+}
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 97%
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
index 0b0cfbda80..a218ce2e4f 100644
--- 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
@@ -19,11 +19,8 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.metastore.security.DBTokenStore;
 import org.apache.hadoop.hive.metastore.security.DelegationTokenIdentifier;
 import org.apache.hadoop.hive.metastore.security.DelegationTokenSelector;
-import org.apache.hadoop.hive.metastore.security.MemoryTokenStore;
-import org.apache.hadoop.hive.metastore.security.ZooKeeperTokenStore;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.security.SecurityUtil;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -214,15 +211,15 @@ public static String getTokenStoreClassName(Configuration conf) {
     String tokenStoreClass = conf.get(DELEGATION_TOKEN_STORE_CLS, "");
     if (StringUtils.isBlank(tokenStoreClass)) {
       // default tokenstore is MemoryTokenStore
-      return MemoryTokenStore.class.getName();
+      return "org.apache.hadoop.hive.metastore.security.MemoryTokenStore";
     }
     switch (tokenStoreClass) {
     case "org.apache.hadoop.hive.thrift.DBTokenStore":
-      return DBTokenStore.class.getName();
+      return "org.apache.hadoop.hive.metastore.security.DBTokenStore";
     case "org.apache.hadoop.hive.thrift.MemoryTokenStore":
-      return MemoryTokenStore.class.getName();
+      return "org.apache.hadoop.hive.metastore.security.MemoryTokenStore";
     case "org.apache.hadoop.hive.thrift.ZooKeeperTokenStore":
-      return ZooKeeperTokenStore.class.getName();
+      return "org.apache.hadoop.hive.metastore.security.ZooKeeperTokenStore";
     default:
       return tokenStoreClass;
     }
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/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/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/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..f44e0c7c6c 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-server/pom.xml for the thriftif profile.           #
 #  Usage: thriftif profile automatically refers to this file.                                     #
 #                                                                                                 #
 ###################################################################################################
diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml
new file mode 100644
index 0000000000..fff1e006b4
--- /dev/null
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -0,0 +1,689 @@
+
+
+  
+    hive-standalone-metastore
+    org.apache.hive
+    4.0.0-SNAPSHOT
+  
+  4.0.0
+
+  metastore-server
+  Hive Metastore Server
+
+  
+    
+      org.apache.hive
+      metastore-common
+      4.0.0-SNAPSHOT
+      compile
+    
+
+    
+      org.apache.orc
+      orc-core
+      
+        
+          org.apache.hadoop
+          hadoop-common
+        
+        
+          org.apache.hive
+          hive-storage-api
+        
+      
+    
+    
+      com.fasterxml.jackson.core
+      jackson-databind
+    
+    
+      com.github.joshelser
+      dropwizard-metrics-hadoop-metrics2-reporter
+    
+    
+      com.google.guava
+      guava
+    
+    
+      com.google.protobuf
+      protobuf-java
+    
+    
+      com.jolbox
+      bonecp
+    
+    
+      com.zaxxer
+      HikariCP
+    
+    
+      commons-dbcp
+      commons-dbcp
+    
+    
+      io.dropwizard.metrics
+      metrics-core
+    
+    
+      io.dropwizard.metrics
+      metrics-jvm
+    
+    
+      io.dropwizard.metrics
+      metrics-json
+    
+    
+      javolution
+      javolution
+    
+    
+      org.antlr
+      antlr-runtime
+    
+    
+      org.apache.commons
+      commons-lang3
+    
+    
+      org.apache.derby
+      derby
+    
+    
+      org.apache.hadoop
+      hadoop-common
+      true
+      
+        
+          org.slf4j
+          slf4j-log4j12
+        
+        
+          commons-logging
+          commons-logging
+        
+      
+    
+    
+      org.apache.hadoop
+      hadoop-distcp
+      provided
+    
+    
+      org.apache.hadoop
+      hadoop-hdfs
+      true
+      
+        
+          org.slf4j
+          slf4j-log4j12
+        
+        
+          commons-logging
+          commons-logging
+        
+      
+    
+    
+      org.apache.hadoop
+      hadoop-hdfs-client
+      true
+      
+        
+          org.slf4j
+          slf4j-log4j12
+        
+        
+          commons-logging
+          commons-logging
+        
+      
+    
+    
+      org.apache.hadoop
+      hadoop-mapreduce-client-core
+      true
+      
+        
+          org.slf4j
+          slf4j-log4j12
+        
+        
+          commons-logging
+          commons-logging
+        
+      
+    
+    
+    
+      org.apache.hive
+      hive-storage-api
+      ${storage-api.version}
+    
+    
+      org.apache.logging.log4j
+      log4j-slf4j-impl
+    
+    
+      org.apache.logging.log4j
+      log4j-1.2-api
+    
+    
+      org.apache.thrift
+      libfb303
+    
+    
+      org.apache.thrift
+      libthrift
+    
+    
+      org.datanucleus
+      datanucleus-api-jdo
+    
+    
+      org.datanucleus
+      datanucleus-core
+    
+    
+      org.datanucleus
+      datanucleus-rdbms
+    
+    
+      org.datanucleus
+      javax.jdo
+    
+    
+      org.skyscreamer
+      jsonassert
+      test
+    
+    
+      sqlline
+      sqlline
+    
+    
+      commons-logging
+      commons-logging
+    
+    
+      org.apache.hive
+      metastore-client
+      4.0.0-SNAPSHOT
+      compile
+    
+    
+    
+      com.microsoft.sqlserver
+      mssql-jdbc
+      test
+    
+    
+      junit
+      junit
+      test
+    
+    
+      org.mockito
+      mockito-core
+      test
+    
+    
+      
+      org.mariadb.jdbc
+      mariadb-java-client
+      test
+    
+    
+      org.postgresql
+      postgresql
+      test
+    
+  
+
+  
+    
+      thriftif
+      
+        
+          
+            org.apache.maven.plugins
+            maven-antrun-plugin
+            
+            
+          
+        
+      
+    
+    
+      findbugs
+      
+        
+          
+            org.codehaus.mojo
+            findbugs-maven-plugin
+            3.0.0
+            
+              true
+              2048
+              -Djava.awt.headless=true -Xmx2048m -Xms512m
+              ${basedir}/findbugs/findbugs-exclude.xml
+            
+          
+        
+      
+      
+        
+          
+            org.codehaus.mojo
+            findbugs-maven-plugin
+            3.0.0
+            
+              true
+              2048
+              -Djava.awt.headless=true -Xmx2048m -Xms512m
+              ${basedir}/findbugs/findbugs-exclude.xml
+            
+          
+        
+      
+    
+    
+  
+
+  
+    
+      
+        ${basedir}/src/main/resources
+        
+          package.jdo
+        
+      
+    
+
+    
+      
+        
+          org.apache.maven.plugins
+          maven-antrun-plugin
+          ${maven.antrun.plugin.version}
+          
+            
+              ant-contrib
+              ant-contrib
+              ${ant.contrib.version}
+              
+                
+                  ant
+                  ant
+                
+              
+            
+          
+        
+        
+          org.apache.maven.plugins
+          maven-checkstyle-plugin
+          ${maven.checkstyle.plugin.version}
+        
+        
+          org.codehaus.mojo
+          exec-maven-plugin
+          ${maven.exec.plugin.version}
+        
+      
+    
+    
+      
+      
+        org.apache.maven.plugins
+        maven-antrun-plugin
+        
+          
+            setup-test-dirs
+            process-test-resources
+            
+              run
+            
+            
+              
+                
+                
+                
+                
+              
+            
+          
+          
+            generate-version-annotation
+            generate-sources
+            
+              
+                
+                  
+                  
+                  
+                  
+                
+              
+            
+            
+              run
+            
+          
+          
+            setup-metastore-scripts
+            process-test-resources
+            
+              run
+            
+            
+              
+                
+                
+                  
+                
+              
+            
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-checkstyle-plugin
+        
+          ${checkstyle.conf.dir}/checkstyle.xml
+          config_loc=${checkstyle.conf.dir}
+          true
+        
+      
+      
+        com.github.os72
+        protoc-jar-maven-plugin
+        3.5.1.1
+        
+          
+            generate-sources
+            
+              run
+            
+            
+              com.google.protobuf:protoc:2.5.0
+              none
+              
+                ${basedir}/src/main/protobuf/org/apache/hadoop/hive/metastore
+              
+            
+          
+        
+      
+      
+      
+        org.apache.maven.plugins
+        maven-assembly-plugin
+        ${maven.assembly.plugin.version}
+        
+          
+            assemble
+            package
+            
+              single
+            
+            
+              apache-hive-metastore-${project.version}
+              
+                src/assembly/bin.xml
+                src/assembly/src.xml
+              
+              gnu
+            
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-enforcer-plugin
+        
+          
+            enforce-banned-dependencies
+            
+              enforce
+            
+            
+              
+                
+                  
+                    
+                    com.google.code.findbugs:annotations
+                  
+                
+              
+              true
+            
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-failsafe-plugin
+        2.20.1
+        
+          
+            
+              integration-test
+              verify
+            
+          
+        
+        
+          true
+          false
+          -Xmx2048m
+          false
+          
+            true
+            ${test.tmp.dir}
+            ${test.tmp.dir}
+            true
+          
+          
+            ${log4j.conf.dir}
+            ${itest.jdbc.jars}
+          
+          ${skipITests} 
+        
+      
+      
+        org.apache.maven.plugins
+        maven-surefire-plugin
+        ${maven.surefire.version}
+        
+          true
+          false
+          ${test.forkcount}
+          -Xmx2048m
+          false
+          
+            ${project.build.directory}
+            true
+            ${derby.version}
+            ${test.tmp.dir}/derby.log
+            true
+            ${test.tmp.dir}
+            
+              jdbc:derby:memory:${test.tmp.dir}/junit_metastore_db;create=true
+            
+            false
+            ${test.tmp.dir}
+            ${test.warehouse.scheme}${test.warehouse.dir}
+            
+          
+          
+            ${log4j.conf.dir}
+          
+          ${test.groups}
+        
+      
+      
+        org.apache.rat
+        apache-rat-plugin
+        0.10
+        
+          
+            binary-package-licenses/**
+            DEV-README
+            **/src/main/sql/**
+            **/README.md
+            **/*.iml
+            **/*.txt
+            **/*.log
+            **/*.arcconfig
+            **/package-info.java
+            **/*.properties
+            **/*.q
+            **/*.q.out
+            **/*.xml
+            **/gen/**
+            **/patchprocess/**
+            **/metastore_db/**
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-jar-plugin
+        
+          
+            
+              test-jar
+            
+          
+        
+      
+      
+        org.codehaus.mojo
+        build-helper-maven-plugin
+        3.0.0
+        
+          
+            add-source
+            generate-sources
+            
+              add-source
+            
+            
+              
+                src/gen/thrift/gen-javabean
+                ${project.build.directory}/generated-sources
+                src/gen/version
+              
+            
+          
+        
+      
+      
+        org.codehaus.mojo
+        exec-maven-plugin
+        
+          
+            prepare-package
+            
+              exec
+            
+          
+        
+        
+          java
+          
+            -classpath
+            
+            org.apache.hadoop.hive.metastore.conf.ConfTemplatePrinter
+            
+              ${project.build.directory}/generated-sources/conf/metastore-site.xml.template
+            
+          
+        
+      
+      
+        org.datanucleus
+        datanucleus-maven-plugin
+        4.0.5
+        
+          JDO
+          false
+          ${basedir}/src/main/resources/datanucleus-log4j.properties
+          
+          **/*.jdo
+          false
+        
+        
+          
+            process-classes
+            
+              enhance
+            
+          
+        
+      
+      
+        org.antlr
+        antlr3-maven-plugin
+        ${antlr.version}
+        
+          
+            
+              antlr
+            
+          
+        
+        
+          ${project.build.directory}/generated-sources
+          ${basedir}/src/main/java
+        
+      
+    
+  
+
+
\ No newline at end of file
diff --git a/standalone-metastore/metastore-server/src/assembly/bin.xml b/standalone-metastore/metastore-server/src/assembly/bin.xml
new file mode 100644
index 0000000000..81912d78da
--- /dev/null
+++ b/standalone-metastore/metastore-server/src/assembly/bin.xml
@@ -0,0 +1,136 @@
+
+
+
+
+  bin
+
+  
+    dir
+    tar.gz
+  
+
+  apache-hive-metastore-${project.version}-bin
+
+  
+    
+      lib
+      false
+      true
+      true
+      true
+      
+        org.apache.hadoop:*
+        org.slf4j:*
+        log4j:*
+      
+    
+  
+
+  
+    
+      ${project.basedir}
+      
+        target/**
+        .classpath
+        .project
+        .settings/**
+        lib/**
+      
+
+      
+        README.txt
+        LICENSE
+        NOTICE
+      
+      /
+    
+
+    
+      ${project.basedir}/binary-package-licenses
+      
+        /*
+      
+      
+        /README
+      
+      binary-package-licenses
+    
+
+    
+      755
+      ${project.basedir}/src/main/scripts
+      
+        base
+        schematool
+        start-metastore
+        metastore-config.sh
+        ext/**/*
+      
+      bin
+    
+
+    
+      ${project.basedir}/src/main/sql
+      
+        **/*
+      
+      scripts/metastore/upgrade
+    
+
+    
+      ${project.basedir}/src/gen/thrift/gen-php
+      
+        **/*
+      
+      lib/php/packages/hive_metastore
+    
+
+    
+      ${project.basedir}/src/gen/thrift/gen-py/hive_metastore
+      755
+       
+        **/*
+      
+      lib/py/hive_metastore
+    
+
+    
+      ${project.basedir}/src/main/resources/
+      644
+      
+        metastore-site.xml
+        metastore-log4j2.properties
+      
+      conf
+    
+  
+
+  
+    
+      ${project.build.directory}/generated-sources/conf/metastore-site.xml.template
+      conf
+    
+  
+
+
+
diff --git a/standalone-metastore/metastore-server/src/assembly/src.xml b/standalone-metastore/metastore-server/src/assembly/src.xml
new file mode 100644
index 0000000000..a2405443ea
--- /dev/null
+++ b/standalone-metastore/metastore-server/src/assembly/src.xml
@@ -0,0 +1,53 @@
+
+
+
+
+  src
+
+  
+    tar.gz
+  
+
+  apache-hive-metastore-${project.version}-src
+
+  
+    
+      ${project.basedir}
+
+      
+        target/**
+      
+
+      
+        .checkstyle
+        .gitattributes
+        .gitignore
+        LICENSE
+        NOTICE
+        pom.xml
+        src/**/*
+      
+      /
+    
+  
+
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimator.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/NumDistinctValueEstimatorFactory.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketch.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/fm/FMSketchUtils.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLConstants.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLDenseRegister.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLRegister.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HLLSparseRegister.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java
similarity index 99%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java
index 91a6865734..b13fb7c9c3 100644
--- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLog.java
@@ -20,7 +20,6 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.TreeMap;
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/common/ndv/hll/HyperLogLogUtils.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java
similarity index 95%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java
index 52792471f6..fb7a544607 100644
--- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AcidEventListener.java
@@ -34,6 +34,7 @@
 import org.apache.hadoop.hive.metastore.events.DropTableEvent;
 import org.apache.hadoop.hive.metastore.txn.TxnStore;
 import org.apache.hadoop.hive.metastore.txn.TxnUtils;
+import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils;
 
 
 /**
@@ -99,8 +100,8 @@ public void onAlterPartition(AlterPartitionEvent partitionEvent)  throws MetaExc
     Partition oldPart = partitionEvent.getOldPartition();
     Partition newPart = partitionEvent.getNewPartition();
     Table t = partitionEvent.getTable();
-    String oldPartName = Warehouse.makePartName(t.getPartitionKeys(), oldPart.getValues());
-    String newPartName = Warehouse.makePartName(t.getPartitionKeys(), newPart.getValues());
+    String oldPartName = MetaStoreUtils.makePartName(t.getPartitionKeys(), oldPart.getValues());
+    String newPartName = MetaStoreUtils.makePartName(t.getPartitionKeys(), newPart.getValues());
     if(!oldPartName.equals(newPartName)) {
       txnHandler = getTxnHandler();
       txnHandler.onRename(t.getCatName(), t.getDbName(), t.getTableName(), oldPartName,
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AggregateStatsCache.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AlterHandler.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Deadline.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DeadlineException.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java
similarity index 100%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultStorageSchemaReader.java
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/FileFormatProxy.java b/standalone-metastore/metastore-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java
similarity index 96%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java
index 93ac74c68b..d6f5968ab7 100644
--- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java
@@ -28,6 +28,7 @@
 import org.apache.hadoop.hive.metastore.messaging.EventMessage;
 import org.apache.hadoop.hive.metastore.utils.FileUtils;
 import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils;
+import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -309,16 +310,16 @@ public void alterTable(RawStore msdb, Warehouse wh, String catName, String dbnam
       } else {
         // operations other than table rename
 
-        if (MetaStoreUtils.requireCalStats(null, null, newt, environmentContext) &&
+        if (MetaStoreServerUtils.requireCalStats(null, null, newt, environmentContext) &&
             !isPartitionedTable) {
           Database db = msdb.getDatabase(catName, newDbName);
           // Update table stats. For partitioned table, we update stats in alterPartition()
-          MetaStoreUtils.updateTableStatsSlow(db, newt, wh, false, true, environmentContext);
+          MetaStoreServerUtils.updateTableStatsSlow(db, newt, wh, false, true, environmentContext);
         }
 
         if (isPartitionedTable) {
           //Currently only column related changes can be cascaded in alter table
-          if(!MetaStoreUtils.areSameColumns(oldt.getSd().getCols(), newt.getSd().getCols())) {
+          if(!MetaStoreServerUtils.areSameColumns(oldt.getSd().getCols(), newt.getSd().getCols())) {
             parts = msdb.getPartitions(catName, dbname, name, -1);
             for (Partition part : parts) {
               Partition oldPart = new Partition(part);
@@ -456,12 +457,12 @@ public Partition alterPartition(final RawStore msdb, Warehouse wh, final String
               "Unable to alter partition because table or database does not exist.");
         }
         oldPart = msdb.getPartition(catName, dbname, name, new_part.getValues());
-        if (MetaStoreUtils.requireCalStats(oldPart, new_part, tbl, environmentContext)) {
+        if (MetaStoreServerUtils.requireCalStats(oldPart, new_part, tbl, environmentContext)) {
           // if stats are same, no need to update
-          if (MetaStoreUtils.isFastStatsSame(oldPart, new_part)) {
-            MetaStoreUtils.updateBasicState(environmentContext, new_part.getParameters());
+          if (MetaStoreServerUtils.isFastStatsSame(oldPart, new_part)) {
+            MetaStoreServerUtils.updateBasicState(environmentContext, new_part.getParameters());
           } else {
-            MetaStoreUtils.updatePartitionStatsFast(
+            MetaStoreServerUtils.updatePartitionStatsFast(
                 new_part, tbl, wh, false, true, environmentContext, false);
           }
         }
@@ -598,12 +599,12 @@ public Partition alterPartition(final RawStore msdb, Warehouse wh, final String
         new_part.getSd().setLocation(oldPart.getSd().getLocation());
       }
 
-      if (MetaStoreUtils.requireCalStats(oldPart, new_part, tbl, environmentContext)) {
-        MetaStoreUtils.updatePartitionStatsFast(
+      if (MetaStoreServerUtils.requireCalStats(oldPart, new_part, tbl, environmentContext)) {
+        MetaStoreServerUtils.updatePartitionStatsFast(
             new_part, tbl, wh, false, true, environmentContext, false);
       }
 
-      String newPartName = Warehouse.makePartName(tbl.getPartitionKeys(), new_part.getValues());
+      String newPartName = MetaStoreUtils.makePartName(tbl.getPartitionKeys(), new_part.getValues());
       ColumnStatistics cs = updateOrGetPartitionColumnStats(msdb, catName, dbname, name, oldPart.getValues(),
           oldPart.getSd().getCols(), tbl, new_part, null);
       msdb.alterPartition(catName, dbname, name, part_vals, new_part);
@@ -693,12 +694,12 @@ public Partition alterPartition(final RawStore msdb, Warehouse wh, final String
         oldParts.add(oldTmpPart);
         partValsList.add(tmpPart.getValues());
 
-        if (MetaStoreUtils.requireCalStats(oldTmpPart, tmpPart, tbl, environmentContext)) {
+        if (MetaStoreServerUtils.requireCalStats(oldTmpPart, tmpPart, tbl, environmentContext)) {
           // Check if stats are same, no need to update
-          if (MetaStoreUtils.isFastStatsSame(oldTmpPart, tmpPart)) {
-            MetaStoreUtils.updateBasicState(environmentContext, tmpPart.getParameters());
+          if (MetaStoreServerUtils.isFastStatsSame(oldTmpPart, tmpPart)) {
+            MetaStoreServerUtils.updateBasicState(environmentContext, tmpPart.getParameters());
           } else {
-            MetaStoreUtils.updatePartitionStatsFast(
+            MetaStoreServerUtils.updatePartitionStatsFast(
                 tmpPart, tbl, wh, false, true, environmentContext, false);
           }
         }
@@ -797,7 +798,7 @@ void alterTableUpdateTableColumnStats(RawStore msdb, Table oldTable, Table newTa
       // Nothing to update if everything is the same
         if (newDbName.equals(dbName) &&
             newTableName.equals(tableName) &&
-            MetaStoreUtils.columnsIncludedByNameType(oldCols, newCols)) {
+            MetaStoreServerUtils.columnsIncludedByNameType(oldCols, newCols)) {
           updateColumnStats = false;
         }
 
@@ -868,13 +869,13 @@ private ColumnStatistics updateOrGetPartitionColumnStats(
       if (newCols == null) {
         newCols = part.getSd() == null ? new ArrayList<>() : part.getSd().getCols();
       }
-      String oldPartName = Warehouse.makePartName(table.getPartitionKeys(), partVals);
-      String newPartName = Warehouse.makePartName(table.getPartitionKeys(), part.getValues());
+      String oldPartName = MetaStoreUtils.makePartName(table.getPartitionKeys(), partVals);
+      String newPartName = MetaStoreUtils.makePartName(table.getPartitionKeys(), part.getValues());
       boolean rename = !part.getDbName().equals(dbname) || !part.getTableName().equals(tblname)
           || !oldPartName.equals(newPartName);
 
       // do not need to update column stats if alter partition is not for rename or changing existing columns
-      if (!rename && MetaStoreUtils.columnsIncludedByNameType(oldCols, newCols)) {
+      if (!rename && MetaStoreServerUtils.columnsIncludedByNameType(oldCols, newCols)) {
         return newPartsColStats;
       }
       List oldColNames = new ArrayList<>(oldCols.size());
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
similarity index 99%
rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
index c6c04b757a..41d3d15152 100644
--- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
@@ -18,7 +18,6 @@
 package org.apache.hadoop.hive.metastore;
 
 import static org.apache.commons.lang.StringUtils.join;
-import static org.apache.hadoop.hive.metastore.ReplChangeManager.SOURCE_OF_REPLICATION;
 import static org.apache.hadoop.hive.metastore.Warehouse.DEFAULT_DATABASE_COMMENT;
 import static org.apache.hadoop.hive.metastore.Warehouse.DEFAULT_DATABASE_NAME;
 import static org.apache.hadoop.hive.metastore.Warehouse.DEFAULT_CATALOG_NAME;
@@ -29,6 +28,7 @@
 import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.DB_NAME;
 import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.prependCatalogToDbName;
 import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.prependNotNullCatToDbName;
+import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.makePartName;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -153,13 +153,14 @@
 import org.apache.hadoop.hive.metastore.security.TUGIContainingTransport;
 import org.apache.hadoop.hive.metastore.txn.TxnStore;
 import org.apache.hadoop.hive.metastore.txn.TxnUtils;
+import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils;
+import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils;
 import org.apache.hadoop.security.SecurityUtil;
 import org.apache.hadoop.hive.metastore.utils.CommonCliOptions;
 import org.apache.hadoop.hive.metastore.utils.FileUtils;
 import org.apache.hadoop.hive.metastore.utils.HdfsUtils;
 import org.apache.hadoop.hive.metastore.utils.JavaUtils;
 import org.apache.hadoop.hive.metastore.utils.LogUtils;
-import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils;
 import org.apache.hadoop.hive.metastore.utils.MetastoreVersionInfo;
 import org.apache.hadoop.hive.metastore.utils.SecurityUtils;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -194,6 +195,11 @@
 
 /**
  * TODO:pc remove application logic to a separate interface.
+ *
+ * 

IMPORTANT

+ * + * The full class name of this class is hardcoded in HiveMetastoreClient and can not be changed + * without corresponding change there. */ public class HiveMetaStore extends ThriftHiveMetastore { public static final Logger LOG = LoggerFactory.getLogger(HiveMetaStore.class); @@ -522,7 +528,7 @@ public Configuration getHiveConf() { @Override public void init() throws MetaException { - initListeners = MetaStoreUtils.getMetaStoreListeners( + initListeners = MetaStoreServerUtils.getMetaStoreListeners( MetaStoreInitListener.class, conf, MetastoreConf.getVar(conf, ConfVars.INIT_HOOKS)); for (MetaStoreInitListener singleInitListener: initListeners) { MetaStoreInitContext context = new MetaStoreInitContext(); @@ -554,20 +560,20 @@ public void init() throws MetaException { } - preListeners = MetaStoreUtils.getMetaStoreListeners(MetaStorePreEventListener.class, + preListeners = MetaStoreServerUtils.getMetaStoreListeners(MetaStorePreEventListener.class, conf, MetastoreConf.getVar(conf, ConfVars.PRE_EVENT_LISTENERS)); preListeners.add(0, new TransactionalValidationListener(conf)); - listeners = MetaStoreUtils.getMetaStoreListeners(MetaStoreEventListener.class, conf, + listeners = MetaStoreServerUtils.getMetaStoreListeners(MetaStoreEventListener.class, conf, MetastoreConf.getVar(conf, ConfVars.EVENT_LISTENERS)); listeners.add(new SessionPropertiesListener(conf)); listeners.add(new AcidEventListener(conf)); - transactionalListeners = MetaStoreUtils.getMetaStoreListeners(TransactionalMetaStoreEventListener.class, + transactionalListeners = MetaStoreServerUtils.getMetaStoreListeners(TransactionalMetaStoreEventListener.class, conf, MetastoreConf.getVar(conf, ConfVars.TRANSACTIONAL_EVENT_LISTENERS)); if (Metrics.getRegistry() != null) { listeners.add(new HMSMetricsListener(conf)); } - endFunctionListeners = MetaStoreUtils.getMetaStoreListeners( + endFunctionListeners = MetaStoreServerUtils.getMetaStoreListeners( MetaStoreEndFunctionListener.class, conf, MetastoreConf.getVar(conf, ConfVars.END_FUNCTION_LISTENERS)); String partitionValidationRegex = @@ -1796,11 +1802,11 @@ private void create_table_core(final RawStore ms, final Table tbl, } SkewedInfo skew = tbl.getSd().getSkewedInfo(); if (skew != null) { - validate = MetaStoreUtils.validateSkewedColNames(skew.getSkewedColNames()); + validate = MetaStoreServerUtils.validateSkewedColNames(skew.getSkewedColNames()); if (validate != null) { throw new InvalidObjectException("Invalid skew column " + validate); } - validate = MetaStoreUtils.validateSkewedColNamesSubsetCol( + validate = MetaStoreServerUtils.validateSkewedColNamesSubsetCol( skew.getSkewedColNames(), tbl.getSd().getCols()); if (validate != null) { throw new InvalidObjectException("Invalid skew column " + validate); @@ -1851,8 +1857,8 @@ private void create_table_core(final RawStore ms, final Table tbl, } } if (MetastoreConf.getBoolVar(conf, ConfVars.STATS_AUTO_GATHER) && - !MetaStoreUtils.isView(tbl)) { - MetaStoreUtils.updateTableStatsSlow(db, tbl, wh, madeDir, false, envContext); + !MetaStoreServerUtils.isView(tbl)) { + MetaStoreServerUtils.updateTableStatsSlow(db, tbl, wh, madeDir, false, envContext); } // set create time @@ -2825,7 +2831,7 @@ public void truncate_table(final String dbName, final String tableName, List partitionKeys, boolean ifNotExists) throws TException { - MetaStoreUtils.validatePartitionNameCharacters(part.getValues(), + MetaStoreServerUtils.validatePartitionNameCharacters(part.getValues(), partitionValidationPattern); boolean doesExist = ms.doesPartitionExist(part.getCatName(), part.getDbName(), part.getTableName(), partitionKeys, part.getValues()); @@ -3720,7 +3726,7 @@ private boolean createLocationForAddedPartition( // set default location if not specified and this is // a physical table partition (not a view) if (tbl.getSd().getLocation() != null) { - partLocation = new Path(tbl.getSd().getLocation(), Warehouse + partLocation = new Path(tbl.getSd().getLocation(), MetaStoreUtils .makePartName(tbl.getPartitionKeys(), part.getValues())); } } else { @@ -3756,8 +3762,8 @@ private void initializeAddedPartition( private void initializeAddedPartition( final Table tbl, final PartitionSpecProxy.PartitionIterator part, boolean madeDir) throws MetaException { if (MetastoreConf.getBoolVar(conf, ConfVars.STATS_AUTO_GATHER) && - !MetaStoreUtils.isView(tbl)) { - MetaStoreUtils.updatePartitionStatsFast(part, tbl, wh, madeDir, false, null, true); + !MetaStoreServerUtils.isView(tbl)) { + MetaStoreServerUtils.updatePartitionStatsFast(part, tbl, wh, madeDir, false, null, true); } // set create time @@ -3971,9 +3977,9 @@ public Partition exchange_partition(Map partitionSpecs, " Their partitions cannot be exchanged."); } Path sourcePath = new Path(sourceTable.getSd().getLocation(), - Warehouse.makePartName(partitionKeysPresent, partValsPresent)); + MetaStoreUtils.makePartName(partitionKeysPresent, partValsPresent)); Path destPath = new Path(destinationTable.getSd().getLocation(), - Warehouse.makePartName(partitionKeysPresent, partValsPresent)); + MetaStoreUtils.makePartName(partitionKeysPresent, partValsPresent)); List destPartitions = new ArrayList<>(); Map transactionalListenerResponsesForAddPartition = Collections.emptyMap(); @@ -3986,7 +3992,7 @@ public Partition exchange_partition(Map partitionSpecs, if (destPartitionNames != null && !destPartitionNames.isEmpty()) { for (Partition partition : partitionsToExchange) { String partToExchangeName = - Warehouse.makePartName(destinationTable.getPartitionKeys(), partition.getValues()); + MetaStoreUtils.makePartName(destinationTable.getPartitionKeys(), partition.getValues()); if (destPartitionNames.contains(partToExchangeName)) { throw new MetaException("The partition " + partToExchangeName + " already exists in the table " + destTableName); @@ -4007,7 +4013,7 @@ public Partition exchange_partition(Map partitionSpecs, destPartition.setDbName(parsedDestDbName[DB_NAME]); destPartition.setTableName(destinationTable.getTableName()); Path destPartitionPath = new Path(destinationTable.getSd().getLocation(), - Warehouse.makePartName(destinationTable.getPartitionKeys(), partition.getValues())); + MetaStoreUtils.makePartName(destinationTable.getPartitionKeys(), partition.getValues())); destPartition.getSd().setLocation(destPartitionPath.toString()); ms.addPartition(destPartition); destPartitions.add(destPartition); @@ -4829,7 +4835,7 @@ private void rename_partition(final String catName, final String db_name, final try { firePreEvent(new PreAlterPartitionEvent(db_name, tbl_name, part_vals, new_part, this)); if (part_vals != null && !part_vals.isEmpty()) { - MetaStoreUtils.validatePartitionNameCharacters(new_part.getValues(), + MetaStoreServerUtils.validatePartitionNameCharacters(new_part.getValues(), partitionValidationPattern); } @@ -6019,7 +6025,7 @@ private String getPartName(HiveObjectRef hiveObject) throws MetaException { getDefaultCatalog(conf); Table table = get_table_core(catName, hiveObject.getDbName(), hiveObject .getObjectName()); - partName = Warehouse + partName = MetaStoreUtils .makePartName(table.getPartitionKeys(), partValue); } catch (NoSuchObjectException e) { throw new MetaException(e.getMessage()); @@ -6457,7 +6463,7 @@ private PrincipalPrivilegeSet get_user_privilege_set(final String userName, return getMS().listPrincipalPartitionColumnGrantsAll(principalName, principalType); } Table tbl = get_table_core(catName, dbName, tableName); - String partName = Warehouse.makePartName(tbl.getPartitionKeys(), partValues); + String partName = MetaStoreUtils.makePartName(tbl.getPartitionKeys(), partValues); if (principalName == null) { return getMS().listPartitionColumnGrantsAll(catName, dbName, tableName, partName, columnName); } @@ -6502,7 +6508,7 @@ private PrincipalPrivilegeSet get_user_privilege_set(final String userName, return getMS().listPrincipalPartitionGrantsAll(principalName, principalType); } Table tbl = get_table_core(catName, dbName, tableName); - String partName = Warehouse.makePartName(tbl.getPartitionKeys(), partValues); + String partName = MetaStoreUtils.makePartName(tbl.getPartitionKeys(), partValues); if (principalName == null) { return getMS().listPartitionGrantsAll(catName, dbName, tableName, partName); } @@ -6852,10 +6858,10 @@ public boolean partition_name_has_valid_characters(List part_vals, Exception ex = null; try { if (throw_exception) { - MetaStoreUtils.validatePartitionNameCharacters(part_vals, partitionValidationPattern); + MetaStoreServerUtils.validatePartitionNameCharacters(part_vals, partitionValidationPattern); ret = true; } else { - ret = MetaStoreUtils.partitionNameHasValidCharacters(part_vals, + ret = MetaStoreServerUtils.partitionNameHasValidCharacters(part_vals, partitionValidationPattern); } } catch (MetaException e) { @@ -7252,7 +7258,7 @@ private void addTxnWriteNotificationLog(Table tableObj, Partition ptnObj, WriteN throws MetaException { String partition = ""; //Empty string is an invalid partition name. Can be used for non partitioned table. if (ptnObj != null) { - partition = Warehouse.makePartName(tableObj.getPartitionKeys(), rqst.getPartitionVals()); + partition = makePartName(tableObj.getPartitionKeys(), rqst.getPartitionVals()); } AcidWriteEvent event = new AcidWriteEvent(partition, tableObj, ptnObj, rqst); getTxnHandler().addWriteNotificationLog(event); @@ -7441,11 +7447,11 @@ public boolean set_aggr_stats_for(SetPartitionsStatsRequest request) throws TExc ColumnStatistics csOld = getMS().getTableColumnStatistics(catName, dbName, tableName, colNames); Table t = getTable(catName, dbName, tableName); // we first use t.getParameters() to prune the stats - MetaStoreUtils.getMergableCols(firstColStats, t.getParameters()); + MetaStoreServerUtils.getMergableCols(firstColStats, t.getParameters()); // we merge those that can be merged if (csOld != null && csOld.getStatsObjSize() != 0 && !firstColStats.getStatsObj().isEmpty()) { - MetaStoreUtils.mergeColStats(firstColStats, csOld); + MetaStoreServerUtils.mergeColStats(firstColStats, csOld); } if (!firstColStats.getStatsObj().isEmpty()) { return update_table_column_statistics(firstColStats); @@ -7467,7 +7473,7 @@ public boolean set_aggr_stats_for(SetPartitionsStatsRequest request) throws TExc for (ColumnStatistics csNew : csNews) { String partName = csNew.getStatsDesc().getPartName(); if (newStatsMap.containsKey(partName)) { - MetaStoreUtils.mergeColStats(csNew, newStatsMap.get(partName)); + MetaStoreServerUtils.mergeColStats(csNew, newStatsMap.get(partName)); } newStatsMap.put(partName, csNew); } @@ -7499,10 +7505,10 @@ public boolean set_aggr_stats_for(SetPartitionsStatsRequest request) throws TExc ColumnStatistics csOld = oldStatsMap.get(entry.getKey()); if (request.isSetNeedMerge() && request.isNeedMerge()) { // we first use getParameters() to prune the stats - MetaStoreUtils.getMergableCols(csNew, mapToPart.get(entry.getKey()).getParameters()); + MetaStoreServerUtils.getMergableCols(csNew, mapToPart.get(entry.getKey()).getParameters()); // we merge those that can be merged if (csOld != null && csOld.getStatsObjSize() != 0 && !csNew.getStatsObj().isEmpty()) { - MetaStoreUtils.mergeColStats(csNew, csOld); + MetaStoreServerUtils.mergeColStats(csNew, csOld); } if (!csNew.getStatsObj().isEmpty()) { ret = ret && updatePartitonColStats(t, csNew); @@ -7585,7 +7591,7 @@ private void authorizeProxyPrivilege() throws Exception { LOG.error("Cannot obtain username", ex); throw ex; } - if (!MetaStoreUtils.checkUserHasHostProxyPrivileges(user, conf, getIPAddress())) { + if (!MetaStoreServerUtils.checkUserHasHostProxyPrivileges(user, conf, getIPAddress())) { throw new MetaException("User " + user + " is not allowed to perform this API call"); } } @@ -8729,6 +8735,19 @@ private static IHMSHandler newRetryingHMSHandler(IHMSHandler baseHandler, Config return RetryingHMSHandler.getProxy(conf, baseHandler, local); } + /** + * Create retrying HMS handler for embedded metastore. + * + *

IMPORTANT

+ * + * This method is called indirectly by HiveMetastoreClient using reflection. It can not be removed + * and its arguments can't be changed without matching change in HiveMetastoreClient. + * + * @param name HMS name + * @param conf configuration to use + * @param local whether it is using local or remote metastore + * @throws MetaException + */ static Iface newRetryingHMSHandler(String name, Configuration conf, boolean local) throws MetaException { HMSHandler baseHandler = new HiveMetaStore.HMSHandler(name, conf, false); diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IExtrapolatePartStatus.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java similarity index 98% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java index 29c98d1fa7..24b004ec9a 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IHMSHandler.java @@ -28,7 +28,6 @@ import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore; import org.apache.hadoop.hive.metastore.txn.TxnStore; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; /** * An interface wrapper for HMSHandler. This interface contains methods that need to be diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreSchemaInfo.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LinearExtrapolatePartStatus.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LockComponentBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/LockRequestBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsCacheCleanerTask.java b/standalone-metastore/metastore-server/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-server/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-server/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsInvalidationCache.java similarity index 98% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsInvalidationCache.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsInvalidationCache.java index fc644f0b63..9a5c8fadbf 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsInvalidationCache.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsInvalidationCache.java @@ -99,6 +99,11 @@ private MaterializationsInvalidationCache() { /** * Get instance of MaterializationsInvalidationCache. * + *

IMPORTANT

+ * + * This method is indirectly called by HiveMetastoreClient using reflection, so neither + * its name nor signature may change without changes there. + * * @return the singleton */ public static MaterializationsInvalidationCache get() { @@ -111,6 +116,11 @@ public static MaterializationsInvalidationCache get() { * The method is synchronized because we want to avoid initializing the invalidation cache * multiple times in embedded mode. This will not happen when we run the metastore remotely * as the method is called only once. + * + *

IMPORTANT

+ * + * This method is indirectly called by HiveMetastoreClient using reflection, so neither + * its name nor signature may change without changes there. */ public synchronized void init(Configuration conf, IHMSHandler handler) { this.conf = conf; diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockHandler.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java similarity index 99% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java index f45b71fb1f..44737d46cc 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java @@ -90,7 +90,8 @@ import org.apache.hadoop.hive.metastore.parser.ExpressionTree.TreeNode; import org.apache.hadoop.hive.metastore.parser.ExpressionTree.TreeVisitor; import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; import org.apache.hive.common.util.BloomFilter; import org.datanucleus.store.rdbms.query.ForwardQueryResult; import org.slf4j.Logger; @@ -381,7 +382,7 @@ public Database getDatabase(String catName, String dbName) throws MetaException{ db.setOwnerType( (null == type || type.trim().isEmpty()) ? null : PrincipalType.valueOf(type)); db.setCatalogName(extractSqlString(dbline[6])); - db.setParameters(MetaStoreUtils.trimMapNulls(dbParams,convertMapNullsToEmptyStrings)); + db.setParameters(MetaStoreServerUtils.trimMapNulls(dbParams,convertMapNullsToEmptyStrings)); if (LOG.isDebugEnabled()){ LOG.debug("getDatabase: directsql returning db " + db.getName() + " locn["+db.getLocationUri() +"] desc [" +db.getDescription() @@ -763,7 +764,7 @@ public void apply(Partition t, Object[] fields) { }}); // Perform conversion of null map values for (Partition t : partitions.values()) { - t.setParameters(MetaStoreUtils.trimMapNulls(t.getParameters(), convertMapNullsToEmptyStrings)); + t.setParameters(MetaStoreServerUtils.trimMapNulls(t.getParameters(), convertMapNullsToEmptyStrings)); } queryText = "select \"PART_ID\", \"PART_KEY_VAL\" from " + PARTITION_KEY_VALS + "" @@ -796,7 +797,7 @@ public void apply(StorageDescriptor t, Object[] fields) { }}); // Perform conversion of null map values for (StorageDescriptor t : sds.values()) { - t.setParameters(MetaStoreUtils.trimMapNulls(t.getParameters(), convertMapNullsToEmptyStrings)); + t.setParameters(MetaStoreServerUtils.trimMapNulls(t.getParameters(), convertMapNullsToEmptyStrings)); } queryText = "select \"SD_ID\", \"COLUMN_NAME\", " + SORT_COLS + ".\"ORDER\"" @@ -938,7 +939,7 @@ public void apply(SerDeInfo t, Object[] fields) { }}); // Perform conversion of null map values for (SerDeInfo t : serdes.values()) { - t.setParameters(MetaStoreUtils.trimMapNulls(t.getParameters(), convertMapNullsToEmptyStrings)); + t.setParameters(MetaStoreServerUtils.trimMapNulls(t.getParameters(), convertMapNullsToEmptyStrings)); } return orderedResult; @@ -1606,7 +1607,7 @@ private long partsFoundForPartitions( List partStats = getPartitionStats(catName, dbName, tableName, partNames, colNames, true); // 2. use util function to aggr stats - return MetaStoreUtils.aggrPartitionStats(partStats, catName, dbName, tableName, partNames, colNames, + return MetaStoreServerUtils.aggrPartitionStats(partStats, catName, dbName, tableName, partNames, colNames, areAllPartsFound, useDensityFunctionForNDVEstimation, ndvTuner); } diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionContext.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEndFunctionListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreEventListenerConstants.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitContext.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInitListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreListenerNotifier.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStorePreEventListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfoFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreThread.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetadataStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java similarity index 99% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java index 8721022282..baf35f96f5 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java @@ -215,6 +215,7 @@ import org.apache.hadoop.hive.metastore.utils.FileUtils; import org.apache.hadoop.hive.metastore.utils.JavaUtils; import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils; import org.apache.hadoop.hive.metastore.utils.ObjectPair; import org.apache.thrift.TException; import org.datanucleus.AbstractNucleusContext; @@ -1979,7 +1980,7 @@ private MTable getMTable(String catName, String db, String table) { /** Makes shallow copy of a map to avoid DataNucleus mucking with our objects. */ private Map convertMap(Map dnMap) { - return MetaStoreUtils.trimMapNulls(dnMap, + return MetaStoreServerUtils.trimMapNulls(dnMap, MetastoreConf.getBoolVar(getConf(), ConfVars.ORM_RETRIEVE_MAPNULLS_AS_EMPTY_STRINGS)); } @@ -2369,7 +2370,7 @@ public boolean addPartitions(String catName, String dbName, String tblName, List private boolean isValidPartition( Partition part, List partitionKeys, boolean ifNotExists) throws MetaException { - MetaStoreUtils.validatePartitionNameCharacters(part.getValues(), + MetaStoreServerUtils.validatePartitionNameCharacters(part.getValues(), partitionValidationPattern); boolean doesExist = doesPartitionExist(part.getCatName(), part.getDbName(), part.getTableName(), partitionKeys, part.getValues()); @@ -2534,7 +2535,7 @@ private MPartition getMPartition(String catName, String dbName, String tableName // Change the query to use part_vals instead of the name which is // redundant TODO: callers of this often get part_vals out of name for no reason... String name = - Warehouse.makePartName(convertToFieldSchemas(mtbl.getPartitionKeys()), part_vals); + MetaStoreUtils.makePartName(convertToFieldSchemas(mtbl.getPartitionKeys()), part_vals); result = getMPartition(catName, dbName, tableName, name); committed = commitTransaction(); } finally { @@ -2654,7 +2655,7 @@ private MPartition convertToMPart(Partition part, MTable mt, boolean useTableCD) msd = convertToMStorageDescriptor(part.getSd()); } - return new MPartition(Warehouse.makePartName(convertToFieldSchemas(mt + return new MPartition(MetaStoreUtils.makePartName(convertToFieldSchemas(mt .getPartitionKeys()), part.getValues()), mt, part.getValues(), part .getCreateTime(), part.getLastAccessTime(), msd, part.getParameters()); @@ -2905,7 +2906,7 @@ private boolean dropPartitionCommon(MPartition part) throws NoSuchObjectExceptio parts.add(part); if ("TRUE".equalsIgnoreCase(mtbl.getParameters().get("PARTITION_LEVEL_PRIVILEGE"))) { - String partName = Warehouse.makePartName(this.convertToFieldSchemas(mtbl + String partName = MetaStoreUtils.makePartName(this.convertToFieldSchemas(mtbl .getPartitionKeys()), part.getValues()); PrincipalPrivilegeSet partAuth = this.getPartitionPrivilegeSet(catName, dbName, tblName, partName, userName, groupNames); @@ -2937,7 +2938,7 @@ public Partition getPartitionWithAuth(String catName, String dbName, String tblN MTable mtbl = mpart.getTable(); part = convertToPart(mpart); if ("TRUE".equalsIgnoreCase(mtbl.getParameters().get("PARTITION_LEVEL_PRIVILEGE"))) { - String partName = Warehouse.makePartName(this.convertToFieldSchemas(mtbl + String partName = MetaStoreUtils.makePartName(this.convertToFieldSchemas(mtbl .getPartitionKeys()), partVals); PrincipalPrivilegeSet partAuth = this.getPartitionPrivilegeSet(catName, dbName, tblName, partName, user_name, group_names); @@ -3097,7 +3098,7 @@ private PartitionValuesResponse extractPartitionNamesByFilter( for (Partition partition : partitions) { // Check for NULL's just to be safe if (tbl.getPartitionKeys() != null && partition.getValues() != null) { - partitionNames.add(Warehouse.makePartName(tbl.getPartitionKeys(), partition.getValues())); + partitionNames.add(MetaStoreUtils.makePartName(tbl.getPartitionKeys(), partition.getValues())); } } } @@ -3338,7 +3339,7 @@ private Collection getPartitionPsQueryResults(String catName, String dbName, Str //set auth privileges if (null != userName && null != groupNames && "TRUE".equalsIgnoreCase(mtbl.getParameters().get("PARTITION_LEVEL_PRIVILEGE"))) { - String partName = Warehouse.makePartName(this.convertToFieldSchemas(mtbl + String partName = MetaStoreUtils.makePartName(this.convertToFieldSchemas(mtbl .getPartitionKeys()), part.getValues()); PrincipalPrivilegeSet partAuth = getPartitionPrivilegeSet(catName, db_name, tbl_name, partName, userName, groupNames); @@ -6182,7 +6183,7 @@ public boolean revokePrivileges(PrivilegeBag privileges, boolean grantOption) Table tabObj = this.getTable(catName, hiveObject.getDbName(), hiveObject.getObjectName()); String partName = null; if (hiveObject.getPartValues() != null) { - partName = Warehouse.makePartName(tabObj.getPartitionKeys(), hiveObject.getPartValues()); + partName = MetaStoreUtils.makePartName(tabObj.getPartitionKeys(), hiveObject.getPartValues()); } List partitionGrants = this .listPrincipalMPartitionGrants(userName, principalType, @@ -6216,7 +6217,7 @@ public boolean revokePrivileges(PrivilegeBag privileges, boolean grantOption) .getObjectName()); String partName = null; if (hiveObject.getPartValues() != null) { - partName = Warehouse.makePartName(tabObj.getPartitionKeys(), + partName = MetaStoreUtils.makePartName(tabObj.getPartitionKeys(), hiveObject.getPartValues()); } @@ -8695,20 +8696,20 @@ protected String describeResult() { } @Override - public List getPartitionColStatsForDatabase(String catName, String dbName) + public List getPartitionColStatsForDatabase(String catName, String dbName) throws MetaException, NoSuchObjectException { final boolean enableBitVector = MetastoreConf.getBoolVar(getConf(), ConfVars.STATS_FETCH_BITVECTOR); - return new GetHelper>(catName, dbName, null, true, false) { + return new GetHelper>(catName, dbName, null, true, false) { @Override - protected List getSqlResult( - GetHelper> ctx) throws MetaException { + protected List getSqlResult( + GetHelper> ctx) throws MetaException { return directSql.getColStatsForAllTablePartitions(catName, dbName, enableBitVector); } @Override - protected List getJdoResult( - GetHelper> ctx) + protected List getJdoResult( + GetHelper> ctx) throws MetaException, NoSuchObjectException { // This is fast path for query optimizations, if we can find this info // quickly using directSql, do it. No point in failing back to slow path @@ -9319,7 +9320,7 @@ public void setMetaStoreSchemaVersion(String schemaVersion, String comment) thro public boolean doesPartitionExist(String catName, String dbName, String tableName, List partKeys, List partVals) throws MetaException { - String name = Warehouse.makePartName(partKeys, partVals); + String name = MetaStoreUtils.makePartName(partKeys, partVals); return this.getMPartition(catName, dbName, tableName, name) != null; } diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PartFilterExprUtil.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PartitionExpressionProxy.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java similarity index 99% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java index 73a518d871..bfc16a24be 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RawStore.java @@ -89,7 +89,7 @@ import org.apache.hadoop.hive.metastore.api.WMTrigger; import org.apache.hadoop.hive.metastore.api.WMValidateResourcePlanResponse; import org.apache.hadoop.hive.metastore.partition.spec.PartitionSpecProxy; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; import org.apache.thrift.TException; public interface RawStore extends Configurable { diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ReplChangeManager.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RetryingHMSHandler.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/RuntimeStatsCleanerTask.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/SessionPropertiesListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TServerSocketKeepAlive.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ThreadPool.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TransactionalMetaStoreEventListener.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java similarity index 99% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java index d9fdd290bb..4705a5cfeb 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java @@ -42,11 +42,13 @@ import org.apache.hadoop.hive.metastore.events.PreEventContext; import org.apache.hadoop.hive.metastore.txn.TxnStore; import org.apache.hadoop.hive.metastore.txn.TxnUtils; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.metastore.utils.HiveStrictManagedUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog; + public final class TransactionalValidationListener extends MetaStorePreEventListener { public static final Logger LOG = LoggerFactory.getLogger(TransactionalValidationListener.class); @@ -92,7 +94,7 @@ private void handle(PreCreateTableEvent context) throws MetaException { private String getTableCatalog(Table table) { String catName = table.isSetCatName() ? table.getCatName() : - MetaStoreUtils.getDefaultCatalog(getConf()); + getDefaultCatalog(getConf()); return catName.toLowerCase(); } diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java similarity index 95% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java index da5a71cc64..e58843fae1 100755 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Warehouse.java @@ -658,11 +658,6 @@ public boolean isDir(Path f) throws MetaException { return true; } - public static String makePartName(List partCols, - List vals) throws MetaException { - return makePartName(partCols, vals, null); - } - /** * @param desc * @return array of FileStatus objects corresponding to the files @@ -708,35 +703,6 @@ public static String makePartName(List partCols, return null; } - /** - * Makes a valid partition name. - * @param partCols The partition columns - * @param vals The partition values - * @param defaultStr - * The default name given to a partition value if the respective value is empty or null. - * @return An escaped, valid partition name. - * @throws MetaException - */ - public static String makePartName(List partCols, - List vals, String defaultStr) throws MetaException { - if ((partCols.size() != vals.size()) || (partCols.size() == 0)) { - String errorStr = "Invalid partition key & values; keys ["; - for (FieldSchema fs : partCols) { - errorStr += (fs.getName() + ", "); - } - errorStr += "], values ["; - for (String val : vals) { - errorStr += (val + ", "); - } - throw new MetaException(errorStr + "]"); - } - List colNames = new ArrayList<>(); - for (FieldSchema col: partCols) { - colNames.add(col.getName()); - } - return FileUtils.makePartName(colNames, vals, defaultStr); - } - public static List getPartValuesFromPartName(String partName) throws MetaException { LinkedHashMap partSpec = Warehouse.makeSpecFromName(partName); diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/api/utils/DecimalUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/ByteArrayWrapper.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CacheUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java similarity index 99% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java index 8ff056f353..9e23a7f1d6 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java @@ -48,7 +48,6 @@ import org.apache.hadoop.hive.metastore.PartitionExpressionProxy; import org.apache.hadoop.hive.metastore.RawStore; import org.apache.hadoop.hive.metastore.TableType; -import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.AggrStats; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.Catalog; @@ -118,7 +117,8 @@ import org.apache.hadoop.hive.metastore.utils.FileUtils; import org.apache.hadoop.hive.metastore.utils.JavaUtils; import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; import org.apache.hadoop.hive.metastore.utils.StringUtils; import org.apache.thrift.TException; import org.slf4j.Logger; @@ -300,7 +300,7 @@ static void prewarm(RawStore rawStore) { Deadline.stopTimer(); List partNames = new ArrayList<>(partitions.size()); for (Partition p : partitions) { - partNames.add(Warehouse.makePartName(table.getPartitionKeys(), p.getValues())); + partNames.add(MetaStoreUtils.makePartName(table.getPartitionKeys(), p.getValues())); } if (!partNames.isEmpty()) { // Get partition column stats for this table @@ -1183,7 +1183,7 @@ public void updateCreationMetadata(String catName, String dbname, String tablena int count = 0; for (Partition part : sharedCache.listCachedPartitions(catName, dbName, tblName, max_parts)) { if (max_parts == -1 || count < max_parts) { - partitionNames.add(Warehouse.makePartName(tbl.getPartitionKeys(), part.getValues())); + partitionNames.add(MetaStoreUtils.makePartName(tbl.getPartitionKeys(), part.getValues())); } } return partitionNames; @@ -1231,7 +1231,7 @@ private boolean getPartitionNamesPrunedByExprNoTxn(Table table, byte[] expr, StringUtils.normalizeIdentifier(table.getDbName()), StringUtils.normalizeIdentifier(table.getTableName()), maxParts); for (Partition part : parts) { - result.add(Warehouse.makePartName(table.getPartitionKeys(), part.getValues())); + result.add(MetaStoreUtils.makePartName(table.getPartitionKeys(), part.getValues())); } if (defaultPartName == null || defaultPartName.isEmpty()) { defaultPartName = MetastoreConf.getVar(getConf(), ConfVars.DEFAULTPARTITIONNAME); @@ -1511,7 +1511,7 @@ public Partition getPartitionWithAuth(String catName, String dbName, String tblN } Partition p = sharedCache.getPartitionFromCache(catName, dbName, tblName, partVals); if (p != null) { - String partName = Warehouse.makePartName(table.getPartitionKeys(), partVals); + String partName = MetaStoreUtils.makePartName(table.getPartitionKeys(), partVals); PrincipalPrivilegeSet privs = getPartitionPrivilegeSet(catName, dbName, tblName, partName, userName, groupNames); p.setPrivileges(privs); @@ -1538,7 +1538,7 @@ public Partition getPartitionWithAuth(String catName, String dbName, String tblN int count = 0; for (Partition part : sharedCache.listCachedPartitions(catName, dbName, tblName, maxParts)) { if (maxParts == -1 || count < maxParts) { - String partName = Warehouse.makePartName(table.getPartitionKeys(), part.getValues()); + String partName = MetaStoreUtils.makePartName(table.getPartitionKeys(), part.getValues()); PrincipalPrivilegeSet privs = getPartitionPrivilegeSet(catName, dbName, tblName, partName, userName, groupNames); part.setPrivileges(privs); @@ -1580,7 +1580,7 @@ public Partition getPartitionWithAuth(String catName, String dbName, String tblN continue; } if (maxParts == -1 || count < maxParts) { - partNames.add(Warehouse.makePartName(table.getPartitionKeys(), part.getValues())); + partNames.add(MetaStoreUtils.makePartName(table.getPartitionKeys(), part.getValues())); count++; } } @@ -1620,7 +1620,7 @@ public Partition getPartitionWithAuth(String catName, String dbName, String tblN continue; } if (maxParts == -1 || count < maxParts) { - String partName = Warehouse.makePartName(table.getPartitionKeys(), part.getValues()); + String partName = MetaStoreUtils.makePartName(table.getPartitionKeys(), part.getValues()); PrincipalPrivilegeSet privs = getPartitionPrivilegeSet(catName, dbName, tblName, partName, userName, groupNames); part.setPrivileges(privs); @@ -1831,7 +1831,7 @@ private MergedColumnStatsForPartitions mergeColStatsForPartitions( } // Note that enableBitVector does not apply here because ColumnStatisticsObj // itself will tell whether bitvector is null or not and aggr logic can automatically apply. - return new MergedColumnStatsForPartitions(MetaStoreUtils.aggrPartitionStats(colStatsMap, + return new MergedColumnStatsForPartitions(MetaStoreServerUtils.aggrPartitionStats(colStatsMap, partNames, areAllPartsFound, useDensityFunctionForNDVEstimation, ndvTuner), partsFound); } diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java similarity index 99% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java index 15b1aa168c..639784e1bb 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java @@ -47,7 +47,7 @@ import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.api.TableMeta; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils; import org.apache.hadoop.hive.metastore.utils.StringUtils; import org.apache.hadoop.hive.ql.util.IncrementalObjectSizeEstimator; import org.apache.hadoop.hive.ql.util.IncrementalObjectSizeEstimator.ObjectEstimator; @@ -685,7 +685,7 @@ private void updateTableObj(Table newTable, SharedCache sharedCache) { } setTable(tblCopy); if (tblCopy.getSd() != null) { - sdHash = MetaStoreUtils.hashStorageDescriptor(tblCopy.getSd(), md); + sdHash = MetaStoreServerUtils.hashStorageDescriptor(tblCopy.getSd(), md); StorageDescriptor sd = tblCopy.getSd(); sharedCache.increSd(sd, sdHash); tblCopy.setSd(null); @@ -703,7 +703,7 @@ private PartitionWrapper makePartitionWrapper(Partition part, SharedCache shared Partition partCopy = part.deepCopy(); PartitionWrapper wrapper; if (part.getSd() != null) { - byte[] sdHash = MetaStoreUtils.hashStorageDescriptor(part.getSd(), md); + byte[] sdHash = MetaStoreServerUtils.hashStorageDescriptor(part.getSd(), md); StorageDescriptor sd = part.getSd(); sharedCache.increSd(sd, sdHash); partCopy.setSd(null); @@ -1122,7 +1122,7 @@ private TableWrapper createTableWrapper(String catName, String dbName, String tb } } if (tbl.getSd() != null) { - byte[] sdHash = MetaStoreUtils.hashStorageDescriptor(tbl.getSd(), md); + byte[] sdHash = MetaStoreServerUtils.hashStorageDescriptor(tbl.getSd(), md); StorageDescriptor sd = tbl.getSd(); increSd(sd, sdHash); tblCopy.setSd(null); diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/CatalogBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java similarity index 94% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java index 2e32cbf3c4..3deeead4be 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ConstraintBuilder.java @@ -17,16 +17,16 @@ */ package org.apache.hadoop.hive.metastore.client.builder; -import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.Table; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import java.util.ArrayList; import java.util.List; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog; + /** * Base builder for all types of constraints. Database name, table name, and column name * must be provided. @@ -59,7 +59,7 @@ protected void checkBuildable(String defaultConstraintName, Configuration conf) if (constraintName == null) { constraintName = tableName + "_" + defaultConstraintName; } - if (catName == null) catName = MetaStoreUtils.getDefaultCatalog(conf); + if (catName == null) catName = getDefaultCatalog(conf); } protected int getNextSeq() { diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java similarity index 96% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java index f3d2182a04..7040207687 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/DatabaseBuilder.java @@ -19,7 +19,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.metastore.IMetaStoreClient; -import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.Catalog; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.MetaException; @@ -32,6 +31,8 @@ import java.util.HashMap; import java.util.Map; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog; + /** * A builder for {@link Database}. The name of the new database is required. Everything else * selects reasonable defaults. @@ -92,7 +93,7 @@ public DatabaseBuilder setOwnerType(PrincipalType ownerType) { public Database build(Configuration conf) throws MetaException { if (name == null) throw new MetaException("You must name the database"); - if (catalogName == null) catalogName = MetaStoreUtils.getDefaultCatalog(conf); + if (catalogName == null) catalogName = getDefaultCatalog(conf); Database db = new Database(name, description, location, params); db.setCatalogName(catalogName); try { diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java similarity index 96% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java index c4c09dcd4f..4b1591f3f9 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/FunctionBuilder.java @@ -35,6 +35,8 @@ import java.util.ArrayList; import java.util.List; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog; + /** * Class for creating Thrift Function objects for tests, and API usage. */ @@ -121,7 +123,7 @@ public Function build(Configuration conf) throws MetaException { } catch (IOException e) { throw MetaStoreUtils.newMetaException(e); } - if (catName == null) catName = MetaStoreUtils.getDefaultCatalog(conf); + if (catName == null) catName = getDefaultCatalog(conf); Function f = new Function(funcName, dbName, className, owner, ownerType, createTime, funcType, resourceUris); f.setCatName(catName); diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/GrantRevokePrivilegeRequestBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectPrivilegeBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/HiveObjectRefBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/ISchemaBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java similarity index 96% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java index d6ee6739f8..b2feb2d1a1 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PartitionBuilder.java @@ -23,7 +23,6 @@ import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.hadoop.hive.metastore.api.Table; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.thrift.TException; import java.util.ArrayList; @@ -31,6 +30,8 @@ import java.util.List; import java.util.Map; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog; + /** * Builder for {@link Partition}. The only requirements are 1. (database name and table name) or table * reference; 2. partition values; 3. whatever {@link StorageDescriptorBuilder} requires. @@ -104,7 +105,7 @@ public Partition build(Configuration conf) throws MetaException { throw new MetaException("table name must be provided"); } if (values == null) throw new MetaException("You must provide partition values"); - if (catName == null) catName = MetaStoreUtils.getDefaultCatalog(conf); + if (catName == null) catName = getDefaultCatalog(conf); Partition p = new Partition(values, dbName, tableName, createTime, lastAccessTime, buildSd(), partParams); p.setCatName(catName); diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/PrivilegeGrantInfoBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/RoleBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLCheckConstraintBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLDefaultConstraintBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLForeignKeyBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLNotNullConstraintBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLPrimaryKeyBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SQLUniqueConstraintBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SchemaVersionBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/SerdeAndColsBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/StorageDescriptorBuilder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java similarity index 97% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java index fed3dda809..fd15930d92 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/client/builder/TableBuilder.java @@ -41,6 +41,8 @@ import java.util.Map; import java.util.Set; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog; + /** * Build a {@link Table}. The database name and table name must be provided, plus whatever is * needed by the underlying {@link StorageDescriptorBuilder}. @@ -201,7 +203,7 @@ public Table build(Configuration conf) throws MetaException { throw MetaStoreUtils.newMetaException(e); } } - if (catName == null) catName = MetaStoreUtils.getDefaultCatalog(conf); + if (catName == null) catName = getDefaultCatalog(conf); Table t = new Table(tableName, dbName, owner, createTime, lastAccessTime, retention, buildSd(), partCols, tableParams, viewOriginalText, viewExpandedText, type); if (rewriteEnabled) t.setRewriteEnabled(true); diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java similarity index 96% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java index c18b4c79bf..c885cf2d44 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BinaryColumnStatsAggregator.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hive.metastore.api.ColumnStatisticsData; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; import org.apache.hadoop.hive.metastore.api.MetaException; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; public class BinaryColumnStatsAggregator extends ColumnStatsAggregator { diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java similarity index 96% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java index 7630183180..6fafab53e0 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/BooleanColumnStatsAggregator.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hive.metastore.api.ColumnStatisticsData; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; import org.apache.hadoop.hive.metastore.api.MetaException; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; public class BooleanColumnStatsAggregator extends ColumnStatsAggregator { diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java similarity index 93% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java index 0beaf60230..c4325763be 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregator.java @@ -23,7 +23,7 @@ import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; import org.apache.hadoop.hive.metastore.api.MetaException; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; public abstract class ColumnStatsAggregator { public boolean useDensityFunctionForNDVEstimation; diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/ColumnStatsAggregatorFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java similarity index 99% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java index e8ff513f50..0968f0f42d 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DateColumnStatsAggregator.java @@ -34,7 +34,7 @@ import org.apache.hadoop.hive.metastore.api.DateColumnStatsData; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.columnstats.cache.DateColumnStatsDataInspector; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java similarity index 91% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java index ac7e8e35f9..643bee5d6a 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DecimalColumnStatsAggregator.java @@ -28,15 +28,14 @@ import org.apache.hadoop.hive.common.ndv.NumDistinctValueEstimator; import org.apache.hadoop.hive.common.ndv.NumDistinctValueEstimatorFactory; -import org.apache.hadoop.hive.metastore.StatObjectConverter; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsData; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; import org.apache.hadoop.hive.metastore.api.DecimalColumnStatsData; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.utils.DecimalUtils; import org.apache.hadoop.hive.metastore.columnstats.cache.DecimalColumnStatsDataInspector; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -102,7 +101,7 @@ public ColumnStatisticsObj aggregate(List colStatsWit (DecimalColumnStatsDataInspector) cso.getStatsData().getDecimalStats(); lowerBound = Math.max(lowerBound, newData.getNumDVs()); higherBound += newData.getNumDVs(); - densityAvgSum += (MetaStoreUtils.decimalToDouble(newData.getHighValue()) - MetaStoreUtils + densityAvgSum += (MetaStoreServerUtils.decimalToDouble(newData.getHighValue()) - MetaStoreServerUtils .decimalToDouble(newData.getLowValue())) / newData.getNumDVs(); if (ndvEstimator != null) { ndvEstimator.mergeEstimators(newData.getNdvEstimator()); @@ -110,13 +109,13 @@ public ColumnStatisticsObj aggregate(List colStatsWit if (aggregateData == null) { aggregateData = newData.deepCopy(); } else { - if (MetaStoreUtils.decimalToDouble(aggregateData.getLowValue()) < MetaStoreUtils + if (MetaStoreServerUtils.decimalToDouble(aggregateData.getLowValue()) < MetaStoreServerUtils .decimalToDouble(newData.getLowValue())) { aggregateData.setLowValue(aggregateData.getLowValue()); } else { aggregateData.setLowValue(newData.getLowValue()); } - if (MetaStoreUtils.decimalToDouble(aggregateData.getHighValue()) > MetaStoreUtils + if (MetaStoreServerUtils.decimalToDouble(aggregateData.getHighValue()) > MetaStoreServerUtils .decimalToDouble(newData.getHighValue())) { aggregateData.setHighValue(aggregateData.getHighValue()); } else { @@ -137,7 +136,7 @@ public ColumnStatisticsObj aggregate(List colStatsWit // We have estimation, lowerbound and higherbound. We use estimation // if it is between lowerbound and higherbound. double densityAvg = densityAvgSum / partNames.size(); - estimation = (long) ((MetaStoreUtils.decimalToDouble(aggregateData.getHighValue()) - MetaStoreUtils + estimation = (long) ((MetaStoreServerUtils.decimalToDouble(aggregateData.getHighValue()) - MetaStoreServerUtils .decimalToDouble(aggregateData.getLowValue())) / densityAvg); if (estimation < lowerBound) { estimation = lowerBound; @@ -170,7 +169,7 @@ public ColumnStatisticsObj aggregate(List colStatsWit String partName = csp.getPartName(); DecimalColumnStatsData newData = cso.getStatsData().getDecimalStats(); if (useDensityFunctionForNDVEstimation) { - densityAvgSum += (MetaStoreUtils.decimalToDouble(newData.getHighValue()) - MetaStoreUtils + densityAvgSum += (MetaStoreServerUtils.decimalToDouble(newData.getHighValue()) - MetaStoreServerUtils .decimalToDouble(newData.getLowValue())) / newData.getNumDVs(); } adjustedIndexMap.put(partName, (double) indexMap.get(partName)); @@ -201,7 +200,7 @@ public ColumnStatisticsObj aggregate(List colStatsWit csd.setDecimalStats(aggregateData); adjustedStatsMap.put(pseudoPartName.toString(), csd); if (useDensityFunctionForNDVEstimation) { - densityAvgSum += (MetaStoreUtils.decimalToDouble(aggregateData.getHighValue()) - MetaStoreUtils + densityAvgSum += (MetaStoreServerUtils.decimalToDouble(aggregateData.getHighValue()) - MetaStoreServerUtils .decimalToDouble(aggregateData.getLowValue())) / aggregateData.getNumDVs(); } // reset everything @@ -220,13 +219,13 @@ public ColumnStatisticsObj aggregate(List colStatsWit if (aggregateData == null) { aggregateData = newData.deepCopy(); } else { - if (MetaStoreUtils.decimalToDouble(aggregateData.getLowValue()) < MetaStoreUtils + if (MetaStoreServerUtils.decimalToDouble(aggregateData.getLowValue()) < MetaStoreServerUtils .decimalToDouble(newData.getLowValue())) { aggregateData.setLowValue(aggregateData.getLowValue()); } else { aggregateData.setLowValue(newData.getLowValue()); } - if (MetaStoreUtils.decimalToDouble(aggregateData.getHighValue()) > MetaStoreUtils + if (MetaStoreServerUtils.decimalToDouble(aggregateData.getHighValue()) > MetaStoreServerUtils .decimalToDouble(newData.getHighValue())) { aggregateData.setHighValue(aggregateData.getHighValue()); } else { @@ -244,7 +243,7 @@ public ColumnStatisticsObj aggregate(List colStatsWit csd.setDecimalStats(aggregateData); adjustedStatsMap.put(pseudoPartName.toString(), csd); if (useDensityFunctionForNDVEstimation) { - densityAvgSum += (MetaStoreUtils.decimalToDouble(aggregateData.getHighValue()) - MetaStoreUtils + densityAvgSum += (MetaStoreServerUtils.decimalToDouble(aggregateData.getHighValue()) - MetaStoreServerUtils .decimalToDouble(aggregateData.getLowValue())) / aggregateData.getNumDVs(); } } @@ -283,8 +282,8 @@ public int compare(Map.Entry o1, double minInd = adjustedIndexMap.get(list.get(0).getKey()); double maxInd = adjustedIndexMap.get(list.get(list.size() - 1).getKey()); double lowValue = 0; - double min = MetaStoreUtils.decimalToDouble(list.get(0).getValue().getLowValue()); - double max = MetaStoreUtils.decimalToDouble(list.get(list.size() - 1).getValue().getLowValue()); + double min = MetaStoreServerUtils.decimalToDouble(list.get(0).getValue().getLowValue()); + double max = MetaStoreServerUtils.decimalToDouble(list.get(list.size() - 1).getValue().getLowValue()); if (minInd == maxInd) { lowValue = min; } else if (minInd < maxInd) { @@ -306,8 +305,8 @@ public int compare(Map.Entry o1, minInd = adjustedIndexMap.get(list.get(0).getKey()); maxInd = adjustedIndexMap.get(list.get(list.size() - 1).getKey()); double highValue = 0; - min = MetaStoreUtils.decimalToDouble(list.get(0).getValue().getHighValue()); - max = MetaStoreUtils.decimalToDouble(list.get(list.size() - 1).getValue().getHighValue()); + min = MetaStoreServerUtils.decimalToDouble(list.get(0).getValue().getHighValue()); + max = MetaStoreServerUtils.decimalToDouble(list.get(list.size() - 1).getValue().getHighValue()); if (minInd == maxInd) { highValue = min; } else if (minInd < maxInd) { diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java similarity index 99% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java index ece77dd51b..bcb5860f58 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/DoubleColumnStatsAggregator.java @@ -33,7 +33,7 @@ import org.apache.hadoop.hive.metastore.api.DoubleColumnStatsData; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.columnstats.cache.DoubleColumnStatsDataInspector; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/IExtrapolatePartStatus.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java similarity index 99% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java index e6823d342a..70a35a8395 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/LongColumnStatsAggregator.java @@ -28,13 +28,12 @@ import org.apache.hadoop.hive.common.ndv.NumDistinctValueEstimator; import org.apache.hadoop.hive.common.ndv.NumDistinctValueEstimatorFactory; -import org.apache.hadoop.hive.metastore.api.ColumnStatistics; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsData; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; import org.apache.hadoop.hive.metastore.api.LongColumnStatsData; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.columnstats.cache.LongColumnStatsDataInspector; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java similarity index 98% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java index 9537647503..d411e02c74 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/aggr/StringColumnStatsAggregator.java @@ -28,13 +28,12 @@ import org.apache.hadoop.hive.common.ndv.NumDistinctValueEstimator; import org.apache.hadoop.hive.common.ndv.NumDistinctValueEstimatorFactory; -import org.apache.hadoop.hive.metastore.api.ColumnStatistics; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsData; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.StringColumnStatsData; import org.apache.hadoop.hive.metastore.columnstats.cache.StringColumnStatsDataInspector; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DateColumnStatsDataInspector.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DecimalColumnStatsDataInspector.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/DoubleColumnStatsDataInspector.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/LongColumnStatsDataInspector.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/cache/StringColumnStatsDataInspector.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BinaryColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/BooleanColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/ColumnStatsMergerFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DateColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/DoubleColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/LongColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/columnstats/merge/StringColumnStatsMerger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/BoneCPDataSourceProvider.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProvider.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DataSourceProviderFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/datasource/package-info.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AbortTxnEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AcidWriteEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddForeignKeyEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddNotNullConstraintEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddPrimaryKeyEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AddUniqueConstraintEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AllocWriteIdEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CommitTxnEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/ConfigChangeEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateFunctionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/CreateTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropConstraintEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadTableEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadhSchemaVersionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddForeignKeyMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddNotNullConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddPrimaryKeyMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AddUniqueConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AllocWriteIdMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AlterTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateFunctionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CreateTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropFunctionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DropTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/EventUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/InsertMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageDeserializer.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/MessageFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/OpenTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/PartitionFiles.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/AndFilter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/BasicFilter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/DatabaseAndTableFilter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/EventBoundaryFilter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/event/filters/MessageFormatFilter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAbortTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAcidWriteMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddForeignKeyMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddNotNullConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddPrimaryKeyMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAddUniqueConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAllocWriteIdMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONAlterTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCommitTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateFunctionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONCreateTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropCatalogMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropConstraintMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropDatabaseMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropFunctionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropPartitionMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONDropTableMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONInsertMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageDeserializer.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONMessageFactory.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/json/JSONOpenTxnMessage.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/JsonReporter.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/JvmPauseMonitor.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/MetricsConstants.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/PerfLogger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MCatalog.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MColumnDescriptor.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MConstraint.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MCreationMetadata.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDatabase.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MDelegationToken.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MFieldSchema.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MFunction.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MISchema.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MMasterKey.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MMetastoreDBProperties.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationLog.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MNotificationNextId.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MOrder.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartition.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MPrincipalDesc.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MResourceUri.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRole.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRoleMap.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MRuntimeStat.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MSchemaVersion.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MSerDeInfo.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MStringList.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTxnWriteNotificationLog.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MType.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MVersionTable.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMMapping.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMPool.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMResourcePlan.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MWMTrigger.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/Filter.g diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/parser/package-info.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DelegationTokenTool.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/MemoryTokenStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/MetastoreDelegationTokenManager.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TUGIContainingTransport.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/ZooKeeperTokenStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveMetaTool.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/HiveSchemaHelper.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/MetastoreSchemaTool.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SQLGenerator.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/SmokeTest.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidCompactionHistoryService.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidHouseKeeperService.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidOpenTxnsCounterService.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/AcidWriteSetService.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionInfo.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java similarity index 99% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java index 3785f89f2d..5197320411 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java @@ -83,6 +83,7 @@ import org.apache.hadoop.hive.metastore.tools.SQLGenerator; import org.apache.hadoop.hive.metastore.utils.JavaUtils; import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils; import org.apache.hadoop.hive.metastore.utils.StringableMap; import org.apache.hadoop.util.StringUtils; import org.slf4j.Logger; @@ -330,7 +331,7 @@ public void setConf(Configuration conf) { maxOpenTxns = MetastoreConf.getIntVar(conf, ConfVars.MAX_OPEN_TXNS); try { - transactionalListeners = MetaStoreUtils.getMetaStoreListeners( + transactionalListeners = MetaStoreServerUtils.getMetaStoreListeners( TransactionalMetaStoreEventListener.class, conf, MetastoreConf.getVar(conf, ConfVars.TRANSACTIONAL_EVENT_LISTENERS)); } catch(MetaException e) { @@ -1275,7 +1276,7 @@ public GetValidWriteIdsResponse getValidWriteIds(GetValidWriteIdsRequest rqst) validTxnList = new ValidReadTxnList(rqst.getValidTxnList()); } else { // Passing 0 for currentTxn means, this validTxnList is not wrt to any txn - validTxnList = TxnUtils.createValidReadTxnList(getOpenTxns(), 0); + validTxnList = TxnCommonUtils.createValidReadTxnList(getOpenTxns(), 0); } try { /** @@ -2788,7 +2789,7 @@ public void cleanupRecords(HiveObjectType type, Database db, Table table, while (partitionIterator.hasNext()) { Partition p = partitionIterator.next(); partVals = p.getValues(); - partName = Warehouse.makePartName(partCols, partVals); + partName = MetaStoreUtils.makePartName(partCols, partVals); buff.append("delete from TXN_COMPONENTS where tc_database='"); buff.append(dbName); diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnStore.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java similarity index 75% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java index fa291d5f20..74e274cb73 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnUtils.java @@ -20,13 +20,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.common.ValidCompactorWriteIdList; import org.apache.hadoop.hive.common.ValidReaderWriteIdList; -import org.apache.hadoop.hive.common.ValidReadTxnList; -import org.apache.hadoop.hive.common.ValidTxnList; import org.apache.hadoop.hive.common.ValidTxnWriteIdList; -import org.apache.hadoop.hive.common.ValidWriteIdList; import org.apache.hadoop.hive.metastore.TransactionalValidationListener; -import org.apache.hadoop.hive.metastore.api.GetOpenTxnsResponse; -import org.apache.hadoop.hive.metastore.api.GetValidWriteIdsResponse; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.api.TableValidWriteIds; import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; @@ -36,7 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collections; import java.util.ArrayList; import java.util.Arrays; import java.util.BitSet; @@ -46,101 +40,6 @@ public class TxnUtils { private static final Logger LOG = LoggerFactory.getLogger(TxnUtils.class); - /** - * Transform a {@link org.apache.hadoop.hive.metastore.api.GetOpenTxnsResponse} to a - * {@link org.apache.hadoop.hive.common.ValidTxnList}. This assumes that the caller intends to - * read the files, and thus treats both open and aborted transactions as invalid. - * @param txns txn list from the metastore - * @param currentTxn Current transaction that the user has open. If this is greater than 0 it - * will be removed from the exceptions list so that the user sees his own - * transaction as valid. - * @return a valid txn list. - */ - public static ValidTxnList createValidReadTxnList(GetOpenTxnsResponse txns, long currentTxn) { - /* - * The highWaterMark should be min(currentTxn,txns.getTxn_high_water_mark()) assuming currentTxn>0 - * otherwise if currentTxn=7 and 8 commits before 7, then 7 will see result of 8 which - * doesn't make sense for Snapshot Isolation. Of course for Read Committed, the list should - * include the latest committed set. - */ - long highWaterMark = (currentTxn > 0) ? Math.min(currentTxn, txns.getTxn_high_water_mark()) - : txns.getTxn_high_water_mark(); - - // Open txns are already sorted in ascending order. This list may or may not include HWM - // but it is guaranteed that list won't have txn > HWM. But, if we overwrite the HWM with currentTxn - // then need to truncate the exceptions list accordingly. - List openTxns = txns.getOpen_txns(); - - // We care only about open/aborted txns below currentTxn and hence the size should be determined - // for the exceptions list. The currentTxn will be missing in openTxns list only in rare case like - // txn is aborted by AcidHouseKeeperService and compactor actually cleans up the aborted txns. - // So, for such cases, we get negative value for sizeToHwm with found position for currentTxn, and so, - // we just negate it to get the size. - int sizeToHwm = (currentTxn > 0) ? Collections.binarySearch(openTxns, currentTxn) : openTxns.size(); - sizeToHwm = (sizeToHwm < 0) ? (-sizeToHwm) : sizeToHwm; - long[] exceptions = new long[sizeToHwm]; - BitSet inAbortedBits = BitSet.valueOf(txns.getAbortedBits()); - BitSet outAbortedBits = new BitSet(); - long minOpenTxnId = Long.MAX_VALUE; - int i = 0; - for (long txn : openTxns) { - // For snapshot isolation, we don't care about txns greater than current txn and so stop here. - // Also, we need not include current txn to exceptions list. - if ((currentTxn > 0) && (txn >= currentTxn)) { - break; - } - if (inAbortedBits.get(i)) { - outAbortedBits.set(i); - } else if (minOpenTxnId == Long.MAX_VALUE) { - minOpenTxnId = txn; - } - exceptions[i++] = txn; - } - return new ValidReadTxnList(exceptions, outAbortedBits, highWaterMark, minOpenTxnId); - } - - /** - * Transform a {@link org.apache.hadoop.hive.metastore.api.GetValidWriteIdsResponse} to a - * {@link org.apache.hadoop.hive.common.ValidTxnWriteIdList}. This assumes that the caller intends to - * read the files, and thus treats both open and aborted transactions as invalid. - * @param currentTxnId current txn ID for which we get the valid write ids list - * @param list valid write ids list from the metastore - * @return a valid write IDs list for the whole transaction. - */ - public static ValidTxnWriteIdList createValidTxnWriteIdList(Long currentTxnId, - List validIds) { - ValidTxnWriteIdList validTxnWriteIdList = new ValidTxnWriteIdList(currentTxnId); - for (TableValidWriteIds tableWriteIds : validIds) { - validTxnWriteIdList.addTableValidWriteIdList(createValidReaderWriteIdList(tableWriteIds)); - } - return validTxnWriteIdList; - } - - /** - * Transform a {@link org.apache.hadoop.hive.metastore.api.TableValidWriteIds} to a - * {@link org.apache.hadoop.hive.common.ValidReaderWriteIdList}. This assumes that the caller intends to - * read the files, and thus treats both open and aborted write ids as invalid. - * @param tableWriteIds valid write ids for the given table from the metastore - * @return a valid write IDs list for the input table - */ - public static ValidReaderWriteIdList createValidReaderWriteIdList(TableValidWriteIds tableWriteIds) { - String fullTableName = tableWriteIds.getFullTableName(); - long highWater = tableWriteIds.getWriteIdHighWaterMark(); - List invalids = tableWriteIds.getInvalidWriteIds(); - BitSet abortedBits = BitSet.valueOf(tableWriteIds.getAbortedBits()); - long[] exceptions = new long[invalids.size()]; - int i = 0; - for (long writeId : invalids) { - exceptions[i++] = writeId; - } - if (tableWriteIds.isSetMinOpenWriteId()) { - return new ValidReaderWriteIdList(fullTableName, exceptions, abortedBits, highWater, - tableWriteIds.getMinOpenWriteId()); - } else { - return new ValidReaderWriteIdList(fullTableName, exceptions, abortedBits, highWater); - } - } - /** * Transform a {@link org.apache.hadoop.hive.metastore.api.TableValidWriteIds} to a * {@link org.apache.hadoop.hive.common.ValidCompactorWriteIdList}. This assumes that the caller intends to @@ -207,6 +106,16 @@ public static TxnStore getTxnStore(Configuration conf) { } } + /** + * Should produce the same result as + * {@link org.apache.hadoop.hive.ql.io.AcidUtils#isAcidTable(org.apache.hadoop.hive.ql.metadata.Table)}. + */ + public static boolean isAcidTable(Table table) { + return TxnUtils.isTransactionalTable(table) && + TransactionalValidationListener.DEFAULT_TRANSACTIONAL_PROPERTY.equals(table.getParameters() + .get(hive_metastoreConstants.TABLE_TRANSACTIONAL_PROPERTIES)); + } + /** * Note, users are responsible for using the correct TxnManager. We do not look at * SessionState.get().getTxnMgr().supportsAcid() here @@ -223,16 +132,6 @@ public static boolean isTransactionalTable(Table table) { return tableIsTransactional != null && tableIsTransactional.equalsIgnoreCase("true"); } - /** - * Should produce the same result as - * {@link org.apache.hadoop.hive.ql.io.AcidUtils#isAcidTable(org.apache.hadoop.hive.ql.metadata.Table)}. - */ - public static boolean isAcidTable(Table table) { - return TxnUtils.isTransactionalTable(table) && - TransactionalValidationListener.DEFAULT_TRANSACTIONAL_PROPERTY.equals(table.getParameters() - .get(hive_metastoreConstants.TABLE_TRANSACTIONAL_PROPERTIES)); - } - /** * Should produce the result as .. */ diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/CommonCliOptions.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/HiveStrictManagedUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/LogUtils.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreServerUtils.java similarity index 50% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreServerUtils.java index cbe89b6827..a1e1caf9f4 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreServerUtils.java @@ -17,24 +17,17 @@ */ package org.apache.hadoop.hive.metastore.utils; -import org.apache.hadoop.hive.common.TableName; -import org.apache.hadoop.hive.metastore.api.WMPoolSchedulingPolicy; - -import com.google.common.base.Joiner; import com.google.common.base.Predicates; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.util.concurrent.ThreadFactoryBuilder; - +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.ListUtils; +import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.hadoop.fs.CommonConfigurationKeysPublic; -import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.StatsSetupConst; -import org.apache.hadoop.hive.metastore.ColumnType; +import org.apache.hadoop.hive.common.TableName; import org.apache.hadoop.hive.metastore.HiveMetaStore; import org.apache.hadoop.hive.metastore.TableType; import org.apache.hadoop.hive.metastore.Warehouse; @@ -52,7 +45,6 @@ import org.apache.hadoop.hive.metastore.api.SkewedInfo; import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.metastore.api.Table; -import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; import org.apache.hadoop.hive.metastore.columnstats.aggr.ColumnStatsAggregator; import org.apache.hadoop.hive.metastore.columnstats.aggr.ColumnStatsAggregatorFactory; import org.apache.hadoop.hive.metastore.columnstats.merge.ColumnStatsMerger; @@ -60,7 +52,6 @@ import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.partition.spec.PartitionSpecProxy; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; -import org.apache.hadoop.security.SaslRpcServer; import org.apache.hadoop.security.authorize.DefaultImpersonationProvider; import org.apache.hadoop.security.authorize.ProxyUsers; import org.apache.hadoop.util.MachineList; @@ -68,8 +59,6 @@ import org.slf4j.LoggerFactory; import javax.annotation.Nullable; - -import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; @@ -77,26 +66,17 @@ import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.Socket; -import java.net.URL; -import java.net.URLClassLoader; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Map.Entry; import java.util.SortedMap; import java.util.SortedSet; -import java.util.StringJoiner; -import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; import java.util.concurrent.Callable; @@ -104,111 +84,12 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.regex.Matcher; import java.util.regex.Pattern; -public class MetaStoreUtils { - /** A fixed date format to be used for hive partition column values. */ - public static final ThreadLocal PARTITION_DATE_FORMAT = - new ThreadLocal() { - @Override - protected DateFormat initialValue() { - DateFormat val = new SimpleDateFormat("yyyy-MM-dd"); - val.setLenient(false); // Without this, 2020-20-20 becomes 2021-08-20. - val.setTimeZone(TimeZone.getTimeZone("UTC")); - return val; - } - }; - // Indicates a type was derived from the deserializer rather than Hive's metadata. - public static final String TYPE_FROM_DESERIALIZER = ""; +public class MetaStoreServerUtils { private static final Charset ENCODING = StandardCharsets.UTF_8; - private static final Logger LOG = LoggerFactory.getLogger(MetaStoreUtils.class); - - // The following two are public for any external users who wish to use them. - /** - * This character is used to mark a database name as having a catalog name prepended. This - * marker should be placed first in the String to make it easy to determine that this has both - * a catalog and a database name. @ is chosen as it is not used in regular expressions. This - * is only intended for use when making old Thrift calls that do not support catalog names. - */ - public static final char CATALOG_DB_THRIFT_NAME_MARKER = '@'; - - /** - * This String is used to seaprate the catalog name from the database name. This should only - * be used in Strings that are prepended with {@link #CATALOG_DB_THRIFT_NAME_MARKER}. # is - * chosen because it is not used in regular expressions. this is only intended for use when - * making old Thrift calls that do not support catalog names. - */ - public static final String CATALOG_DB_SEPARATOR = "#"; - - /** - * Mark a database as being empty (as distinct from null). - */ - public static final String DB_EMPTY_MARKER = "!"; - - public static final String EXTERNAL_TABLE_PURGE = "external.table.purge"; - - // Right now we only support one special character '/'. - // More special characters can be added accordingly in the future. - // NOTE: - // If the following array is updated, please also be sure to update the - // configuration parameter documentation - // HIVE_SUPPORT_SPECICAL_CHARACTERS_IN_TABLE_NAMES in HiveConf as well. - private static final char[] specialCharactersInTableNames = new char[] { '/' }; - - /** - * Catches exceptions that can't be handled and bundles them to MetaException - * - * @param e exception to wrap. - * @throws MetaException wrapper for the exception - */ - public static void logAndThrowMetaException(Exception e) throws MetaException { - String exInfo = "Got exception: " + e.getClass().getName() + " " - + e.getMessage(); - LOG.error(exInfo, e); - LOG.error("Converting exception to MetaException"); - throw new MetaException(exInfo); - } - - public static String encodeTableName(String name) { - // The encoding method is simple, e.g., replace - // all the special characters with the corresponding number in ASCII. - // Note that unicode is not supported in table names. And we have explicit - // checks for it. - StringBuilder sb = new StringBuilder(); - for (char ch : name.toCharArray()) { - if (Character.isLetterOrDigit(ch) || ch == '_') { - sb.append(ch); - } else { - sb.append('-').append((int) ch).append('-'); - } - } - return sb.toString(); - } - - /** - * convert Exception to MetaException, which sets the cause to such exception - * @param e cause of the exception - * @return the MetaException with the specified exception as the cause - */ - public static MetaException newMetaException(Exception e) { - return newMetaException(e != null ? e.getMessage() : null, e); - } - - /** - * convert Exception to MetaException, which sets the cause to such exception - * @param errorMessage the error message for this MetaException - * @param e cause of the exception - * @return the MetaException with the specified exception as the cause - */ - public static MetaException newMetaException(String errorMessage, Exception e) { - MetaException metaException = new MetaException(errorMessage); - if (e != null) { - metaException.initCause(e); - } - return metaException; - } + private static final Logger LOG = LoggerFactory.getLogger(MetaStoreServerUtils.class); /** * Helper function to transform Nulls to empty strings. @@ -456,126 +337,6 @@ private static String getPartitionValWithInvalidCharacter(List partVals, return md.digest(); } - public static List getColumnNamesForTable(Table table) { - List colNames = new ArrayList<>(); - Iterator colsIterator = table.getSd().getColsIterator(); - while (colsIterator.hasNext()) { - colNames.add(colsIterator.next().getName()); - } - return colNames; - } - - public static List getColumnNamesForPartition(Partition partition) { - List colNames = new ArrayList<>(); - Iterator colsIterator = partition.getSd().getColsIterator(); - while (colsIterator.hasNext()) { - colNames.add(colsIterator.next().getName()); - } - return colNames; - } - - /** - * validateName - * - * Checks the name conforms to our standars which are: "[a-zA-z_0-9]+". checks - * this is just characters and numbers and _ - * - * @param name - * the name to validate - * @param conf - * hive configuration - * @return true or false depending on conformance - * if it doesn't match the pattern. - */ - public static boolean validateName(String name, Configuration conf) { - Pattern tpat; - String allowedCharacters = "\\w_"; - if (conf != null - && MetastoreConf.getBoolVar(conf, - MetastoreConf.ConfVars.SUPPORT_SPECICAL_CHARACTERS_IN_TABLE_NAMES)) { - for (Character c : specialCharactersInTableNames) { - allowedCharacters += c; - } - } - tpat = Pattern.compile("[" + allowedCharacters + "]+"); - Matcher m = tpat.matcher(name); - return m.matches(); - } - - /* - * At the Metadata level there are no restrictions on Column Names. - */ - public static boolean validateColumnName(String name) { - return true; - } - - static public String validateTblColumns(List cols) { - for (FieldSchema fieldSchema : cols) { - // skip this, as validateColumnName always returns true - /* - if (!validateColumnName(fieldSchema.getName())) { - return "name: " + fieldSchema.getName(); - } - */ - String typeError = validateColumnType(fieldSchema.getType()); - if (typeError != null) { - return typeError; - } - } - return null; - } - - private static String validateColumnType(String type) { - if (type.equals(TYPE_FROM_DESERIALIZER)) { - return null; - } - int last = 0; - boolean lastAlphaDigit = isValidTypeChar(type.charAt(last)); - for (int i = 1; i <= type.length(); i++) { - if (i == type.length() - || isValidTypeChar(type.charAt(i)) != lastAlphaDigit) { - String token = type.substring(last, i); - last = i; - if (!ColumnType.AllTypes.contains(token)) { - return "type: " + type; - } - break; - } - } - return null; - } - - private static boolean isValidTypeChar(char c) { - return Character.isLetterOrDigit(c) || c == '_'; - } - - /** - * Determines whether a table is an external table. - * - * @param table table of interest - * - * @return true if external - */ - public static boolean isExternalTable(Table table) { - if (table == null) { - return false; - } - Map params = table.getParameters(); - if (params == null) { - return false; - } - - return isExternal(params); - } - - public static boolean isExternal(Map tableParams){ - return isPropertyTrue(tableParams, "EXTERNAL"); - } - - public static boolean isPropertyTrue(Map tableParams, String prop) { - return "TRUE".equalsIgnoreCase(tableParams.get(prop)); - } - // check if stats need to be (re)calculated public static boolean requireCalStats(Partition oldPart, Partition newPart, Table tbl, @@ -701,7 +462,7 @@ public static void updateTableStatsSlow(Database db, Table tbl, Warehouse wh, // The table location already exists and may contain data. // Let's try to populate those stats that don't require full scan. LOG.info("Updating table stats for {}", tbl.getTableName()); - populateQuickStats(fileStatus, params); + MetaStoreUtils.populateQuickStats(fileStatus, params); LOG.info("Updated size of table {} to {}", tbl.getTableName(), params.get(StatsSetupConst.TOTAL_SIZE)); if (environmentContext != null @@ -714,28 +475,6 @@ public static void updateTableStatsSlow(Database db, Table tbl, Warehouse wh, } } - /** This method is invalid for MM and ACID tables unless fileStatus comes from AcidUtils. */ - public static void populateQuickStats(List fileStatus, Map params) { - // Why is this even in metastore? - LOG.trace("Populating quick stats based on {} files", fileStatus.size()); - int numFiles = 0; - long tableSize = 0L; - for (FileStatus status : fileStatus) { - // don't take directories into account for quick stats TODO: wtf? - if (!status.isDir()) { - tableSize += status.getLen(); - numFiles += 1; - } - } - params.put(StatsSetupConst.NUM_FILES, Integer.toString(numFiles)); - params.put(StatsSetupConst.TOTAL_SIZE, Long.toString(tableSize)); - } - - public static void clearQuickStats(Map params) { - params.remove(StatsSetupConst.NUM_FILES); - params.remove(StatsSetupConst.TOTAL_SIZE); - } - public static boolean areSameColumns(List oldCols, List newCols) { return ListUtils.isEqualList(oldCols, newCols); @@ -802,7 +541,7 @@ public static boolean updatePartitionStatsFast(PartitionSpecProxy.PartitionItera LOG.warn("Updating partition stats fast for: " + part.getTableName()); List fileStatus = wh.getFileStatusesForLocation(part.getLocation()); // TODO: this is invalid for ACID tables, and we cannot access AcidUtils here. - populateQuickStats(fileStatus, params); + MetaStoreUtils.populateQuickStats(fileStatus, params); LOG.warn("Updated size to " + params.get(StatsSetupConst.TOTAL_SIZE)); updateBasicState(environmentContext, params); } @@ -834,18 +573,6 @@ public static boolean columnsIncludedByNameType(List oldCols, return true; } - /** Duplicates AcidUtils; used in a couple places in metastore. */ - public static boolean isTransactionalTable(Map params) { - String transactionalProp = params.get(hive_metastoreConstants.TABLE_IS_TRANSACTIONAL); - return (transactionalProp != null && "true".equalsIgnoreCase(transactionalProp)); - } - - /** Duplicates AcidUtils; used in a couple places in metastore. */ - public static boolean isInsertOnlyTableParam(Map params) { - String transactionalProp = params.get(hive_metastoreConstants.TABLE_TRANSACTIONAL_PROPERTIES); - return (transactionalProp != null && "insert_only".equalsIgnoreCase(transactionalProp)); - } - /** * create listener instances as per the configuration. * @@ -889,7 +616,7 @@ public static String validateSkewedColNames(List cols) { return null; } for (String col : cols) { - if (!validateColumnName(col)) { + if (!MetaStoreUtils.validateColumnName(col)) { return col; } } @@ -915,105 +642,6 @@ public static String validateSkewedColNamesSubsetCol(List skewedColNames return copySkewedColNames.toString(); } - public static boolean isNonNativeTable(Table table) { - if (table == null || table.getParameters() == null) { - return false; - } - return (table.getParameters().get(hive_metastoreConstants.META_TABLE_STORAGE) != null); - } - - /** - * Given a list of partition columns and a partial mapping from - * some partition columns to values the function returns the values - * for the column. - * @param partCols the list of table partition columns - * @param partSpec the partial mapping from partition column to values - * @return list of values of for given partition columns, any missing - * values in partSpec is replaced by an empty string - */ - public static List getPvals(List partCols, - Map partSpec) { - List pvals = new ArrayList<>(partCols.size()); - for (FieldSchema field : partCols) { - String val = StringUtils.defaultString(partSpec.get(field.getName())); - pvals.add(val); - } - return pvals; - } - public static String makePartNameMatcher(Table table, List partVals) throws MetaException { - List partCols = table.getPartitionKeys(); - int numPartKeys = partCols.size(); - if (partVals.size() > numPartKeys) { - throw new MetaException("Incorrect number of partition values." - + " numPartKeys=" + numPartKeys + ", part_val=" + partVals); - } - partCols = partCols.subList(0, partVals.size()); - // Construct a pattern of the form: partKey=partVal/partKey2=partVal2/... - // where partVal is either the escaped partition value given as input, - // or a regex of the form ".*" - // This works because the "=" and "/" separating key names and partition key/values - // are not escaped. - String partNameMatcher = Warehouse.makePartName(partCols, partVals, ".*"); - // add ".*" to the regex to match anything else afterwards the partial spec. - if (partVals.size() < numPartKeys) { - partNameMatcher += ".*"; - } - return partNameMatcher; - } - - /** - * @param schema1: The first schema to be compared - * @param schema2: The second schema to be compared - * @return true if the two schemas are the same else false - * for comparing a field we ignore the comment it has - */ - public static boolean compareFieldColumns(List schema1, List schema2) { - if (schema1.size() != schema2.size()) { - return false; - } - Iterator its1 = schema1.iterator(); - Iterator its2 = schema2.iterator(); - while (its1.hasNext()) { - FieldSchema f1 = its1.next(); - FieldSchema f2 = its2.next(); - // The default equals provided by thrift compares the comments too for - // equality, thus we need to compare the relevant fields here. - if (!StringUtils.equals(f1.getName(), f2.getName()) || - !StringUtils.equals(f1.getType(), f2.getType())) { - return false; - } - } - return true; - } - - public static boolean isArchived(Partition part) { - Map params = part.getParameters(); - return "TRUE".equalsIgnoreCase(params.get(hive_metastoreConstants.IS_ARCHIVED)); - } - - public static Path getOriginalLocation(Partition part) { - Map params = part.getParameters(); - assert(isArchived(part)); - String originalLocation = params.get(hive_metastoreConstants.ORIGINAL_LOCATION); - assert( originalLocation != null); - - return new Path(originalLocation); - } - - private static String ARCHIVING_LEVEL = "archiving_level"; - public static int getArchivingLevel(Partition part) throws MetaException { - if (!isArchived(part)) { - throw new MetaException("Getting level of unarchived partition"); - } - - String lv = part.getParameters().get(ARCHIVING_LEVEL); - if (lv != null) { - return Integer.parseInt(lv); - } - // partitions archived before introducing multiple archiving - return part.getValues().size(); - } - public static boolean partitionNameHasValidCharacters(List partVals, Pattern partitionValidationPattern) { return getPartitionValWithInvalidCharacter(partVals, partitionValidationPattern) == null; @@ -1072,77 +700,6 @@ public static void mergeColStats(ColumnStatistics csNew, ColumnStatistics csOld) csNew.setStatsObj(list); } - /** - * Read and return the meta store Sasl configuration. Currently it uses the default - * Hadoop SASL configuration and can be configured using "hadoop.rpc.protection" - * HADOOP-10211, made a backward incompatible change due to which this call doesn't - * work with Hadoop 2.4.0 and later. - * @param conf - * @return The SASL configuration - */ - public static Map getMetaStoreSaslProperties(Configuration conf, boolean useSSL) { - // As of now Hive Meta Store uses the same configuration as Hadoop SASL configuration - - // If SSL is enabled, override the given value of "hadoop.rpc.protection" and set it to "authentication" - // This disables any encryption provided by SASL, since SSL already provides it - String hadoopRpcProtectionVal = conf.get(CommonConfigurationKeysPublic.HADOOP_RPC_PROTECTION); - String hadoopRpcProtectionAuth = SaslRpcServer.QualityOfProtection.AUTHENTICATION.toString(); - - if (useSSL && hadoopRpcProtectionVal != null && !hadoopRpcProtectionVal.equals(hadoopRpcProtectionAuth)) { - LOG.warn("Overriding value of " + CommonConfigurationKeysPublic.HADOOP_RPC_PROTECTION + " setting it from " - + hadoopRpcProtectionVal + " to " + hadoopRpcProtectionAuth + " because SSL is enabled"); - conf.set(CommonConfigurationKeysPublic.HADOOP_RPC_PROTECTION, hadoopRpcProtectionAuth); - } - return HadoopThriftAuthBridge.getBridge().getHadoopSaslProperties(conf); - } - - /** - * Add new elements to the classpath. - * - * @param newPaths - * Array of classpath elements - */ - public static ClassLoader addToClassPath(ClassLoader cloader, String[] newPaths) throws Exception { - URLClassLoader loader = (URLClassLoader) cloader; - List curPath = Arrays.asList(loader.getURLs()); - ArrayList newPath = new ArrayList<>(curPath.size()); - - // get a list with the current classpath components - for (URL onePath : curPath) { - newPath.add(onePath); - } - curPath = newPath; - - for (String onestr : newPaths) { - URL oneurl = urlFromPathString(onestr); - if (oneurl != null && !curPath.contains(oneurl)) { - curPath.add(oneurl); - } - } - - return new URLClassLoader(curPath.toArray(new URL[0]), loader); - } - - /** - * Create a URL from a string representing a path to a local file. - * The path string can be just a path, or can start with file:/, file:/// - * @param onestr path string - * @return - */ - private static URL urlFromPathString(String onestr) { - URL oneurl = null; - try { - if (onestr.startsWith("file:/")) { - oneurl = new URL(onestr); - } else { - oneurl = new File(onestr).toURL(); - } - } catch (Exception err) { - LOG.error("Bad URL " + onestr + ", ignoring path"); - } - return oneurl; - } - /** * Verify if the user is allowed to make DB notification related calls. * Only the superusers defined in the Hadoop proxy user settings have the permission. @@ -1165,343 +722,6 @@ public static boolean checkUserHasHostProxyPrivileges(String user, Configuration return machineList.includes(ipAddress); } - /** - * Convert FieldSchemas to Thrift DDL. - */ - public static String getDDLFromFieldSchema(String structName, - List fieldSchemas) { - StringBuilder ddl = new StringBuilder(); - ddl.append("struct "); - ddl.append(structName); - ddl.append(" { "); - boolean first = true; - for (FieldSchema col : fieldSchemas) { - if (first) { - first = false; - } else { - ddl.append(", "); - } - ddl.append(ColumnType.typeToThriftType(col.getType())); - ddl.append(' '); - ddl.append(col.getName()); - } - ddl.append("}"); - - LOG.trace("DDL: {}", ddl); - return ddl.toString(); - } - - public static Properties getTableMetadata( - org.apache.hadoop.hive.metastore.api.Table table) { - return MetaStoreUtils.getSchema(table.getSd(), table.getSd(), table - .getParameters(), table.getDbName(), table.getTableName(), table.getPartitionKeys()); - } - - public static Properties getPartitionMetadata( - org.apache.hadoop.hive.metastore.api.Partition partition, - org.apache.hadoop.hive.metastore.api.Table table) { - return MetaStoreUtils - .getSchema(partition.getSd(), partition.getSd(), partition - .getParameters(), table.getDbName(), table.getTableName(), - table.getPartitionKeys()); - } - - public static Properties getSchema( - org.apache.hadoop.hive.metastore.api.Partition part, - org.apache.hadoop.hive.metastore.api.Table table) { - return MetaStoreUtils.getSchema(part.getSd(), table.getSd(), table - .getParameters(), table.getDbName(), table.getTableName(), table.getPartitionKeys()); - } - - /** - * Get partition level schema from table level schema. - * This function will use the same column names, column types and partition keys for - * each partition Properties. Their values are copied from the table Properties. This - * is mainly to save CPU and memory. CPU is saved because the first time the - * StorageDescriptor column names are accessed, JDO needs to execute a SQL query to - * retrieve the data. If we know the data will be the same as the table level schema - * and they are immutable, we should just reuse the table level schema objects. - * - * @param sd The Partition level Storage Descriptor. - * @param parameters partition level parameters - * @param tblSchema The table level schema from which this partition should be copied. - * @return the properties - */ - public static Properties getPartSchemaFromTableSchema( - StorageDescriptor sd, - Map parameters, - Properties tblSchema) { - - // Inherent most properties from table level schema and overwrite some properties - // in the following code. - // This is mainly for saving CPU and memory to reuse the column names, types and - // partition columns in the table level schema. - Properties schema = (Properties) tblSchema.clone(); - - // InputFormat - String inputFormat = sd.getInputFormat(); - if (inputFormat == null || inputFormat.length() == 0) { - String tblInput = - schema.getProperty(org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.FILE_INPUT_FORMAT); - if (tblInput == null) { - inputFormat = org.apache.hadoop.mapred.SequenceFileInputFormat.class.getName(); - } else { - inputFormat = tblInput; - } - } - schema.setProperty(org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.FILE_INPUT_FORMAT, - inputFormat); - - // OutputFormat - String outputFormat = sd.getOutputFormat(); - if (outputFormat == null || outputFormat.length() == 0) { - String tblOutput = - schema.getProperty(org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.FILE_OUTPUT_FORMAT); - if (tblOutput == null) { - outputFormat = org.apache.hadoop.mapred.SequenceFileOutputFormat.class.getName(); - } else { - outputFormat = tblOutput; - } - } - schema.setProperty(org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.FILE_OUTPUT_FORMAT, - outputFormat); - - // Location - if (sd.getLocation() != null) { - schema.setProperty(org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_LOCATION, - sd.getLocation()); - } - - // Bucket count - schema.setProperty(org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.BUCKET_COUNT, - Integer.toString(sd.getNumBuckets())); - - if (sd.getBucketCols() != null && sd.getBucketCols().size() > 0) { - schema.setProperty(org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.BUCKET_FIELD_NAME, - Joiner.on(",").join(sd.getBucketCols())); - } - - // SerdeInfo - if (sd.getSerdeInfo() != null) { - - // We should not update the following 3 values if SerDeInfo contains these. - // This is to keep backward compatible with getSchema(), where these 3 keys - // are updated after SerDeInfo properties got copied. - String cols = org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_COLUMNS; - String colTypes = org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_COLUMN_TYPES; - String parts = org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_PARTITION_COLUMNS; - - for (Map.Entry param : sd.getSerdeInfo().getParameters().entrySet()) { - String key = param.getKey(); - if (schema.get(key) != null && - (key.equals(cols) || key.equals(colTypes) || key.equals(parts) || - // skip Druid properties which are used in DruidSerde, since they are also updated - // after SerDeInfo properties are copied. - key.startsWith("druid."))) { - continue; - } - schema.put(key, (param.getValue() != null) ? param.getValue() : StringUtils.EMPTY); - } - - if (sd.getSerdeInfo().getSerializationLib() != null) { - schema.setProperty(ColumnType.SERIALIZATION_LIB, sd.getSerdeInfo().getSerializationLib()); - } - } - - // skipping columns since partition level field schemas are the same as table level's - // skipping partition keys since it is the same as table level partition keys - - if (parameters != null) { - for (Map.Entry e : parameters.entrySet()) { - schema.setProperty(e.getKey(), e.getValue()); - } - } - - return schema; - } - - private static Properties addCols(Properties schema, List cols) { - - StringBuilder colNameBuf = new StringBuilder(); - StringBuilder colTypeBuf = new StringBuilder(); - StringBuilder colComment = new StringBuilder(); - - boolean first = true; - String columnNameDelimiter = getColumnNameDelimiter(cols); - for (FieldSchema col : cols) { - if (!first) { - colNameBuf.append(columnNameDelimiter); - colTypeBuf.append(":"); - colComment.append('\0'); - } - colNameBuf.append(col.getName()); - colTypeBuf.append(col.getType()); - colComment.append((null != col.getComment()) ? col.getComment() : StringUtils.EMPTY); - first = false; - } - schema.setProperty( - org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_COLUMNS, - colNameBuf.toString()); - schema.setProperty(ColumnType.COLUMN_NAME_DELIMITER, columnNameDelimiter); - String colTypes = colTypeBuf.toString(); - schema.setProperty( - org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_COLUMN_TYPES, - colTypes); - schema.setProperty("columns.comments", colComment.toString()); - - return schema; - - } - - public static Properties getSchemaWithoutCols(StorageDescriptor sd, - Map parameters, String databaseName, String tableName, - List partitionKeys) { - Properties schema = new Properties(); - String inputFormat = sd.getInputFormat(); - if (inputFormat == null || inputFormat.length() == 0) { - inputFormat = org.apache.hadoop.mapred.SequenceFileInputFormat.class - .getName(); - } - schema.setProperty( - org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.FILE_INPUT_FORMAT, - inputFormat); - String outputFormat = sd.getOutputFormat(); - if (outputFormat == null || outputFormat.length() == 0) { - outputFormat = org.apache.hadoop.mapred.SequenceFileOutputFormat.class - .getName(); - } - schema.setProperty( - org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.FILE_OUTPUT_FORMAT, - outputFormat); - - schema.setProperty( - org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_NAME, - databaseName + "." + tableName); - - if (sd.getLocation() != null) { - schema.setProperty( - org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_LOCATION, - sd.getLocation()); - } - schema.setProperty( - org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.BUCKET_COUNT, Integer - .toString(sd.getNumBuckets())); - if (sd.getBucketCols() != null && sd.getBucketCols().size() > 0) { - schema.setProperty( - org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.BUCKET_FIELD_NAME, - Joiner.on(",").join(sd.getBucketCols())); - } - if (sd.getSerdeInfo() != null) { - for (Map.Entry param : sd.getSerdeInfo().getParameters().entrySet()) { - schema.put(param.getKey(), (param.getValue() != null) ? param.getValue() : StringUtils.EMPTY); - } - - if (sd.getSerdeInfo().getSerializationLib() != null) { - schema.setProperty(ColumnType.SERIALIZATION_LIB, sd .getSerdeInfo().getSerializationLib()); - } - } - - if (sd.getCols() != null) { - schema.setProperty(ColumnType.SERIALIZATION_DDL, getDDLFromFieldSchema(tableName, sd.getCols())); - } - - String partString = StringUtils.EMPTY; - String partStringSep = StringUtils.EMPTY; - String partTypesString = StringUtils.EMPTY; - String partTypesStringSep = StringUtils.EMPTY; - for (FieldSchema partKey : partitionKeys) { - partString = partString.concat(partStringSep); - partString = partString.concat(partKey.getName()); - partTypesString = partTypesString.concat(partTypesStringSep); - partTypesString = partTypesString.concat(partKey.getType()); - if (partStringSep.length() == 0) { - partStringSep = "/"; - partTypesStringSep = ":"; - } - } - if (partString.length() > 0) { - schema - .setProperty( - org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_PARTITION_COLUMNS, - partString); - schema - .setProperty( - org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_PARTITION_COLUMN_TYPES, - partTypesString); - } - - if (parameters != null) { - for (Map.Entry e : parameters.entrySet()) { - // add non-null parameters to the schema - if ( e.getValue() != null) { - schema.setProperty(e.getKey(), e.getValue()); - } - } - } - - return schema; - } - - public static Properties getSchema( - org.apache.hadoop.hive.metastore.api.StorageDescriptor sd, - org.apache.hadoop.hive.metastore.api.StorageDescriptor tblsd, - Map parameters, String databaseName, String tableName, - List partitionKeys) { - - return addCols(getSchemaWithoutCols(sd, parameters, databaseName, tableName, partitionKeys), tblsd.getCols()); - } - - public static String getColumnNameDelimiter(List fieldSchemas) { - // we first take a look if any fieldSchemas contain COMMA - for (int i = 0; i < fieldSchemas.size(); i++) { - if (fieldSchemas.get(i).getName().contains(",")) { - return String.valueOf(ColumnType.COLUMN_COMMENTS_DELIMITER); - } - } - return String.valueOf(','); - } - - /** - * Convert FieldSchemas to columnNames. - */ - public static String getColumnNamesFromFieldSchema(List fieldSchemas) { - String delimiter = getColumnNameDelimiter(fieldSchemas); - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < fieldSchemas.size(); i++) { - if (i > 0) { - sb.append(delimiter); - } - sb.append(fieldSchemas.get(i).getName()); - } - return sb.toString(); - } - - /** - * Convert FieldSchemas to columnTypes. - */ - public static String getColumnTypesFromFieldSchema( - List fieldSchemas) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < fieldSchemas.size(); i++) { - if (i > 0) { - sb.append(","); - } - sb.append(fieldSchemas.get(i).getType()); - } - return sb.toString(); - } - - public static String getColumnCommentsFromFieldSchema(List fieldSchemas) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < fieldSchemas.size(); i++) { - if (i > 0) { - sb.append(ColumnType.COLUMN_COMMENTS_DELIMITER); - } - sb.append(fieldSchemas.get(i).getComment()); - } - return sb.toString(); - } - public static int startMetaStore() throws Exception { return startMetaStore(HadoopThriftAuthBridge.getBridge(), null); } @@ -1635,41 +855,6 @@ public static String getIndexTableName(String dbName, String baseTblName, String return dbName + "__" + baseTblName + "_" + indexName + "__"; } - public static boolean isMaterializedViewTable(Table table) { - if (table == null) { - return false; - } - return TableType.MATERIALIZED_VIEW.toString().equals(table.getTableType()); - } - - public static List getColumnNames(List schema) { - List cols = new ArrayList<>(schema.size()); - for (FieldSchema fs : schema) { - cols.add(fs.getName()); - } - return cols; - } - - public static boolean isValidSchedulingPolicy(String str) { - try { - parseSchedulingPolicy(str); - return true; - } catch (IllegalArgumentException ex) { - } - return false; - } - - public static WMPoolSchedulingPolicy parseSchedulingPolicy(String schedulingPolicy) { - if (schedulingPolicy == null) { - return WMPoolSchedulingPolicy.FAIR; - } - schedulingPolicy = schedulingPolicy.trim().toUpperCase(); - if ("DEFAULT".equals(schedulingPolicy)) { - return WMPoolSchedulingPolicy.FAIR; - } - return Enum.valueOf(WMPoolSchedulingPolicy.class, schedulingPolicy); - } - // ColumnStatisticsObj with info about its db, table, partition (if table is partitioned) public static class ColStatsObjWithSourceInfo { private final ColumnStatisticsObj colStatsObj; @@ -1708,109 +893,4 @@ public String getPartName() { } } - private static boolean hasCatalogName(String dbName) { - return dbName != null && dbName.length() > 0 && - dbName.charAt(0) == CATALOG_DB_THRIFT_NAME_MARKER; - } - - /** - * Given a catalog name and database name cram them together into one string. This method can - * be used if you do not know the catalog name, in which case the default catalog will be - * retrieved from the conf object. The resulting string can be parsed apart again via - * {@link #parseDbName(String, Configuration)}. - * @param catalogName catalog name, can be null if no known. - * @param dbName database name, can be null or empty. - * @param conf configuration object, used to determine default catalog if catalogName is null - * @return one string that contains both. - */ - public static String prependCatalogToDbName(@Nullable String catalogName, @Nullable String dbName, - Configuration conf) { - if (catalogName == null) catalogName = getDefaultCatalog(conf); - StringBuilder buf = new StringBuilder() - .append(CATALOG_DB_THRIFT_NAME_MARKER) - .append(catalogName) - .append(CATALOG_DB_SEPARATOR); - if (dbName != null) { - if (dbName.isEmpty()) buf.append(DB_EMPTY_MARKER); - else buf.append(dbName); - } - return buf.toString(); - } - - /** - * Given a catalog name and database name, cram them together into one string. These can be - * parsed apart again via {@link #parseDbName(String, Configuration)}. - * @param catalogName catalog name. This cannot be null. If this might be null use - * {@link #prependCatalogToDbName(String, String, Configuration)} instead. - * @param dbName database name. - * @return one string that contains both. - */ - public static String prependNotNullCatToDbName(String catalogName, String dbName) { - assert catalogName != null; - return prependCatalogToDbName(catalogName, dbName, null); - } - - /** - * Prepend the default 'hive' catalog onto the database name. - * @param dbName database name - * @param conf configuration object, used to determine default catalog - * @return one string with the 'hive' catalog name prepended. - */ - public static String prependCatalogToDbName(String dbName, Configuration conf) { - return prependCatalogToDbName(null, dbName, conf); - } - - private final static String[] nullCatalogAndDatabase = {null, null}; - - /** - * Parse the catalog name out of the database name. If no catalog name is present then the - * default catalog (as set in configuration file) will be assumed. - * @param dbName name of the database. This may or may not contain the catalog name. - * @param conf configuration object, used to determine the default catalog if it is not present - * in the database name. - * @return an array of two elements, the first being the catalog name, the second the database - * name. - * @throws MetaException if the name is not either just a database name or a catalog plus - * database name with the proper delimiters. - */ - public static String[] parseDbName(String dbName, Configuration conf) throws MetaException { - if (dbName == null) return nullCatalogAndDatabase; - if (hasCatalogName(dbName)) { - if (dbName.endsWith(CATALOG_DB_SEPARATOR)) { - // This means the DB name is null - return new String[] {dbName.substring(1, dbName.length() - 1), null}; - } else if (dbName.endsWith(DB_EMPTY_MARKER)) { - // This means the DB name is empty - return new String[] {dbName.substring(1, dbName.length() - DB_EMPTY_MARKER.length() - 1), ""}; - } - String[] names = dbName.substring(1).split(CATALOG_DB_SEPARATOR, 2); - if (names.length != 2) { - throw new MetaException(dbName + " is prepended with the catalog marker but does not " + - "appear to have a catalog name in it"); - } - return names; - } else { - return new String[] {getDefaultCatalog(conf), dbName}; - } - } - - /** - * Position in the array returned by {@link #parseDbName} that has the catalog name. - */ - public static final int CAT_NAME = 0; - /** - * Position in the array returned by {@link #parseDbName} that has the database name. - */ - public static final int DB_NAME = 1; - - public static String getDefaultCatalog(Configuration conf) { - if (conf == null) { - LOG.warn("Configuration is null, so going with default catalog."); - return Warehouse.DEFAULT_CATALOG_NAME; - } - String catName = MetastoreConf.getVar(conf, MetastoreConf.ConfVars.CATALOG_DEFAULT); - if (catName == null || "".equals(catName)) catName = Warehouse.DEFAULT_CATALOG_NAME; - return catName; - } - } diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetastoreVersionInfo.java diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java similarity index 100% rename from standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java rename to standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/StringableMap.java diff --git a/standalone-metastore/src/main/protobuf/org/apache/hadoop/hive/metastore/metastore.proto b/standalone-metastore/metastore-server/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-server/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-server/src/main/resources/datanucleus-log4j.properties similarity index 100% rename from standalone-metastore/src/main/resources/datanucleus-log4j.properties rename to standalone-metastore/metastore-server/src/main/resources/datanucleus-log4j.properties diff --git a/standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties b/standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties new file mode 100644 index 0000000000..ec5039b4fb --- /dev/null +++ b/standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties @@ -0,0 +1,71 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +status = INFO +name = MetastoreLog4j2 +packages = org.apache.hadoop.hive.metastore + +# list of properties +property.metastore.log.level = INFO +property.metastore.root.logger = DRFA +property.metastore.log.dir = ${sys:java.io.tmpdir}/${sys:user.name} +property.metastore.log.file = metastore.log +property.hive.perflogger.log.level = INFO + +# list of all appenders +appenders = console, DRFA + +# console appender +appender.console.type = Console +appender.console.name = console +appender.console.target = SYSTEM_ERR +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n + +# daily rolling file appender +appender.DRFA.type = RollingRandomAccessFile +appender.DRFA.name = DRFA +appender.DRFA.fileName = ${sys:metastore.log.dir}/${sys:metastore.log.file} +# Use %pid in the filePattern to append @ to the filename if you want separate log files for different CLI session +appender.DRFA.filePattern = ${sys:metastore.log.dir}/${sys:metastore.log.file}.%d{yyyy-MM-dd} +appender.DRFA.layout.type = PatternLayout +appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n +appender.DRFA.policies.type = Policies +appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy +appender.DRFA.policies.time.interval = 1 +appender.DRFA.policies.time.modulate = true +appender.DRFA.strategy.type = DefaultRolloverStrategy +appender.DRFA.strategy.max = 30 + +# list of all loggers +loggers = DataNucleus, Datastore, JPOX, PerfLogger + +logger.DataNucleus.name = DataNucleus +logger.DataNucleus.level = ERROR + +logger.Datastore.name = Datastore +logger.Datastore.level = ERROR + +logger.JPOX.name = JPOX +logger.JPOX.level = ERROR + +logger.PerfLogger.name = org.apache.hadoop.hive.ql.log.PerfLogger +logger.PerfLogger.level = ${sys:hive.perflogger.log.level} + +# root logger +rootLogger.level = ${sys:metastore.log.level} +rootLogger.appenderRefs = root +rootLogger.appenderRef.root.ref = ${sys:metastore.root.logger} diff --git a/standalone-metastore/src/main/resources/metastore-site.xml b/standalone-metastore/metastore-server/src/main/resources/metastore-site.xml similarity index 100% rename from standalone-metastore/src/main/resources/metastore-site.xml rename to standalone-metastore/metastore-server/src/main/resources/metastore-site.xml diff --git a/standalone-metastore/src/main/resources/package.jdo b/standalone-metastore/metastore-server/src/main/resources/package.jdo similarity index 100% rename from standalone-metastore/src/main/resources/package.jdo rename to standalone-metastore/metastore-server/src/main/resources/package.jdo diff --git a/standalone-metastore/metastore-server/src/main/resources/saveVersion.sh b/standalone-metastore/metastore-server/src/main/resources/saveVersion.sh new file mode 100755 index 0000000000..0d1a463fdd --- /dev/null +++ b/standalone-metastore/metastore-server/src/main/resources/saveVersion.sh @@ -0,0 +1,91 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# This file is used to generate the package-info.java class that +# records the version, revision, branch, user, timestamp, and url +unset LANG +unset LC_CTYPE +unset LC_TIME +version=$1 +shortversion=$2 +src_dir=$3 +revision=$4 +branch=$5 +url=$6 +user=`whoami` +date=`date` +dir=`pwd` +cwd=`dirname $dir` +if [ "$revision" = "" ]; then + if git rev-parse HEAD 2>/dev/null > /dev/null ; then + revision=`git log -1 --pretty=format:"%H"` + hostname=`hostname` + branch=`git branch | sed -n -e 's/^* //p'` + url="git://${hostname}${cwd}" + elif [ -d .svn ]; then + revision=`svn info ../ | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'` + url=`svn info ../ | sed -n -e 's/^URL: \(.*\)/\1/p'` + # Get canonical branch (branches/X, tags/X, or trunk) + branch=`echo $url | sed -n -e 's,.*\(branches/.*\)$,\1,p' \ + -e 's,.*\(tags/.*\)$,\1,p' \ + -e 's,.*trunk$,trunk,p'` + else + revision="Unknown" + branch="Unknown" + url="file://$cwd" + fi +fi +if [ "$branch" = "" ]; then + branch="Unknown" +fi +if [ "$url" = "" ]; then + url="file://$cwd" +fi + +if [ -x /sbin/md5 ]; then + md5="/sbin/md5" +else + md5="md5sum" +fi + +srcChecksum=`find ../ -name '*.java' | grep -v generated-sources | LC_ALL=C sort | xargs $md5 | $md5 | cut -d ' ' -f 1` + +mkdir -p $src_dir/gen/version/org/apache/hadoop/hive/metastore/annotation + +# In Windows, all the following string ends with \r, need to get rid of them +branch=`echo $branch | tr -d '\r'` +user=`echo $user | tr -d '\r'` +date=`echo $date | tr -d '\r'` +url=`echo $url | tr -d '\r'` +srcChecksum=`echo $srcChecksum | tr -d '\r'` + +cat << EOF | \ + sed -e "s/VERSION/$version/" -e "s/SHORTVERSION/$shortversion/" \ + -e "s/USER/$user/" -e "s/DATE/$date/" \ + -e "s|URL|$url|" -e "s/REV/$revision/" \ + -e "s|BRANCH|$branch|" -e "s/SRCCHECKSUM/$srcChecksum/" \ + > $src_dir/gen/version/org/apache/hadoop/hive/metastore/annotation/package-info.java +/* + * Generated by saveVersion.sh + */ +@MetastoreVersionAnnotation(version="VERSION", shortVersion="SHORTVERSION", + revision="REV", branch="BRANCH", + user="USER", date="DATE", url="URL", + srcChecksum="SRCCHECKSUM") +package org.apache.hadoop.hive.metastore.annotation; +EOF diff --git a/standalone-metastore/metastore-server/src/main/resources/thrift-replacements.txt b/standalone-metastore/metastore-server/src/main/resources/thrift-replacements.txt new file mode 100644 index 0000000000..f44e0c7c6c --- /dev/null +++ b/standalone-metastore/metastore-server/src/main/resources/thrift-replacements.txt @@ -0,0 +1,106 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +################################################################################################### +# # +# 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/metastore-server/pom.xml for the thriftif profile. # +# Usage: thriftif profile automatically refers to this file. # +# # +################################################################################################### + +# Fix constructors and setters of String instance fields + +org.apache.hadoop.hive.metastore.utils.StringUtils.intern(name); +this\.name\ \=\ name;=this.name\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(name); +this\.serializationLib\ \=\ serializationLib;=this.serializationLib\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(serializationLib); +this\.type\ \=\ type;=this.type\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(type); +this\.comment\ \=\ comment;=this.comment\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(comment); +this\.location\ \=\ location;=this.location\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(location); +this\.inputFormat\ \=\ inputFormat;=this.inputFormat\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(inputFormat); +this\.outputFormat\ \=\ outputFormat;=this.outputFormat\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(outputFormat); +this\.dbName\ \=\ dbName;=this.dbName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(dbName); +this\.tableName\ \=\ tableName;=this.tableName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(tableName); +this\.catName\ \=\ catName;=this\.catName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(catName); +this\.serializerClass\ \=\ serializerClass;=this\.serializerClass\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(serializerClass); +this\.deserializerClass\ \=\ deserializerClass;=this\.deserializerClass\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(deserializerClass); +this\.colName\ \=\ colName;=this\.colName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(colName); +this\.colType\ \=\ colType;=this\.colType\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(colType); + +# Fix constructors and setters of List instance fields + +this\.bucketCols\ \=\ bucketCols;=this.bucketCols\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(bucketCols); + +# Fix constructors and setters of Map instance fields + +this\.parameters\ \=\ parameters;=this.parameters\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(parameters); + +# Fix copy constructors + +this\.name\ \=\ other\.name;=this.name\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.name); +this\.serializationLib\ \=\ other\.serializationLib;=this.serializationLib\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.serializationLib); +this\.type\ \=\ other\.type;=this.type\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.type); +this\.comment\ \=\ other\.comment;=this.comment\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.comment); +this\.location\ \=\ other\.location;=this.location\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.location); +this\.inputFormat\ \=\ other\.inputFormat;=this.inputFormat\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.inputFormat); +this\.outputFormat\ \=\ other\.outputFormat;=this.outputFormat\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.outputFormat); +this\.dbName\ \=\ other\.dbName;=this.dbName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.dbName); +this\.tableName\ \=\ other\.tableName;=this.tableName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.tableName); +this\.catName\ \=\ other\.catName;=this\.catName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.catName); +this\.serializerClass\ \=\ other\.serializerClass;=this\.serializerClass\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.serializerClass); +this\.deserializerClass\ \=\ other\.deserializerClass;=this\.deserializerClass\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.deserializerClass); +this\.colName\ \=\ other\.colName;=this\.colName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.colName); +this\.colType\ \=\ other\.colType;=this\.colType\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.colType); + +__this__parameters_copy_key\ \=\ other_element_key;=__this__parameters_copy_key\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other_element_key); +__this__parameters_copy_value\ \=\ other_element_value;=__this__parameters_copy_value\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other_element_value); +__this_values\.add(other_element);=__this_values.add(org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other_element)); + +# Fix methods in Partition.java that call Map.put(String key, String value) + +this\.parameters\.put\(key,\ val\);=this.parameters.put(org.apache.hadoop.hive.metastore.utils.StringUtils.intern(key),\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(val)); + +# Fix the deserialization methods in Partitions.java: intern parameters after it's deserialized + +struct\.setParametersIsSet\(true\);=struct.parameters\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters);\ struct.setParametersIsSet(true); + +# Fix the StandardScheme read method which deserializes the fields into the thrift objects + +# PartitionStandardScheme - parameters are already interned above +struct\.dbName\ \=\ iprot\.readString\(\);=struct\.dbName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); +struct\.tableName\ \=\ iprot\.readString\(\);=struct\.tableName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); +struct\.catName\ \=\ iprot\.readString\(\);=struct\.catName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); + +# StorageDescriptorStandardScheme - parameters are already interned above +struct\.location\ \=\ iprot\.readString\(\);=struct\.location\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); +struct\.inputFormat\ \=\ iprot\.readString\(\);=struct\.inputFormat\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); +struct\.outputFormat\ \=\ iprot\.readString\(\);=struct\.outputFormat\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); +struct\.setBucketColsIsSet\(true\);=struct\.bucketCols\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.bucketCols);\ struct.setBucketColsIsSet(true); + +# SerDeInfoStandardScheme - parameters are already interned above +struct\.name\ \=\ iprot\.readString\(\);=struct\.name\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); +struct\.serializationLib\ \=\ iprot\.readString\(\);=struct\.serializationLib\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); +struct\.serializerClass\ \=\ iprot\.readString\(\);=struct\.serializerClass\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); +struct\.deserializerClass\ \=\ iprot\.readString\(\);=struct\.deserializerClass\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); + +# FieldSchemaStandardScheme - name field gets automatically handled above +struct\.type\ \=\ iprot\.readString\(\);=struct\.type\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); +struct\.comment\ \=\ iprot\.readString\(\);=struct\.comment\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); + +# ColumnStatisticsObjStandardScheme +struct\.colName\ \=\ iprot\.readString\(\);=struct\.colName\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); +struct\.colType\ \=\ iprot\.readString\(\);=struct\.colType\ \=\ org.apache.hadoop.hive.metastore.utils.StringUtils.intern(iprot\.readString\(\)); \ No newline at end of file diff --git a/standalone-metastore/src/main/scripts/base b/standalone-metastore/metastore-server/src/main/scripts/base similarity index 98% rename from standalone-metastore/src/main/scripts/base rename to standalone-metastore/metastore-server/src/main/scripts/base index 2e37383242..a5a7cbfe6c 100755 --- a/standalone-metastore/src/main/scripts/base +++ b/standalone-metastore/metastore-server/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}/metastore-server*.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-server/src/main/scripts/ext/metastore.sh similarity index 96% rename from standalone-metastore/src/main/scripts/ext/metastore.sh rename to standalone-metastore/metastore-server/src/main/scripts/ext/metastore.sh index 6b12991e43..812b822ea1 100644 --- a/standalone-metastore/src/main/scripts/ext/metastore.sh +++ b/standalone-metastore/metastore-server/src/main/scripts/ext/metastore.sh @@ -22,7 +22,7 @@ metastore() { if $cygwin; then METASTORE_LIB=`cygpath -w "$METASTORE_LIB"` fi - JAR=${METASTORE_LIB}/hive-standalone-metastore-*.jar + JAR=${METASTORE_LIB}/metastore-server*.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-server/src/main/scripts/ext/schemaTool.sh similarity index 95% rename from standalone-metastore/src/main/scripts/ext/schemaTool.sh rename to standalone-metastore/metastore-server/src/main/scripts/ext/schemaTool.sh index bfc8d789da..b758c7dc0b 100644 --- a/standalone-metastore/src/main/scripts/ext/schemaTool.sh +++ b/standalone-metastore/metastore-server/src/main/scripts/ext/schemaTool.sh @@ -22,7 +22,7 @@ schemaTool() { if $cygwin; then METASTORE_LIB=`cygpath -w "$METASTORE_LIB"` fi - JAR=${METASTORE_LIB}/hive-standalone-metastore-*.jar + JAR=${METASTORE_LIB}/metastore-server*.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-server/src/main/scripts/ext/smokeTest.sh similarity index 95% rename from standalone-metastore/src/main/scripts/ext/smokeTest.sh rename to standalone-metastore/metastore-server/src/main/scripts/ext/smokeTest.sh index ef000e9b5b..3e57db5f1f 100644 --- a/standalone-metastore/src/main/scripts/ext/smokeTest.sh +++ b/standalone-metastore/metastore-server/src/main/scripts/ext/smokeTest.sh @@ -22,7 +22,7 @@ smokeTest() { if $cygwin; then METASTORE_LIB=`cygpath -w "$METASTORE_LIB"` fi - JAR=${METASTORE_LIB}/hive-standalone-metastore-*.jar + JAR=${METASTORE_LIB}/metastore-server*.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-server/src/main/scripts/metastore-config.sh similarity index 100% rename from standalone-metastore/src/main/scripts/metastore-config.sh rename to standalone-metastore/metastore-server/src/main/scripts/metastore-config.sh diff --git a/standalone-metastore/src/main/scripts/schematool b/standalone-metastore/metastore-server/src/main/scripts/schematool similarity index 100% rename from standalone-metastore/src/main/scripts/schematool rename to standalone-metastore/metastore-server/src/main/scripts/schematool diff --git a/standalone-metastore/src/main/scripts/start-metastore b/standalone-metastore/metastore-server/src/main/scripts/start-metastore similarity index 100% rename from standalone-metastore/src/main/scripts/start-metastore rename to standalone-metastore/metastore-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/src/main/sql/derby/upgrade.order.derby diff --git a/standalone-metastore/src/main/sql/mssql/create-user.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/create-user.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/create-user.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/create-user.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-1.2.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql diff --git a/standalone-metastore/src/main/sql/mssql/upgrade.order.mssql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql similarity index 100% rename from standalone-metastore/src/main/sql/mssql/upgrade.order.mssql rename to standalone-metastore/metastore-server/src/main/sql/mssql/upgrade.order.mssql diff --git a/standalone-metastore/src/main/sql/mysql/create-user.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/create-user.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/create-user.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/create-user.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-1.2.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql diff --git a/standalone-metastore/src/main/sql/mysql/upgrade.order.mysql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql similarity index 100% rename from standalone-metastore/src/main/sql/mysql/upgrade.order.mysql rename to standalone-metastore/metastore-server/src/main/sql/mysql/upgrade.order.mysql diff --git a/standalone-metastore/src/main/sql/oracle/create-user.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/create-user.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/create-user.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/create-user.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-1.2.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.2.0-to-2.3.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.0.0-to-3.1.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.1.0-to-4.0.0.oracle.sql diff --git a/standalone-metastore/src/main/sql/oracle/upgrade.order.oracle b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle similarity index 100% rename from standalone-metastore/src/main/sql/oracle/upgrade.order.oracle rename to standalone-metastore/metastore-server/src/main/sql/oracle/upgrade.order.oracle diff --git a/standalone-metastore/src/main/sql/postgres/create-user.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/create-user.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/create-user.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/create-user.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-1.2.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.2.0-to-2.3.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.0.0-to-3.1.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.1.0-to-4.0.0.postgres.sql diff --git a/standalone-metastore/src/main/sql/postgres/upgrade.order.postgres b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres similarity index 100% rename from standalone-metastore/src/main/sql/postgres/upgrade.order.postgres rename to standalone-metastore/metastore-server/src/main/sql/postgres/upgrade.order.postgres diff --git a/standalone-metastore/src/main/thrift/hive_metastore.thrift b/standalone-metastore/metastore-server/src/main/thrift/hive_metastore.thrift similarity index 100% rename from standalone-metastore/src/main/thrift/hive_metastore.thrift rename to standalone-metastore/metastore-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java similarity index 99% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java index 2454479bf6..3da0ed2494 100644 --- a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java @@ -87,7 +87,7 @@ import org.apache.hadoop.hive.metastore.api.WMPool; import org.apache.hadoop.hive.metastore.api.WriteEventInfo; import org.apache.hadoop.hive.metastore.partition.spec.PartitionSpecProxy; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.ColStatsObjWithSourceInfo; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.ColStatsObjWithSourceInfo; import org.apache.thrift.TException; /** diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java similarity index 99% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java index 9b79446dae..5b8b6b56e3 100644 --- a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java @@ -86,7 +86,7 @@ import org.apache.hadoop.hive.metastore.api.WriteEventInfo; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.partition.spec.PartitionSpecProxy; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils; import org.apache.thrift.TException; import org.junit.Assert; @@ -1092,7 +1092,7 @@ public void dropWMTriggerToPoolMapping(String resourcePlanName, String triggerNa } @Override - public List getPartitionColStatsForDatabase(String catName, String dbName) + public List getPartitionColStatsForDatabase(String catName, String dbName) throws MetaException, NoSuchObjectException { // TODO Auto-generated method stub return null; diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java similarity index 99% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java index 53c4d24ae0..011bef718b 100644 --- a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java @@ -19,7 +19,11 @@ package org.apache.hadoop.hive.metastore; import static org.apache.hadoop.hive.metastore.Warehouse.DEFAULT_DATABASE_NAME; +import static org.apache.hadoop.hive.metastore.txn.TxnCommonUtils.createValidReadTxnList; +import static org.apache.hadoop.hive.metastore.txn.TxnCommonUtils.createValidReaderWriteIdList; import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getMetaStoreSaslProperties; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.logAndThrowMetaException; import java.io.IOException; import java.lang.reflect.Constructor; @@ -61,9 +65,7 @@ import org.apache.hadoop.hive.metastore.hooks.URIResolverHook; import org.apache.hadoop.hive.metastore.partition.spec.PartitionSpecProxy; import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge; -import org.apache.hadoop.hive.metastore.txn.TxnUtils; import org.apache.hadoop.hive.metastore.utils.JavaUtils; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.metastore.utils.ObjectPair; import org.apache.hadoop.hive.metastore.utils.SecurityUtils; import org.apache.hadoop.security.UserGroupInformation; @@ -263,7 +265,7 @@ private void resolveUris() throws MetaException { } catch (IllegalArgumentException e) { throw (e); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } } @@ -489,14 +491,14 @@ private void open() throws MetaException { // authenticate using delegation tokens via the "DIGEST" mechanism transport = authBridge.createClientTransport(null, store.getHost(), "DIGEST", tokenStrForm, transport, - MetaStoreUtils.getMetaStoreSaslProperties(conf, useSSL)); + getMetaStoreSaslProperties(conf, useSSL)); } else { LOG.info("HMSC::open(): Could not find delegation token. Creating KERBEROS-based thrift connection."); String principalConfig = MetastoreConf.getVar(conf, ConfVars.KERBEROS_PRINCIPAL); transport = authBridge.createClientTransport( principalConfig, store.getHost(), "KERBEROS", null, - transport, MetaStoreUtils.getMetaStoreSaslProperties(conf, useSSL)); + transport, getMetaStoreSaslProperties(conf, useSSL)); } } catch (IOException ioe) { LOG.error("Couldn't create client transport", ioe); @@ -1224,7 +1226,7 @@ public boolean dropType(String type) throws NoSuchObjectException, MetaException try { return filterHook.filterDatabases(client.get_databases(databasePattern)); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -1235,7 +1237,7 @@ public boolean dropType(String type) throws NoSuchObjectException, MetaException try { return filterHook.filterDatabases(client.get_all_databases()); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -1481,7 +1483,7 @@ public Type getType(String name) throws NoSuchObjectException, MetaException, TE try { return filterHook.filterTableNames(null, dbname, client.get_tables(dbname, tablePattern)); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -1493,7 +1495,7 @@ public Type getType(String name) throws NoSuchObjectException, MetaException, TE return filterHook.filterTableNames(null, dbname, client.get_tables_by_type(dbname, tablePattern, tableType.toString())); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -1504,7 +1506,7 @@ public Type getType(String name) throws NoSuchObjectException, MetaException, TE try { return filterHook.filterTableNames(null, dbname, client.get_materialized_views_for_rewriting(dbname)); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -1515,7 +1517,7 @@ public Type getType(String name) throws NoSuchObjectException, MetaException, TE try { return filterNames(client.get_table_meta(dbPatterns, tablePatterns, tableTypes)); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -1546,7 +1548,7 @@ public Type getType(String name) throws NoSuchObjectException, MetaException, TE try { return filterHook.filterTableNames(null, dbname, client.get_all_tables(dbname)); } catch (Exception e) { - MetaStoreUtils.logAndThrowMetaException(e); + logAndThrowMetaException(e); } return null; } @@ -2149,19 +2151,19 @@ public boolean removeMasterKey(Integer keySeq) throws TException { @Override public ValidTxnList getValidTxns() throws TException { - return TxnUtils.createValidReadTxnList(client.get_open_txns(), 0); + return createValidReadTxnList(client.get_open_txns(), 0); } @Override public ValidTxnList getValidTxns(long currentTxn) throws TException { - return TxnUtils.createValidReadTxnList(client.get_open_txns(), currentTxn); + return createValidReadTxnList(client.get_open_txns(), currentTxn); } @Override public ValidWriteIdList getValidWriteIds(String fullTableName) throws TException { GetValidWriteIdsRequest rqst = new GetValidWriteIdsRequest(Collections.singletonList(fullTableName), null); GetValidWriteIdsResponse validWriteIds = client.get_valid_write_ids(rqst); - return TxnUtils.createValidReaderWriteIdList(validWriteIds.getTblValidWriteIds().get(0)); + return createValidReaderWriteIdList(validWriteIds.getTblValidWriteIds().get(0)); } @Override diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/IpAddressListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/MetaStoreTestUtils.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/MockPartitionExpressionForMetastore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/NonCatCallsWithCatalog.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestAdminUser.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestAggregateStatsCache.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultClient.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogNonDefaultSvr.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestCatalogOldClient.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestDeadline.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestEmbeddedHiveMetaStore.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestFilterHooks.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java similarity index 98% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java index adc82b0b9c..c5c96f62d2 100644 --- a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveAlterHandler.java @@ -22,7 +22,6 @@ import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest; import org.apache.hadoop.hive.metastore.api.*; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java similarity index 99% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java index cb32236d54..e5c3d64fa7 100644 --- a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java @@ -40,7 +40,6 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.Sets; -import org.apache.hadoop.hive.metastore.api.CreationMetadata; import org.apache.hadoop.hive.metastore.client.builder.DatabaseBuilder; import org.apache.hadoop.hive.metastore.client.builder.TableBuilder; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; @@ -83,7 +82,7 @@ import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.api.Type; import org.apache.hadoop.hive.metastore.api.UnknownDBException; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils; import org.apache.hadoop.util.StringUtils; import org.apache.thrift.TException; import org.junit.Test; @@ -487,7 +486,7 @@ private static Partition makePartitionObject(String dbName, String tblName, part4.setSd(tbl.getSd().deepCopy()); part4.getSd().setSerdeInfo(tbl.getSd().getSerdeInfo().deepCopy()); part4.getSd().setLocation(tbl.getSd().getLocation() + ptnLocationSuffix); - MetaStoreUtils.updatePartitionStatsFast(part4, tbl, warehouse, false, false, null, true); + MetaStoreServerUtils.updatePartitionStatsFast(part4, tbl, warehouse, false, false, null, true); return part4; } diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java similarity index 96% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java index 515b6144da..5963cb020a 100644 --- a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreGetMetaConf.java @@ -23,7 +23,7 @@ import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hadoop.hive.metastore.conf.MetastoreConf.ConfVars; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; +import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils; import org.apache.thrift.TException; import org.junit.After; import org.junit.AfterClass; @@ -62,7 +62,7 @@ public static void startMetaStoreServer() throws Exception { MockPartitionExpressionForMetastore.class, PartitionExpressionProxy.class); MetastoreConf.setBoolVar(metastoreConf, ConfVars.TRY_DIRECT_SQL_DDL, false); MetaStoreTestUtils.setConfForStandloneMode(metastoreConf); - int msPort = MetaStoreUtils.startMetaStore(metastoreConf); + int msPort = MetaStoreServerUtils.startMetaStore(metastoreConf); conf = MetastoreConf.newMetastoreConf(); MetastoreConf.setVar(conf, ConfVars.THRIFT_URIS, "thrift://localhost:" + msPort); MetastoreConf.setBoolVar(conf, ConfVars.HIVE_SUPPORT_CONCURRENCY, false); diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreSchemaMethods.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTxns.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetastoreCli.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestLockRequestBuilder.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartition.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMarkPartitionRemote.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreConnectionUrlHook.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerOnlyOnCommit.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreEventListenerWithOldConf.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreInitListener.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreListenersError.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMaterializationsCacheCleaner.java b/standalone-metastore/metastore-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java similarity index 99% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java index 1a2b7e4f9f..346361391f 100644 --- a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestExchangePartitions.java @@ -25,7 +25,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.IMetaStoreClient; -import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.annotation.MetastoreCheckinTest; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.MetaException; @@ -36,6 +35,7 @@ import org.apache.hadoop.hive.metastore.client.builder.PartitionBuilder; import org.apache.hadoop.hive.metastore.client.builder.TableBuilder; import org.apache.hadoop.hive.metastore.minihms.AbstractMetaStoreService; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.thrift.TException; import org.junit.After; import org.junit.Assert; @@ -113,8 +113,8 @@ public void testExchangePartitions() throws Exception { Assert.assertEquals(1, exchangedPartitions.size()); String partitionName = - Warehouse.makePartName(sourceTable.getPartitionKeys(), partitions[1].getValues()); - String exchangedPartitionName = Warehouse.makePartName(sourceTable.getPartitionKeys(), + MetaStoreUtils.makePartName(sourceTable.getPartitionKeys(), partitions[1].getValues()); + String exchangedPartitionName = MetaStoreUtils.makePartName(sourceTable.getPartitionKeys(), exchangedPartitions.get(0).getValues()); Assert.assertEquals(partitionName, exchangedPartitionName); @@ -163,7 +163,7 @@ public void testExchangePartitionsYearSet() throws Exception { List exchangedPartNames = new ArrayList<>(); for (Partition exchangedPartition : exchangedPartitions) { String partName = - Warehouse.makePartName(sourceTable.getPartitionKeys(), exchangedPartition.getValues()); + MetaStoreUtils.makePartName(sourceTable.getPartitionKeys(), exchangedPartition.getValues()); exchangedPartNames.add(partName); } Assert.assertTrue(exchangedPartNames.contains("year=2017/month=march/day=15")); @@ -1262,7 +1262,7 @@ private void checkExchangedPartitions(Table sourceTable, Table destTable, // Check the location of the result partition. It should be located in the destination table // folder. String partName = - Warehouse.makePartName(sourceTable.getPartitionKeys(), partition.getValues()); + MetaStoreUtils.makePartName(sourceTable.getPartitionKeys(), partition.getValues()); Assert.assertEquals(destTable.getSd().getLocation() + "/" + partName, resultPart.getSd().getLocation()); Assert.assertTrue(metaStore.isPathExists(new Path(resultPart.getSd().getLocation()))); @@ -1306,7 +1306,7 @@ private void checkRemainingPartitions(Table sourceTable, Table destTable, // Expected exception } String partName = - Warehouse.makePartName(sourceTable.getPartitionKeys(), partition.getValues()); + MetaStoreUtils.makePartName(sourceTable.getPartitionKeys(), partition.getValues()); Assert.assertFalse( metaStore.isPathExists(new Path(destTable.getSd().getLocation() + "/" + partName))); } diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestForeignKey.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestFunctions.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetPartitions.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java similarity index 98% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java index 59daa526d8..5a34e6a05d 100644 --- a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestGetTableMeta.java @@ -38,7 +38,6 @@ import org.apache.hadoop.hive.metastore.client.builder.DatabaseBuilder; import org.apache.hadoop.hive.metastore.client.builder.TableBuilder; import org.apache.hadoop.hive.metastore.minihms.AbstractMetaStoreService; -import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.thrift.TException; import com.google.common.collect.Lists; @@ -51,6 +50,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -135,7 +135,7 @@ private Table createTable(String dbName, String tableName, TableType type) if (type == TableType.MATERIALIZED_VIEW) { CreationMetadata cm = new CreationMetadata( - MetaStoreUtils.getDefaultCatalog(metaStore.getConf()), dbName, tableName, ImmutableSet.of()); + getDefaultCatalog(metaStore.getConf()), dbName, tableName, ImmutableSet.of()); table.setCreationMetadata(cm); } diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestListPartitions.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestNotNullConstraint.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestPrimaryKey.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesGetExists.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesList.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestUniqueConstraint.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/package-info.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/columnstats/merge/DecimalColumnStatsMergerTest.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/conf/TestMetastoreConf.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/DbInstallBase.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestMysql.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestOracle.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestPostgres.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/ITestSqlServer.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/messaging/json/TestJSONMessageDeserializer.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/metrics/TestMetrics.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/AbstractMetaStoreService.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/ClusterMetaStoreForTests.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/EmbeddedMetaStoreForTests.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/MiniHMS.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java similarity index 100% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/minihms/RemoteMetaStoreForTests.java diff --git a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/minihms/package-info.java b/standalone-metastore/metastore-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/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-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java similarity index 88% rename from standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java rename to standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java index 55ff1502d4..68c9ba1ffa 100644 --- a/standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreUtils.java @@ -45,7 +45,7 @@ import static org.apache.hadoop.hive.common.StatsSetupConst.NUM_FILES; import static org.apache.hadoop.hive.common.StatsSetupConst.STATS_GENERATED; import static org.apache.hadoop.hive.common.StatsSetupConst.TOTAL_SIZE; -import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.updateTableStatsSlow; +import static org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.updateTableStatsSlow; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; @@ -82,7 +82,7 @@ public void testTrimMapNullsXform() throws Exception { Map expected = ImmutableMap.of("akey", "aval", "blank", "", "null", ""); - Map xformed = MetaStoreUtils.trimMapNulls(m,true); + Map xformed = MetaStoreServerUtils.trimMapNulls(m,true); assertThat(xformed, is(expected)); } @@ -94,7 +94,7 @@ public void testTrimMapNullsPrune() throws Exception { m.put("null",null); Map expected = ImmutableMap.of("akey", "aval", "blank", ""); - Map pruned = MetaStoreUtils.trimMapNulls(m,false); + Map pruned = MetaStoreServerUtils.trimMapNulls(m,false); assertThat(pruned, is(expected)); } @@ -104,13 +104,13 @@ public void testcolumnsIncludedByNameType() { FieldSchema col1a = new FieldSchema("col1", "string", "col1 but with a different comment"); FieldSchema col2 = new FieldSchema("col2", "string", "col2 comment"); FieldSchema col3 = new FieldSchema("col3", "string", "col3 comment"); - Assert.assertTrue(org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.columnsIncludedByNameType(Arrays.asList(col1), Arrays.asList(col1))); - Assert.assertTrue(org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.columnsIncludedByNameType(Arrays.asList(col1), Arrays.asList(col1a))); - Assert.assertTrue(org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.columnsIncludedByNameType(Arrays.asList(col1, col2), Arrays.asList(col1, col2))); - Assert.assertTrue(org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.columnsIncludedByNameType(Arrays.asList(col1, col2), Arrays.asList(col2, col1))); - Assert.assertTrue(org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.columnsIncludedByNameType(Arrays.asList(col1, col2), Arrays.asList(col1, col2, col3))); - Assert.assertTrue(org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.columnsIncludedByNameType(Arrays.asList(col1, col2), Arrays.asList(col3, col2, col1))); - Assert.assertFalse(org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.columnsIncludedByNameType(Arrays.asList(col1, col2), Arrays.asList(col1))); + Assert.assertTrue(MetaStoreServerUtils.columnsIncludedByNameType(Arrays.asList(col1), Arrays.asList(col1))); + Assert.assertTrue(MetaStoreServerUtils.columnsIncludedByNameType(Arrays.asList(col1), Arrays.asList(col1a))); + Assert.assertTrue(MetaStoreServerUtils.columnsIncludedByNameType(Arrays.asList(col1, col2), Arrays.asList(col1, col2))); + Assert.assertTrue(MetaStoreServerUtils.columnsIncludedByNameType(Arrays.asList(col1, col2), Arrays.asList(col2, col1))); + Assert.assertTrue(MetaStoreServerUtils.columnsIncludedByNameType(Arrays.asList(col1, col2), Arrays.asList(col1, col2, col3))); + Assert.assertTrue(MetaStoreServerUtils.columnsIncludedByNameType(Arrays.asList(col1, col2), Arrays.asList(col3, col2, col1))); + Assert.assertFalse(MetaStoreServerUtils.columnsIncludedByNameType(Arrays.asList(col1, col2), Arrays.asList(col1))); } /** diff --git a/standalone-metastore/src/test/resources/log4j2.properties b/standalone-metastore/metastore-server/src/test/resources/log4j2.properties similarity index 100% rename from standalone-metastore/src/test/resources/log4j2.properties rename to standalone-metastore/metastore-server/src/test/resources/log4j2.properties diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 67d8fb41d1..d1ee44eb53 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -16,6 +16,11 @@ 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 + metastore-client + metastore-server + org.apache apache @@ -26,7 +31,7 @@ org.apache.hive hive-standalone-metastore 4.0.0-SNAPSHOT - jar + pom Hive Standalone Metastore @@ -48,7 +53,8 @@ file:// 1 true - set-this-to-colon-separated-full-path-list-of-jars-to-run-integration-tests + set-this-to-colon-separated-full-path-list-of-jars-to-run-integration-tests + org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest @@ -69,7 +75,8 @@ 3.2.0-m3 4.1.19 10.10.2.0 - 0.1.2 + 0.1.2 + 3.1.0 19.0 3.1.0 @@ -89,785 +96,212 @@ you-must-set-this-to-run-thrift ${basedir}/src/gen/thrift - -I ${thrift.home} --gen java:beans,hashcode,generated_annotations=undated --gen cpp --gen php --gen py --gen rb + -I ${thrift.home} --gen java:beans,hashcode,generated_annotations=undated --gen cpp + --gen php --gen py --gen rb + - - - 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} - - - - - 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.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 - antlr3-maven-plugin + antlr-runtime ${antlr.version} - - - - antlr - - - - - ${project.build.directory}/generated-sources - ${basedir}/src/main/java - - - - +
+ + 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 + + + + org.mariadb.jdbc + mariadb-java-client + 2.2.0 + test + + + org.postgresql + postgresql + 9.3-1102-jdbc41 + test + + + diff --git a/storage-api/src/java/org/apache/hadoop/hive/common/DatabaseName.java b/storage-api/src/java/org/apache/hadoop/hive/common/DatabaseName.java index 6a030bb1b9..8b4ddbd844 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/common/DatabaseName.java +++ b/storage-api/src/java/org/apache/hadoop/hive/common/DatabaseName.java @@ -31,7 +31,7 @@ * @param cat catalog name. This cannot be null. If you don't know the value, then likely the * right answer is to fetch it from SessionState.getCurrentCatalog() if you want to * get the catalog being used in the current session or - * MetaStoreUtils.getDefaultCatalog() if you want to get the default catalog for + * MetaStoreCommonUtils.getDefaultCatalog() if you want to get the default catalog for * this Hive instance. * @param db database name. This cannot be null. */ @@ -48,7 +48,7 @@ public DatabaseName(String cat, String db) { * embedded in name. If you want the default catalog to be determined by * the session, use SessionState.getCurrentCatalog(). If you want it to * be determined by the default for the Hive instance or you are not in a - * session, use MetaStoreUtils.getDefaultCatalog(). + * session, use MetaStoreCommonUtils.getDefaultCatalog(). * @return new DatabaseName object. */ public static DatabaseName fromString(String name, String defaultCatalog) { diff --git a/storage-api/src/java/org/apache/hadoop/hive/common/TableName.java b/storage-api/src/java/org/apache/hadoop/hive/common/TableName.java index f5cb192561..84d13291a4 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/common/TableName.java +++ b/storage-api/src/java/org/apache/hadoop/hive/common/TableName.java @@ -30,7 +30,7 @@ * * @param cat catalog name. Cannot be null. If you do not know it you can get it from * SessionState.getCurrentCatalog() if you want to use the catalog from the current - * session, or from MetaStoreUtils.getDefaultCatalog() if you do not have a session + * session, or from MetaStoreCommonUtils.getDefaultCatalog() if you do not have a session * or want to use the default catalog for the Hive instance. * @param db database name. Cannot be null. If you do not now it you can get it from * SessionState.getCurrentDatabase() or use Warehouse.DEFAULT_DATABASE_NAME. @@ -48,7 +48,7 @@ public TableName(String cat, String db, String table) { * @param defaultCatalog default catalog to use if catalog is not in the name. If you do not * know it you can get it from SessionState.getCurrentCatalog() if you * want to use the catalog from the current session, or from - * MetaStoreUtils.getDefaultCatalog() if you do not have a session or + * MetaStoreCommonUtils.getDefaultCatalog() if you do not have a session or * want to use the default catalog for the Hive instance. * @param defaultDatabase default database to use if database is not in the name. If you do * not now it you can get it from SessionState.getCurrentDatabase() or diff --git a/streaming/src/java/org/apache/hive/streaming/HiveStreamingConnection.java b/streaming/src/java/org/apache/hive/streaming/HiveStreamingConnection.java index 7adbadddfa..50a856e682 100644 --- a/streaming/src/java/org/apache/hive/streaming/HiveStreamingConnection.java +++ b/streaming/src/java/org/apache/hive/streaming/HiveStreamingConnection.java @@ -57,6 +57,7 @@ import org.apache.hadoop.hive.metastore.api.TxnAbortedException; import org.apache.hadoop.hive.metastore.api.TxnToWriteId; import org.apache.hadoop.hive.metastore.conf.MetastoreConf; +import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; import org.apache.hadoop.hive.ql.io.AcidUtils; import org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; import org.apache.hadoop.hive.ql.lockmgr.LockException; @@ -372,7 +373,7 @@ public PartitionInfo createPartitionIfNotExists(final List partitionValu try { Map partSpec = Warehouse.makeSpecFromValues(tableObject.getPartitionKeys(), partitionValues); AddPartitionDesc addPartitionDesc = new AddPartitionDesc(database, table, true); - partName = Warehouse.makePartName(tableObject.getPartitionKeys(), partitionValues); + partName = MetaStoreUtils.makePartName(tableObject.getPartitionKeys(), partitionValues); partLocation = new Path(tableObject.getDataLocation(), Warehouse.makePartPath(partSpec)).toString(); addPartitionDesc.addPartition(partSpec, partLocation); Partition partition = Hive.convertAddSpecToMetaPartition(tableObject, addPartitionDesc.getPartition(0), conf); @@ -644,7 +645,7 @@ private TransactionBatch(HiveStreamingConnection conn) throws StreamingException try { if (conn.isPartitionedTable() && !conn.isDynamicPartitioning()) { List partKeys = conn.tableObject.getPartitionKeys(); - partNameForLock = Warehouse.makePartName(partKeys, conn.staticPartitionValues); + partNameForLock = MetaStoreUtils.makePartName(partKeys, conn.staticPartitionValues); } this.conn = conn; this.username = conn.username; diff --git a/upgrade-acid/pom.xml b/upgrade-acid/pom.xml index 77cd24094d..a0325488ac 100644 --- a/upgrade-acid/pom.xml +++ b/upgrade-acid/pom.xml @@ -206,7 +206,7 @@ java.io.IOException: Cannot initialize Cluster. Please check your configuration - + -- 2.16.3