You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by vi...@apache.org on 2018/07/19 19:55:50 UTC

[51/51] [partial] hive git commit: HIVE-20188 : Split server-specific code outside of standalone metastore-common (Alexander Kolbasov reviewed by Vihang Karajgaonkar)

HIVE-20188 : Split server-specific code outside of standalone metastore-common (Alexander Kolbasov reviewed by Vihang Karajgaonkar)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/081fa368
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/081fa368
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/081fa368

Branch: refs/heads/master
Commit: 081fa3685f86ddf054b4967b937b426b5312ecb7
Parents: 6d15ce4
Author: Alexander Kolbasov <ak...@cloudera.com>
Authored: Thu Jul 19 12:47:08 2018 -0700
Committer: Vihang Karajgaonkar <vi...@cloudera.com>
Committed: Thu Jul 19 12:47:26 2018 -0700

----------------------------------------------------------------------
 .gitignore                                      |     1 +
 hcatalog/core/pom.xml                           |     7 +
 hcatalog/webhcat/java-client/pom.xml            |     7 +
 hcatalog/webhcat/svr/pom.xml                    |     7 +
 itests/hcatalog-unit/pom.xml                    |     6 +
 itests/hive-blobstore/pom.xml                   |    13 +
 itests/hive-minikdc/pom.xml                     |    13 +
 itests/hive-unit-hadoop2/pom.xml                |     6 +
 itests/hive-unit/pom.xml                        |     8 +-
 itests/qtest-accumulo/pom.xml                   |    13 +
 itests/qtest-spark/pom.xml                      |    13 +
 itests/qtest/pom.xml                            |    13 +
 itests/util/pom.xml                             |     6 +
 llap-server/pom.xml                             |     7 +
 metastore/pom.xml                               |     5 +
 packaging/src/main/assembly/bin.xml             |     2 +-
 packaging/src/main/assembly/src.xml             |     1 +
 ql/pom.xml                                      |     8 +
 service/pom.xml                                 |     7 +
 standalone-metastore/metastore-common/pom.xml   |   128 -
 .../metastore-common/src/assembly/bin.xml       |    28 -
 .../hadoop/hive/common/StatsSetupConst.java     |   335 -
 .../common/ndv/NumDistinctValueEstimator.java   |    51 -
 .../ndv/NumDistinctValueEstimatorFactory.java   |    75 -
 .../hadoop/hive/common/ndv/fm/FMSketch.java     |   359 -
 .../hive/common/ndv/fm/FMSketchUtils.java       |   132 -
 .../hive/common/ndv/hll/HLLConstants.java       |   933 --
 .../hive/common/ndv/hll/HLLDenseRegister.java   |   202 -
 .../hadoop/hive/common/ndv/hll/HLLRegister.java |    50 -
 .../hive/common/ndv/hll/HLLSparseRegister.java  |   261 -
 .../hadoop/hive/common/ndv/hll/HyperLogLog.java |   664 -
 .../hive/common/ndv/hll/HyperLogLogUtils.java   |   409 -
 .../hive/metastore/AcidEventListener.java       |   146 -
 .../hive/metastore/AggregateStatsCache.java     |   571 -
 .../hadoop/hive/metastore/AlterHandler.java     |   202 -
 .../apache/hadoop/hive/metastore/Batchable.java |    86 -
 .../hadoop/hive/metastore/ColumnType.java       |   301 -
 .../hadoop/hive/metastore/DatabaseProduct.java  |    75 -
 .../apache/hadoop/hive/metastore/Deadline.java  |   172 -
 .../hive/metastore/DeadlineException.java       |    29 -
 .../DefaultPartitionExpressionProxy.java        |    57 -
 .../metastore/DefaultStorageSchemaReader.java   |    38 -
 .../hive/metastore/FileMetadataHandler.java     |   109 -
 .../hive/metastore/FileMetadataManager.java     |   119 -
 .../hive/metastore/HMSMetricsListener.java      |    90 -
 .../hadoop/hive/metastore/HiveAlterHandler.java |   948 --
 .../hadoop/hive/metastore/HiveMetaStore.java    |  9353 -------------
 .../hive/metastore/HiveMetaStoreClient.java     |  3422 -----
 .../hive/metastore/HiveMetaStoreFsImpl.java     |    55 -
 .../hive/metastore/IExtrapolatePartStatus.java  |    85 -
 .../hadoop/hive/metastore/IHMSHandler.java      |   104 -
 .../hadoop/hive/metastore/IMetaStoreClient.java |  3699 -----
 .../hive/metastore/IMetaStoreSchemaInfo.java    |   115 -
 .../metastore/LinearExtrapolatePartStatus.java  |   106 -
 .../hive/metastore/LockComponentBuilder.java    |   121 -
 .../hive/metastore/LockRequestBuilder.java      |   168 -
 .../MaterializationsRebuildLockCleanerTask.java |    81 -
 .../MaterializationsRebuildLockHandler.java     |   216 -
 .../hive/metastore/MetaStoreDirectSql.java      |  2817 ----
 .../metastore/MetaStoreEndFunctionContext.java  |    59 -
 .../metastore/MetaStoreEndFunctionListener.java |    58 -
 .../hive/metastore/MetaStoreEventListener.java  |   306 -
 .../MetaStoreEventListenerConstants.java        |    41 -
 .../hadoop/hive/metastore/MetaStoreFS.java      |    43 -
 .../hadoop/hive/metastore/MetaStoreInit.java    |   109 -
 .../hive/metastore/MetaStoreInitContext.java    |    27 -
 .../hive/metastore/MetaStoreInitListener.java   |    49 -
 .../metastore/MetaStoreListenerNotifier.java    |   375 -
 .../metastore/MetaStorePreEventListener.java    |    57 -
 .../hive/metastore/MetaStoreSchemaInfo.java     |   246 -
 .../metastore/MetaStoreSchemaInfoFactory.java   |    64 -
 .../hadoop/hive/metastore/MetaStoreThread.java  |    58 -
 .../hadoop/hive/metastore/MetadataStore.java    |    52 -
 .../hive/metastore/MetastoreTaskThread.java     |    38 -
 .../hadoop/hive/metastore/ObjectStore.java      | 12207 -----------------
 .../hive/metastore/PartFilterExprUtil.java      |   165 -
 .../metastore/PartitionExpressionProxy.java     |    73 -
 .../apache/hadoop/hive/metastore/RawStore.java  |  1682 ---
 .../hadoop/hive/metastore/RawStoreProxy.java    |   114 -
 .../hive/metastore/ReplChangeManager.java       |   501 -
 .../hive/metastore/RetryingHMSHandler.java      |   232 -
 .../hive/metastore/RetryingMetaStoreClient.java |   341 -
 .../hive/metastore/RuntimeStatsCleanerTask.java |    66 -
 .../metastore/SessionPropertiesListener.java    |    46 -
 .../hive/metastore/StatObjectConverter.java     |   892 --
 .../hive/metastore/TServerSocketKeepAlive.java  |    47 -
 .../hive/metastore/TSetIpAddressProcessor.java  |    62 -
 .../hive/metastore/TUGIBasedProcessor.java      |   183 -
 .../hadoop/hive/metastore/TableIterable.java    |   115 -
 .../hadoop/hive/metastore/ThreadPool.java       |    63 -
 .../TransactionalMetaStoreEventListener.java    |    39 -
 .../TransactionalValidationListener.java        |   487 -
 .../apache/hadoop/hive/metastore/Warehouse.java |   756 -
 .../hive/metastore/api/utils/DecimalUtils.java  |    49 -
 .../hive/metastore/cache/ByteArrayWrapper.java  |    45 -
 .../hadoop/hive/metastore/cache/CacheUtils.java |   136 -
 .../hive/metastore/cache/CachedStore.java       |  2532 ----
 .../hive/metastore/cache/SharedCache.java       |  1650 ---
 .../client/builder/CatalogBuilder.java          |    62 -
 .../client/builder/ConstraintBuilder.java       |   115 -
 .../client/builder/DatabaseBuilder.java         |   122 -
 .../client/builder/FunctionBuilder.java         |   143 -
 .../GrantRevokePrivilegeRequestBuilder.java     |    63 -
 .../builder/HiveObjectPrivilegeBuilder.java     |    69 -
 .../client/builder/HiveObjectRefBuilder.java    |    69 -
 .../client/builder/ISchemaBuilder.java          |   102 -
 .../client/builder/PartitionBuilder.java        |   119 -
 .../builder/PrivilegeGrantInfoBuilder.java      |    84 -
 .../metastore/client/builder/RoleBuilder.java   |    55 -
 .../builder/SQLCheckConstraintBuilder.java      |    51 -
 .../builder/SQLDefaultConstraintBuilder.java    |    51 -
 .../client/builder/SQLForeignKeyBuilder.java    |   103 -
 .../builder/SQLNotNullConstraintBuilder.java    |    52 -
 .../client/builder/SQLPrimaryKeyBuilder.java    |    52 -
 .../builder/SQLUniqueConstraintBuilder.java     |    46 -
 .../client/builder/SchemaVersionBuilder.java    |   114 -
 .../client/builder/SerdeAndColsBuilder.java     |   124 -
 .../builder/StorageDescriptorBuilder.java       |   163 -
 .../metastore/client/builder/TableBuilder.java  |   224 -
 .../aggr/BinaryColumnStatsAggregator.java       |    61 -
 .../aggr/BooleanColumnStatsAggregator.java      |    62 -
 .../columnstats/aggr/ColumnStatsAggregator.java |    35 -
 .../aggr/ColumnStatsAggregatorFactory.java      |   113 -
 .../aggr/DateColumnStatsAggregator.java         |   360 -
 .../aggr/DecimalColumnStatsAggregator.java      |   375 -
 .../aggr/DoubleColumnStatsAggregator.java       |   348 -
 .../aggr/IExtrapolatePartStatus.java            |    47 -
 .../aggr/LongColumnStatsAggregator.java         |   348 -
 .../aggr/StringColumnStatsAggregator.java       |   304 -
 .../cache/DateColumnStatsDataInspector.java     |   124 -
 .../cache/DecimalColumnStatsDataInspector.java  |   124 -
 .../cache/DoubleColumnStatsDataInspector.java   |   124 -
 .../cache/LongColumnStatsDataInspector.java     |   124 -
 .../cache/StringColumnStatsDataInspector.java   |   125 -
 .../merge/BinaryColumnStatsMerger.java          |    35 -
 .../merge/BooleanColumnStatsMerger.java         |    35 -
 .../columnstats/merge/ColumnStatsMerger.java    |    31 -
 .../merge/ColumnStatsMergerFactory.java         |   120 -
 .../merge/DateColumnStatsMerger.java            |    59 -
 .../merge/DecimalColumnStatsMerger.java         |    85 -
 .../merge/DoubleColumnStatsMerger.java          |    54 -
 .../merge/LongColumnStatsMerger.java            |    54 -
 .../merge/StringColumnStatsMerger.java          |    54 -
 .../metastore/conf/ConfTemplatePrinter.java     |   150 -
 .../hive/metastore/conf/MetastoreConf.java      |  1686 ---
 .../hive/metastore/conf/TimeValidator.java      |    67 -
 .../datasource/BoneCPDataSourceProvider.java    |    87 -
 .../datasource/DataSourceProvider.java          |    79 -
 .../datasource/DataSourceProviderFactory.java   |    66 -
 .../datasource/DbCPDataSourceProvider.java      |   117 -
 .../datasource/HikariCPDataSourceProvider.java  |    89 -
 .../hive/metastore/datasource/package-info.java |    23 -
 .../hive/metastore/events/AbortTxnEvent.java    |    51 -
 .../hive/metastore/events/AcidWriteEvent.java   |    91 -
 .../metastore/events/AddForeignKeyEvent.java    |    41 -
 .../events/AddNotNullConstraintEvent.java       |    42 -
 .../metastore/events/AddPartitionEvent.java     |    84 -
 .../metastore/events/AddPrimaryKeyEvent.java    |    42 -
 .../metastore/events/AddSchemaVersionEvent.java |    40 -
 .../events/AddUniqueConstraintEvent.java        |    42 -
 .../metastore/events/AllocWriteIdEvent.java     |    57 -
 .../metastore/events/AlterCatalogEvent.java     |    44 -
 .../metastore/events/AlterDatabaseEvent.java    |    56 -
 .../metastore/events/AlterISchemaEvent.java     |    45 -
 .../metastore/events/AlterPartitionEvent.java   |    75 -
 .../events/AlterSchemaVersionEvent.java         |    46 -
 .../hive/metastore/events/AlterTableEvent.java  |    63 -
 .../hive/metastore/events/CommitTxnEvent.java   |    51 -
 .../metastore/events/ConfigChangeEvent.java     |    52 -
 .../metastore/events/CreateCatalogEvent.java    |    39 -
 .../metastore/events/CreateDatabaseEvent.java   |    43 -
 .../metastore/events/CreateFunctionEvent.java   |    43 -
 .../metastore/events/CreateISchemaEvent.java    |    39 -
 .../hive/metastore/events/CreateTableEvent.java |    43 -
 .../hive/metastore/events/DropCatalogEvent.java |    39 -
 .../metastore/events/DropConstraintEvent.java   |    57 -
 .../metastore/events/DropDatabaseEvent.java     |    43 -
 .../metastore/events/DropFunctionEvent.java     |    43 -
 .../hive/metastore/events/DropISchemaEvent.java |    39 -
 .../metastore/events/DropPartitionEvent.java    |    70 -
 .../events/DropSchemaVersionEvent.java          |    40 -
 .../hive/metastore/events/DropTableEvent.java   |    54 -
 .../hive/metastore/events/EventCleanerTask.java |    66 -
 .../hive/metastore/events/InsertEvent.java      |   132 -
 .../hive/metastore/events/ListenerEvent.java    |   187 -
 .../events/LoadPartitionDoneEvent.java          |    57 -
 .../hive/metastore/events/OpenTxnEvent.java     |    51 -
 .../metastore/events/PreAddPartitionEvent.java  |    79 -
 .../events/PreAddSchemaVersionEvent.java        |    39 -
 .../metastore/events/PreAlterCatalogEvent.java  |    40 -
 .../metastore/events/PreAlterDatabaseEvent.java |    47 -
 .../metastore/events/PreAlterISchemaEvent.java  |    44 -
 .../events/PreAlterPartitionEvent.java          |    65 -
 .../events/PreAlterSchemaVersionEvent.java      |    45 -
 .../metastore/events/PreAlterTableEvent.java    |    53 -
 .../events/PreAuthorizationCallEvent.java       |    33 -
 .../metastore/events/PreCreateCatalogEvent.java |    39 -
 .../events/PreCreateDatabaseEvent.java          |    43 -
 .../metastore/events/PreCreateISchemaEvent.java |    39 -
 .../metastore/events/PreCreateTableEvent.java   |    43 -
 .../metastore/events/PreDropCatalogEvent.java   |    39 -
 .../metastore/events/PreDropDatabaseEvent.java  |    43 -
 .../metastore/events/PreDropISchemaEvent.java   |    39 -
 .../metastore/events/PreDropPartitionEvent.java |    67 -
 .../events/PreDropSchemaVersionEvent.java       |    39 -
 .../metastore/events/PreDropTableEvent.java     |    55 -
 .../hive/metastore/events/PreEventContext.java  |    82 -
 .../events/PreLoadPartitionDoneEvent.java       |    64 -
 .../metastore/events/PreReadCatalogEvent.java   |    39 -
 .../metastore/events/PreReadDatabaseEvent.java  |    46 -
 .../metastore/events/PreReadISchemaEvent.java   |    39 -
 .../metastore/events/PreReadTableEvent.java     |    47 -
 .../events/PreReadhSchemaVersionEvent.java      |    36 -
 .../metastore/hooks/JDOConnectionURLHook.java   |    52 -
 .../metastore/messaging/AbortTxnMessage.java    |    36 -
 .../metastore/messaging/AcidWriteMessage.java   |    50 -
 .../messaging/AddForeignKeyMessage.java         |    36 -
 .../messaging/AddNotNullConstraintMessage.java  |    36 -
 .../messaging/AddPartitionMessage.java          |    68 -
 .../messaging/AddPrimaryKeyMessage.java         |    35 -
 .../messaging/AddUniqueConstraintMessage.java   |    36 -
 .../messaging/AllocWriteIdMessage.java          |    36 -
 .../messaging/AlterCatalogMessage.java          |    29 -
 .../messaging/AlterDatabaseMessage.java         |    36 -
 .../messaging/AlterPartitionMessage.java        |    69 -
 .../metastore/messaging/AlterTableMessage.java  |    58 -
 .../metastore/messaging/CommitTxnMessage.java   |    59 -
 .../messaging/CreateCatalogMessage.java         |    25 -
 .../messaging/CreateDatabaseMessage.java        |    31 -
 .../messaging/CreateFunctionMessage.java        |    46 -
 .../metastore/messaging/CreateTableMessage.java |    53 -
 .../metastore/messaging/DropCatalogMessage.java |    25 -
 .../messaging/DropConstraintMessage.java        |    29 -
 .../messaging/DropDatabaseMessage.java          |    27 -
 .../messaging/DropFunctionMessage.java          |    38 -
 .../messaging/DropPartitionMessage.java         |    49 -
 .../metastore/messaging/DropTableMessage.java   |    46 -
 .../hive/metastore/messaging/EventMessage.java  |   127 -
 .../hive/metastore/messaging/EventUtils.java    |   202 -
 .../hive/metastore/messaging/InsertMessage.java |    75 -
 .../messaging/MessageDeserializer.java          |   200 -
 .../metastore/messaging/MessageFactory.java     |   341 -
 .../metastore/messaging/OpenTxnMessage.java     |    38 -
 .../metastore/messaging/PartitionFiles.java     |    53 -
 .../messaging/event/filters/AndFilter.java      |    39 -
 .../messaging/event/filters/BasicFilter.java    |    33 -
 .../event/filters/DatabaseAndTableFilter.java   |    65 -
 .../event/filters/EventBoundaryFilter.java      |    34 -
 .../event/filters/MessageFormatFilter.java      |    36 -
 .../messaging/json/JSONAbortTxnMessage.java     |    88 -
 .../messaging/json/JSONAcidWriteMessage.java    |   150 -
 .../json/JSONAddForeignKeyMessage.java          |   102 -
 .../json/JSONAddNotNullConstraintMessage.java   |    97 -
 .../messaging/json/JSONAddPartitionMessage.java |   175 -
 .../json/JSONAddPrimaryKeyMessage.java          |   102 -
 .../json/JSONAddUniqueConstraintMessage.java    |    99 -
 .../messaging/json/JSONAllocWriteIdMessage.java |   113 -
 .../messaging/json/JSONAlterCatalogMessage.java |    90 -
 .../json/JSONAlterDatabaseMessage.java          |    97 -
 .../json/JSONAlterPartitionMessage.java         |   153 -
 .../messaging/json/JSONAlterTableMessage.java   |   128 -
 .../messaging/json/JSONCommitTxnMessage.java    |   183 -
 .../json/JSONCreateCatalogMessage.java          |    80 -
 .../json/JSONCreateDatabaseMessage.java         |    85 -
 .../json/JSONCreateFunctionMessage.java         |    87 -
 .../messaging/json/JSONCreateTableMessage.java  |   134 -
 .../messaging/json/JSONDropCatalogMessage.java  |    67 -
 .../json/JSONDropConstraintMessage.java         |    91 -
 .../messaging/json/JSONDropDatabaseMessage.java |    72 -
 .../messaging/json/JSONDropFunctionMessage.java |    79 -
 .../json/JSONDropPartitionMessage.java          |   135 -
 .../messaging/json/JSONDropTableMessage.java    |   121 -
 .../messaging/json/JSONInsertMessage.java       |   148 -
 .../messaging/json/JSONMessageDeserializer.java |   273 -
 .../messaging/json/JSONMessageFactory.java      |   402 -
 .../messaging/json/JSONOpenTxnMessage.java      |   106 -
 .../hive/metastore/metrics/JsonReporter.java    |   223 -
 .../hive/metastore/metrics/JvmPauseMonitor.java |   222 -
 .../hadoop/hive/metastore/metrics/Metrics.java  |   244 -
 .../metastore/metrics/MetricsConstants.java     |    46 -
 .../hive/metastore/metrics/PerfLogger.java      |   194 -
 .../hadoop/hive/metastore/model/MCatalog.java   |    58 -
 .../hive/metastore/model/MColumnDescriptor.java |    51 -
 .../hive/metastore/model/MConstraint.java       |   214 -
 .../hive/metastore/model/MCreationMetadata.java |    97 -
 .../hive/metastore/model/MDBPrivilege.java      |   142 -
 .../hadoop/hive/metastore/model/MDatabase.java  |   157 -
 .../hive/metastore/model/MDelegationToken.java  |    45 -
 .../hive/metastore/model/MFieldSchema.java      |    80 -
 .../hadoop/hive/metastore/model/MFunction.java  |   119 -
 .../hive/metastore/model/MGlobalPrivilege.java  |   130 -
 .../hadoop/hive/metastore/model/MISchema.java   |   107 -
 .../hadoop/hive/metastore/model/MIndex.java     |   200 -
 .../hadoop/hive/metastore/model/MMasterKey.java |    55 -
 .../metastore/model/MMetastoreDBProperties.java |    56 -
 .../hive/metastore/model/MNotificationLog.java  |   108 -
 .../metastore/model/MNotificationNextId.java    |    42 -
 .../hadoop/hive/metastore/model/MOrder.java     |    62 -
 .../hadoop/hive/metastore/model/MPartition.java |   155 -
 .../model/MPartitionColumnPrivilege.java        |   171 -
 .../model/MPartitionColumnStatistics.java       |   281 -
 .../hive/metastore/model/MPartitionEvent.java   |    97 -
 .../metastore/model/MPartitionPrivilege.java    |   149 -
 .../hive/metastore/model/MPrincipalDesc.java    |    59 -
 .../hive/metastore/model/MResourceUri.java      |    49 -
 .../hadoop/hive/metastore/model/MRole.java      |    80 -
 .../hadoop/hive/metastore/model/MRoleMap.java   |   120 -
 .../hive/metastore/model/MRuntimeStat.java      |    59 -
 .../hive/metastore/model/MSchemaVersion.java    |   127 -
 .../hadoop/hive/metastore/model/MSerDeInfo.java |   127 -
 .../metastore/model/MStorageDescriptor.java     |   277 -
 .../hive/metastore/model/MStringList.java       |    62 -
 .../hadoop/hive/metastore/model/MTable.java     |   273 -
 .../metastore/model/MTableColumnPrivilege.java  |   170 -
 .../metastore/model/MTableColumnStatistics.java |   272 -
 .../hive/metastore/model/MTablePrivilege.java   |   149 -
 .../model/MTxnWriteNotificationLog.java         |   123 -
 .../hadoop/hive/metastore/model/MType.java      |   105 -
 .../hive/metastore/model/MVersionTable.java     |    57 -
 .../hadoop/hive/metastore/model/MWMMapping.java |    83 -
 .../hadoop/hive/metastore/model/MWMPool.java    |    89 -
 .../hive/metastore/model/MWMResourcePlan.java   |   105 -
 .../hadoop/hive/metastore/model/MWMTrigger.java |    89 -
 .../hive/metastore/parser/ExpressionTree.java   |   606 -
 .../hadoop/hive/metastore/parser/Filter.g       |   486 -
 .../hive/metastore/parser/package-info.java     |    23 -
 .../spec/CompositePartitionSpecProxy.java       |   258 -
 .../spec/PartitionListComposingSpecProxy.java   |   209 -
 .../partition/spec/PartitionSpecProxy.java      |   220 -
 .../spec/PartitionSpecWithSharedSDProxy.java    |   192 -
 .../hive/metastore/security/DBTokenStore.java   |   180 -
 .../security/DelegationTokenIdentifier.java     |    52 -
 .../security/DelegationTokenSecretManager.java  |   134 -
 .../security/DelegationTokenSelector.java       |    33 -
 .../security/DelegationTokenStore.java          |   116 -
 .../metastore/security/DelegationTokenTool.java |   252 -
 .../security/HadoopThriftAuthBridge.java        |   700 -
 .../security/HadoopThriftAuthBridge23.java      |   114 -
 .../metastore/security/MemoryTokenStore.java    |   118 -
 .../MetastoreDelegationTokenManager.java        |   180 -
 .../security/TUGIContainingTransport.java       |    96 -
 .../TokenStoreDelegationTokenSecretManager.java |   334 -
 .../metastore/security/ZooKeeperTokenStore.java |   474 -
 .../hive/metastore/tools/HiveMetaTool.java      |   490 -
 .../hive/metastore/tools/HiveSchemaHelper.java  |   673 -
 .../metastore/tools/MetastoreSchemaTool.java    |   460 -
 .../hive/metastore/tools/SQLGenerator.java      |   187 -
 .../metastore/tools/SchemaToolCommandLine.java  |   308 -
 .../hive/metastore/tools/SchemaToolTask.java    |    32 -
 .../tools/SchemaToolTaskAlterCatalog.java       |    90 -
 .../tools/SchemaToolTaskCreateCatalog.java      |   132 -
 .../tools/SchemaToolTaskCreateUser.java         |   115 -
 .../metastore/tools/SchemaToolTaskInfo.java     |    43 -
 .../metastore/tools/SchemaToolTaskInit.java     |    73 -
 .../tools/SchemaToolTaskMoveDatabase.java       |    96 -
 .../tools/SchemaToolTaskMoveTable.java          |   142 -
 .../metastore/tools/SchemaToolTaskUpgrade.java  |   116 -
 .../metastore/tools/SchemaToolTaskValidate.java |   630 -
 .../hadoop/hive/metastore/tools/SmokeTest.java  |   102 -
 .../txn/AcidCompactionHistoryService.java       |    71 -
 .../metastore/txn/AcidHouseKeeperService.java   |    71 -
 .../txn/AcidOpenTxnsCounterService.java         |    72 -
 .../hive/metastore/txn/AcidWriteSetService.java |    69 -
 .../hive/metastore/txn/CompactionInfo.java      |   170 -
 .../metastore/txn/CompactionTxnHandler.java     |  1107 --
 .../hadoop/hive/metastore/txn/TxnDbUtil.java    |   514 -
 .../hadoop/hive/metastore/txn/TxnHandler.java   |  5051 -------
 .../hadoop/hive/metastore/txn/TxnStore.java     |   504 -
 .../hadoop/hive/metastore/txn/TxnUtils.java     |   471 -
 .../hive/metastore/utils/CommonCliOptions.java  |   160 -
 .../hadoop/hive/metastore/utils/FileUtils.java  |   537 -
 .../hadoop/hive/metastore/utils/HdfsUtils.java  |   395 -
 .../metastore/utils/HiveStrictManagedUtils.java |   100 -
 .../hadoop/hive/metastore/utils/LogUtils.java   |   140 -
 .../hive/metastore/utils/MetaStoreUtils.java    |  1840 ---
 .../metastore/utils/MetastoreVersionInfo.java   |   133 -
 .../hive/metastore/utils/SecurityUtils.java     |   313 -
 .../hive/metastore/utils/StringableMap.java     |    80 -
 .../src/main/resources/package.jdo              |  1420 --
 .../metastore-common/src/main/scripts/base      |   231 -
 .../src/main/scripts/ext/metastore.sh           |    41 -
 .../src/main/scripts/ext/schemaTool.sh          |    33 -
 .../src/main/scripts/ext/smokeTest.sh           |    33 -
 .../src/main/scripts/metastore-config.sh        |    69 -
 .../src/main/scripts/schematool                 |    21 -
 .../src/main/scripts/start-metastore            |    22 -
 .../main/sql/derby/hive-schema-1.2.0.derby.sql  |   405 -
 .../main/sql/derby/hive-schema-3.0.0.derby.sql  |   692 -
 .../main/sql/derby/hive-schema-3.1.0.derby.sql  |   720 -
 .../main/sql/derby/hive-schema-4.0.0.derby.sql  |   720 -
 .../sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql  |    62 -
 .../sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql  |    22 -
 .../sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql  |    59 -
 .../sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql  |     5 -
 .../sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql  |   283 -
 .../sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql  |    68 -
 .../sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql  |     6 -
 .../src/main/sql/derby/upgrade.order.derby      |    18 -
 .../src/main/sql/mssql/create-user.mssql.sql    |     5 -
 .../main/sql/mssql/hive-schema-1.2.0.mssql.sql  |   947 --
 .../main/sql/mssql/hive-schema-3.0.0.mssql.sql  |  1246 --
 .../main/sql/mssql/hive-schema-3.1.0.mssql.sql  |  1284 --
 .../main/sql/mssql/hive-schema-4.0.0.mssql.sql  |  1284 --
 .../sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql  |    73 -
 .../sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql  |    39 -
 .../sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql  |    43 -
 .../sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql  |     7 -
 .../sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql  |   352 -
 .../sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql  |    70 -
 .../sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql  |     6 -
 .../src/main/sql/mssql/upgrade.order.mssql      |    12 -
 .../src/main/sql/mysql/create-user.mysql.sql    |     8 -
 .../main/sql/mysql/hive-schema-1.2.0.mysql.sql  |   910 --
 .../main/sql/mysql/hive-schema-3.0.0.mysql.sql  |  1183 --
 .../main/sql/mysql/hive-schema-3.1.0.mysql.sql  |  1218 --
 .../main/sql/mysql/hive-schema-4.0.0.mysql.sql  |  1218 --
 .../sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql  |    75 -
 .../sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql  |    42 -
 .../sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql  |    43 -
 .../sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql  |     8 -
 .../sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql  |   326 -
 .../sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql  |    71 -
 .../sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql  |     6 -
 .../src/main/sql/mysql/upgrade.order.mysql      |    18 -
 .../src/main/sql/oracle/create-user.oracle.sql  |     3 -
 .../sql/oracle/hive-schema-1.2.0.oracle.sql     |   856 --
 .../sql/oracle/hive-schema-3.0.0.oracle.sql     |  1140 --
 .../sql/oracle/hive-schema-3.1.0.oracle.sql     |  1175 --
 .../sql/oracle/hive-schema-4.0.0.oracle.sql     |  1175 --
 .../oracle/upgrade-1.2.0-to-2.0.0.oracle.sql    |    83 -
 .../oracle/upgrade-2.0.0-to-2.1.0.oracle.sql    |    39 -
 .../oracle/upgrade-2.1.0-to-2.2.0.oracle.sql    |    58 -
 .../oracle/upgrade-2.2.0-to-2.3.0.oracle.sql    |     7 -
 .../oracle/upgrade-2.3.0-to-3.0.0.oracle.sql    |   342 -
 .../oracle/upgrade-3.0.0-to-3.1.0.oracle.sql    |    70 -
 .../oracle/upgrade-3.1.0-to-4.0.0.oracle.sql    |     6 -
 .../src/main/sql/oracle/upgrade.order.oracle    |    14 -
 .../main/sql/postgres/create-user.postgres.sql  |     2 -
 .../sql/postgres/hive-schema-1.2.0.postgres.sql |  1562 ---
 .../sql/postgres/hive-schema-3.0.0.postgres.sql |  1827 ---
 .../sql/postgres/hive-schema-3.1.0.postgres.sql |  1866 ---
 .../sql/postgres/hive-schema-4.0.0.postgres.sql |  1866 ---
 .../upgrade-1.2.0-to-2.0.0.postgres.sql         |    73 -
 .../upgrade-2.0.0-to-2.1.0.postgres.sql         |    40 -
 .../upgrade-2.1.0-to-2.2.0.postgres.sql         |    39 -
 .../upgrade-2.2.0-to-2.3.0.postgres.sql         |     8 -
 .../upgrade-2.3.0-to-3.0.0.postgres.sql         |   360 -
 .../upgrade-3.0.0-to-3.1.0.postgres.sql         |    72 -
 .../upgrade-3.1.0-to-4.0.0.postgres.sql         |     6 -
 .../main/sql/postgres/upgrade.order.postgres    |    18 -
 .../hadoop/hive/common/TestStatsSetupConst.java |   114 -
 .../ndv/fm/TestFMSketchSerialization.java       |   101 -
 .../hive/common/ndv/hll/TestHLLNoBias.java      |   117 -
 .../common/ndv/hll/TestHLLSerialization.java    |   270 -
 .../hive/common/ndv/hll/TestHyperLogLog.java    |   338 -
 .../common/ndv/hll/TestHyperLogLogDense.java    |    85 -
 .../common/ndv/hll/TestHyperLogLogMerge.java    |   147 -
 .../common/ndv/hll/TestHyperLogLogSparse.java   |    84 -
 .../common/ndv/hll/TestSparseEncodeHash.java    |    59 -
 .../metastore/AlternateFailurePreListener.java  |    62 -
 .../metastore/DummyEndFunctionListener.java     |    47 -
 .../metastore/DummyJdoConnectionUrlHook.java    |    45 -
 .../hadoop/hive/metastore/DummyListener.java    |   126 -
 .../metastore/DummyMetaStoreInitListener.java   |    39 -
 .../hadoop/hive/metastore/DummyPreListener.java |    49 -
 .../DummyRawStoreControlledCommit.java          |  1226 --
 .../DummyRawStoreForJdoConnection.java          |  1212 --
 .../apache/hadoop/hive/metastore/FakeDerby.java |   404 -
 .../HiveMetaStoreClientPreCatalog.java          |  3424 -----
 .../InjectableBehaviourObjectStore.java         |   211 -
 .../hive/metastore/IpAddressListener.java       |   102 -
 .../hive/metastore/MetaStoreTestUtils.java      |   291 -
 .../MockPartitionExpressionForMetastore.java    |    58 -
 .../hive/metastore/NonCatCallsWithCatalog.java  |  1158 --
 .../hadoop/hive/metastore/TestAdminUser.java    |    49 -
 .../hive/metastore/TestAggregateStatsCache.java |   272 -
 .../metastore/TestCatalogNonDefaultClient.java  |    74 -
 .../metastore/TestCatalogNonDefaultSvr.java     |    68 -
 .../hive/metastore/TestCatalogOldClient.java    |    44 -
 .../hadoop/hive/metastore/TestDeadline.java     |   130 -
 .../metastore/TestEmbeddedHiveMetaStore.java    |    51 -
 .../hadoop/hive/metastore/TestFilterHooks.java  |   254 -
 .../hive/metastore/TestHiveAlterHandler.java    |   121 -
 .../hive/metastore/TestHiveMetaStore.java       |  3103 -----
 .../metastore/TestHiveMetaStoreGetMetaConf.java |   115 -
 .../TestHiveMetaStorePartitionSpecs.java        |   383 -
 .../TestHiveMetaStoreSchemaMethods.java         |  1248 --
 .../metastore/TestHiveMetaStoreTimeout.java     |   142 -
 .../hive/metastore/TestHiveMetaStoreTxns.java   |   267 -
 ...TestHiveMetaStoreWithEnvironmentContext.java |   191 -
 .../hive/metastore/TestHiveMetastoreCli.java    |    68 -
 .../hive/metastore/TestLockRequestBuilder.java  |   587 -
 .../hive/metastore/TestMarkPartition.java       |   118 -
 .../hive/metastore/TestMarkPartitionRemote.java |    34 -
 .../TestMetaStoreConnectionUrlHook.java         |    49 -
 .../TestMetaStoreEndFunctionListener.java       |   146 -
 .../metastore/TestMetaStoreEventListener.java   |   471 -
 .../TestMetaStoreEventListenerOnlyOnCommit.java |   121 -
 .../TestMetaStoreEventListenerWithOldConf.java  |   129 -
 .../metastore/TestMetaStoreInitListener.java    |    56 -
 .../metastore/TestMetaStoreListenersError.java  |    97 -
 .../metastore/TestMetaStoreSchemaFactory.java   |    72 -
 .../hive/metastore/TestMetaStoreSchemaInfo.java |    55 -
 .../hadoop/hive/metastore/TestObjectStore.java  |   904 --
 .../metastore/TestObjectStoreInitRetry.java     |   135 -
 .../metastore/TestObjectStoreSchemaMethods.java |   602 -
 .../hadoop/hive/metastore/TestOldSchema.java    |   233 -
 .../TestPartitionNameWhitelistValidation.java   |   125 -
 .../hive/metastore/TestRawStoreProxy.java       |    67 -
 .../hive/metastore/TestRemoteHiveMetaStore.java |    64 -
 .../TestRemoteHiveMetaStoreIpAddress.java       |    66 -
 .../TestRemoteUGIHiveMetaStoreIpAddress.java    |    31 -
 .../TestRetriesInRetryingHMSHandler.java        |   111 -
 .../hive/metastore/TestRetryingHMSHandler.java  |    82 -
 .../metastore/TestSetUGIOnBothClientServer.java |    34 -
 .../hive/metastore/TestSetUGIOnOnlyClient.java  |    35 -
 .../hive/metastore/TestSetUGIOnOnlyServer.java  |    35 -
 .../apache/hadoop/hive/metastore/TestStats.java |   732 -
 .../hive/metastore/TestTableIterable.java       |    76 -
 .../hive/metastore/VerifyingObjectStore.java    |   219 -
 .../annotation/MetastoreCheckinTest.java        |    25 -
 .../metastore/annotation/MetastoreTest.java     |    24 -
 .../metastore/annotation/MetastoreUnitTest.java |    25 -
 .../hive/metastore/cache/TestCachedStore.java   |  1075 --
 .../metastore/cache/TestCatalogCaching.java     |   142 -
 .../metastore/client/MetaStoreClientTest.java   |    95 -
 .../client/MetaStoreFactoryForTests.java        |   112 -
 .../metastore/client/TestAddPartitions.java     |  1736 ---
 .../client/TestAddPartitionsFromPartSpec.java   |  1267 --
 .../metastore/client/TestAlterPartitions.java   |  1117 --
 .../metastore/client/TestAppendPartitions.java  |   594 -
 .../hive/metastore/client/TestCatalogs.java     |   267 -
 .../metastore/client/TestCheckConstraint.java   |   363 -
 .../hive/metastore/client/TestDatabases.java    |   634 -
 .../metastore/client/TestDefaultConstraint.java |   363 -
 .../metastore/client/TestDropPartitions.java    |   659 -
 .../client/TestExchangePartitions.java          |  1337 --
 .../hive/metastore/client/TestForeignKey.java   |   538 -
 .../hive/metastore/client/TestFunctions.java    |   765 --
 .../metastore/client/TestGetPartitions.java     |   608 -
 .../hive/metastore/client/TestGetTableMeta.java |   330 -
 .../metastore/client/TestListPartitions.java    |  1522 --
 .../metastore/client/TestNotNullConstraint.java |   355 -
 .../hive/metastore/client/TestPrimaryKey.java   |   468 -
 .../hive/metastore/client/TestRuntimeStats.java |   154 -
 .../TestTablesCreateDropAlterTruncate.java      |  1385 --
 .../metastore/client/TestTablesGetExists.java   |   514 -
 .../hive/metastore/client/TestTablesList.java   |   320 -
 .../metastore/client/TestUniqueConstraint.java  |   356 -
 .../hive/metastore/client/package-info.java     |    22 -
 .../merge/DecimalColumnStatsMergerTest.java     |   235 -
 .../hive/metastore/conf/TestMetastoreConf.java  |   433 -
 .../TestDataSourceProviderFactory.java          |   248 -
 .../hive/metastore/dbinstall/DbInstallBase.java |   265 -
 .../hive/metastore/dbinstall/ITestMysql.java    |    82 -
 .../hive/metastore/dbinstall/ITestOracle.java   |    83 -
 .../hive/metastore/dbinstall/ITestPostgres.java |    82 -
 .../metastore/dbinstall/ITestSqlServer.java     |    84 -
 .../json/TestJSONMessageDeserializer.java       |   115 -
 .../hive/metastore/metrics/TestMetrics.java     |   164 -
 .../minihms/AbstractMetaStoreService.java       |   173 -
 .../minihms/ClusterMetaStoreForTests.java       |    32 -
 .../minihms/EmbeddedMetaStoreForTests.java      |    33 -
 .../hadoop/hive/metastore/minihms/MiniHMS.java  |    76 -
 .../minihms/RemoteMetaStoreForTests.java        |    43 -
 .../hive/metastore/minihms/package-info.java    |    23 -
 .../tools/TestMetastoreSchemaTool.java          |    70 -
 .../tools/TestSchemaToolForMetastore.java       |   534 -
 .../metastore/txn/TestTxnHandlerNegative.java   |    58 -
 .../hadoop/hive/metastore/txn/TestTxnUtils.java |   239 -
 .../hive/metastore/utils/TestHdfsUtils.java     |   348 -
 .../metastore/utils/TestMetaStoreUtils.java     |   291 -
 standalone-metastore/metastore-server/pom.xml   |   684 +
 .../metastore-server/src/assembly/bin.xml       |   134 +
 .../metastore-server/src/assembly/src.xml       |    53 +
 .../hadoop/hive/common/StatsSetupConst.java     |   335 +
 .../common/ndv/NumDistinctValueEstimator.java   |    51 +
 .../ndv/NumDistinctValueEstimatorFactory.java   |    75 +
 .../hadoop/hive/common/ndv/fm/FMSketch.java     |   359 +
 .../hive/common/ndv/fm/FMSketchUtils.java       |   132 +
 .../hive/common/ndv/hll/HLLConstants.java       |   933 ++
 .../hive/common/ndv/hll/HLLDenseRegister.java   |   202 +
 .../hadoop/hive/common/ndv/hll/HLLRegister.java |    50 +
 .../hive/common/ndv/hll/HLLSparseRegister.java  |   261 +
 .../hadoop/hive/common/ndv/hll/HyperLogLog.java |   664 +
 .../hive/common/ndv/hll/HyperLogLogUtils.java   |   409 +
 .../hive/metastore/AcidEventListener.java       |   146 +
 .../hive/metastore/AggregateStatsCache.java     |   571 +
 .../hadoop/hive/metastore/AlterHandler.java     |   202 +
 .../apache/hadoop/hive/metastore/Batchable.java |    86 +
 .../hadoop/hive/metastore/ColumnType.java       |   301 +
 .../hadoop/hive/metastore/DatabaseProduct.java  |    75 +
 .../apache/hadoop/hive/metastore/Deadline.java  |   172 +
 .../hive/metastore/DeadlineException.java       |    29 +
 .../DefaultPartitionExpressionProxy.java        |    57 +
 .../metastore/DefaultStorageSchemaReader.java   |    38 +
 .../hive/metastore/FileMetadataHandler.java     |   109 +
 .../hive/metastore/FileMetadataManager.java     |   119 +
 .../hive/metastore/HMSMetricsListener.java      |    90 +
 .../hadoop/hive/metastore/HiveAlterHandler.java |   948 ++
 .../hadoop/hive/metastore/HiveMetaStore.java    |  9353 +++++++++++++
 .../hive/metastore/HiveMetaStoreClient.java     |  3422 +++++
 .../hive/metastore/HiveMetaStoreFsImpl.java     |    55 +
 .../hive/metastore/IExtrapolatePartStatus.java  |    85 +
 .../hadoop/hive/metastore/IHMSHandler.java      |   104 +
 .../hadoop/hive/metastore/IMetaStoreClient.java |  3699 +++++
 .../hive/metastore/IMetaStoreSchemaInfo.java    |   115 +
 .../metastore/LinearExtrapolatePartStatus.java  |   106 +
 .../hive/metastore/LockComponentBuilder.java    |   121 +
 .../hive/metastore/LockRequestBuilder.java      |   168 +
 .../MaterializationsRebuildLockCleanerTask.java |    81 +
 .../MaterializationsRebuildLockHandler.java     |   216 +
 .../hive/metastore/MetaStoreDirectSql.java      |  2817 ++++
 .../metastore/MetaStoreEndFunctionContext.java  |    59 +
 .../metastore/MetaStoreEndFunctionListener.java |    58 +
 .../hive/metastore/MetaStoreEventListener.java  |   306 +
 .../MetaStoreEventListenerConstants.java        |    41 +
 .../hadoop/hive/metastore/MetaStoreFS.java      |    43 +
 .../hadoop/hive/metastore/MetaStoreInit.java    |   109 +
 .../hive/metastore/MetaStoreInitContext.java    |    27 +
 .../hive/metastore/MetaStoreInitListener.java   |    49 +
 .../metastore/MetaStoreListenerNotifier.java    |   375 +
 .../metastore/MetaStorePreEventListener.java    |    57 +
 .../hive/metastore/MetaStoreSchemaInfo.java     |   246 +
 .../metastore/MetaStoreSchemaInfoFactory.java   |    64 +
 .../hadoop/hive/metastore/MetaStoreThread.java  |    58 +
 .../hadoop/hive/metastore/MetadataStore.java    |    52 +
 .../hive/metastore/MetastoreTaskThread.java     |    38 +
 .../hadoop/hive/metastore/ObjectStore.java      | 12207 +++++++++++++++++
 .../hive/metastore/PartFilterExprUtil.java      |   165 +
 .../metastore/PartitionExpressionProxy.java     |    73 +
 .../apache/hadoop/hive/metastore/RawStore.java  |  1682 +++
 .../hadoop/hive/metastore/RawStoreProxy.java    |   114 +
 .../hive/metastore/ReplChangeManager.java       |   501 +
 .../hive/metastore/RetryingHMSHandler.java      |   232 +
 .../hive/metastore/RetryingMetaStoreClient.java |   341 +
 .../hive/metastore/RuntimeStatsCleanerTask.java |    66 +
 .../metastore/SessionPropertiesListener.java    |    46 +
 .../hive/metastore/StatObjectConverter.java     |   892 ++
 .../hive/metastore/TServerSocketKeepAlive.java  |    47 +
 .../hive/metastore/TSetIpAddressProcessor.java  |    62 +
 .../hive/metastore/TUGIBasedProcessor.java      |   183 +
 .../hadoop/hive/metastore/TableIterable.java    |   115 +
 .../hadoop/hive/metastore/ThreadPool.java       |    63 +
 .../TransactionalMetaStoreEventListener.java    |    39 +
 .../TransactionalValidationListener.java        |   487 +
 .../apache/hadoop/hive/metastore/Warehouse.java |   756 +
 .../hive/metastore/api/utils/DecimalUtils.java  |    49 +
 .../hive/metastore/cache/ByteArrayWrapper.java  |    45 +
 .../hadoop/hive/metastore/cache/CacheUtils.java |   136 +
 .../hive/metastore/cache/CachedStore.java       |  2532 ++++
 .../hive/metastore/cache/SharedCache.java       |  1650 +++
 .../client/builder/CatalogBuilder.java          |    62 +
 .../client/builder/ConstraintBuilder.java       |   115 +
 .../client/builder/DatabaseBuilder.java         |   122 +
 .../client/builder/FunctionBuilder.java         |   143 +
 .../GrantRevokePrivilegeRequestBuilder.java     |    63 +
 .../builder/HiveObjectPrivilegeBuilder.java     |    69 +
 .../client/builder/HiveObjectRefBuilder.java    |    69 +
 .../client/builder/ISchemaBuilder.java          |   102 +
 .../client/builder/PartitionBuilder.java        |   119 +
 .../builder/PrivilegeGrantInfoBuilder.java      |    84 +
 .../metastore/client/builder/RoleBuilder.java   |    55 +
 .../builder/SQLCheckConstraintBuilder.java      |    51 +
 .../builder/SQLDefaultConstraintBuilder.java    |    51 +
 .../client/builder/SQLForeignKeyBuilder.java    |   103 +
 .../builder/SQLNotNullConstraintBuilder.java    |    52 +
 .../client/builder/SQLPrimaryKeyBuilder.java    |    52 +
 .../builder/SQLUniqueConstraintBuilder.java     |    46 +
 .../client/builder/SchemaVersionBuilder.java    |   114 +
 .../client/builder/SerdeAndColsBuilder.java     |   124 +
 .../builder/StorageDescriptorBuilder.java       |   163 +
 .../metastore/client/builder/TableBuilder.java  |   224 +
 .../aggr/BinaryColumnStatsAggregator.java       |    61 +
 .../aggr/BooleanColumnStatsAggregator.java      |    62 +
 .../columnstats/aggr/ColumnStatsAggregator.java |    35 +
 .../aggr/ColumnStatsAggregatorFactory.java      |   113 +
 .../aggr/DateColumnStatsAggregator.java         |   360 +
 .../aggr/DecimalColumnStatsAggregator.java      |   375 +
 .../aggr/DoubleColumnStatsAggregator.java       |   348 +
 .../aggr/IExtrapolatePartStatus.java            |    47 +
 .../aggr/LongColumnStatsAggregator.java         |   348 +
 .../aggr/StringColumnStatsAggregator.java       |   304 +
 .../cache/DateColumnStatsDataInspector.java     |   124 +
 .../cache/DecimalColumnStatsDataInspector.java  |   124 +
 .../cache/DoubleColumnStatsDataInspector.java   |   124 +
 .../cache/LongColumnStatsDataInspector.java     |   124 +
 .../cache/StringColumnStatsDataInspector.java   |   125 +
 .../merge/BinaryColumnStatsMerger.java          |    35 +
 .../merge/BooleanColumnStatsMerger.java         |    35 +
 .../columnstats/merge/ColumnStatsMerger.java    |    31 +
 .../merge/ColumnStatsMergerFactory.java         |   120 +
 .../merge/DateColumnStatsMerger.java            |    59 +
 .../merge/DecimalColumnStatsMerger.java         |    85 +
 .../merge/DoubleColumnStatsMerger.java          |    54 +
 .../merge/LongColumnStatsMerger.java            |    54 +
 .../merge/StringColumnStatsMerger.java          |    54 +
 .../metastore/conf/ConfTemplatePrinter.java     |   150 +
 .../hive/metastore/conf/MetastoreConf.java      |  1686 +++
 .../hive/metastore/conf/TimeValidator.java      |    67 +
 .../datasource/BoneCPDataSourceProvider.java    |    87 +
 .../datasource/DataSourceProvider.java          |    79 +
 .../datasource/DataSourceProviderFactory.java   |    66 +
 .../datasource/DbCPDataSourceProvider.java      |   117 +
 .../datasource/HikariCPDataSourceProvider.java  |    89 +
 .../hive/metastore/datasource/package-info.java |    23 +
 .../hive/metastore/events/AbortTxnEvent.java    |    51 +
 .../hive/metastore/events/AcidWriteEvent.java   |    91 +
 .../metastore/events/AddForeignKeyEvent.java    |    41 +
 .../events/AddNotNullConstraintEvent.java       |    42 +
 .../metastore/events/AddPartitionEvent.java     |    84 +
 .../metastore/events/AddPrimaryKeyEvent.java    |    42 +
 .../metastore/events/AddSchemaVersionEvent.java |    40 +
 .../events/AddUniqueConstraintEvent.java        |    42 +
 .../metastore/events/AllocWriteIdEvent.java     |    57 +
 .../metastore/events/AlterCatalogEvent.java     |    44 +
 .../metastore/events/AlterDatabaseEvent.java    |    56 +
 .../metastore/events/AlterISchemaEvent.java     |    45 +
 .../metastore/events/AlterPartitionEvent.java   |    75 +
 .../events/AlterSchemaVersionEvent.java         |    46 +
 .../hive/metastore/events/AlterTableEvent.java  |    63 +
 .../hive/metastore/events/CommitTxnEvent.java   |    51 +
 .../metastore/events/ConfigChangeEvent.java     |    52 +
 .../metastore/events/CreateCatalogEvent.java    |    39 +
 .../metastore/events/CreateDatabaseEvent.java   |    43 +
 .../metastore/events/CreateFunctionEvent.java   |    43 +
 .../metastore/events/CreateISchemaEvent.java    |    39 +
 .../hive/metastore/events/CreateTableEvent.java |    43 +
 .../hive/metastore/events/DropCatalogEvent.java |    39 +
 .../metastore/events/DropConstraintEvent.java   |    57 +
 .../metastore/events/DropDatabaseEvent.java     |    43 +
 .../metastore/events/DropFunctionEvent.java     |    43 +
 .../hive/metastore/events/DropISchemaEvent.java |    39 +
 .../metastore/events/DropPartitionEvent.java    |    70 +
 .../events/DropSchemaVersionEvent.java          |    40 +
 .../hive/metastore/events/DropTableEvent.java   |    54 +
 .../hive/metastore/events/EventCleanerTask.java |    66 +
 .../hive/metastore/events/InsertEvent.java      |   132 +
 .../hive/metastore/events/ListenerEvent.java    |   187 +
 .../events/LoadPartitionDoneEvent.java          |    57 +
 .../hive/metastore/events/OpenTxnEvent.java     |    51 +
 .../metastore/events/PreAddPartitionEvent.java  |    79 +
 .../events/PreAddSchemaVersionEvent.java        |    39 +
 .../metastore/events/PreAlterCatalogEvent.java  |    40 +
 .../metastore/events/PreAlterDatabaseEvent.java |    47 +
 .../metastore/events/PreAlterISchemaEvent.java  |    44 +
 .../events/PreAlterPartitionEvent.java          |    65 +
 .../events/PreAlterSchemaVersionEvent.java      |    45 +
 .../metastore/events/PreAlterTableEvent.java    |    53 +
 .../events/PreAuthorizationCallEvent.java       |    33 +
 .../metastore/events/PreCreateCatalogEvent.java |    39 +
 .../events/PreCreateDatabaseEvent.java          |    43 +
 .../metastore/events/PreCreateISchemaEvent.java |    39 +
 .../metastore/events/PreCreateTableEvent.java   |    43 +
 .../metastore/events/PreDropCatalogEvent.java   |    39 +
 .../metastore/events/PreDropDatabaseEvent.java  |    43 +
 .../metastore/events/PreDropISchemaEvent.java   |    39 +
 .../metastore/events/PreDropPartitionEvent.java |    67 +
 .../events/PreDropSchemaVersionEvent.java       |    39 +
 .../metastore/events/PreDropTableEvent.java     |    55 +
 .../hive/metastore/events/PreEventContext.java  |    82 +
 .../events/PreLoadPartitionDoneEvent.java       |    64 +
 .../metastore/events/PreReadCatalogEvent.java   |    39 +
 .../metastore/events/PreReadDatabaseEvent.java  |    46 +
 .../metastore/events/PreReadISchemaEvent.java   |    39 +
 .../metastore/events/PreReadTableEvent.java     |    47 +
 .../events/PreReadhSchemaVersionEvent.java      |    36 +
 .../metastore/hooks/JDOConnectionURLHook.java   |    52 +
 .../metastore/messaging/AbortTxnMessage.java    |    36 +
 .../metastore/messaging/AcidWriteMessage.java   |    50 +
 .../messaging/AddForeignKeyMessage.java         |    36 +
 .../messaging/AddNotNullConstraintMessage.java  |    36 +
 .../messaging/AddPartitionMessage.java          |    68 +
 .../messaging/AddPrimaryKeyMessage.java         |    35 +
 .../messaging/AddUniqueConstraintMessage.java   |    36 +
 .../messaging/AllocWriteIdMessage.java          |    36 +
 .../messaging/AlterCatalogMessage.java          |    29 +
 .../messaging/AlterDatabaseMessage.java         |    36 +
 .../messaging/AlterPartitionMessage.java        |    69 +
 .../metastore/messaging/AlterTableMessage.java  |    58 +
 .../metastore/messaging/CommitTxnMessage.java   |    59 +
 .../messaging/CreateCatalogMessage.java         |    25 +
 .../messaging/CreateDatabaseMessage.java        |    31 +
 .../messaging/CreateFunctionMessage.java        |    46 +
 .../metastore/messaging/CreateTableMessage.java |    53 +
 .../metastore/messaging/DropCatalogMessage.java |    25 +
 .../messaging/DropConstraintMessage.java        |    29 +
 .../messaging/DropDatabaseMessage.java          |    27 +
 .../messaging/DropFunctionMessage.java          |    38 +
 .../messaging/DropPartitionMessage.java         |    49 +
 .../metastore/messaging/DropTableMessage.java   |    46 +
 .../hive/metastore/messaging/EventMessage.java  |   127 +
 .../hive/metastore/messaging/EventUtils.java    |   202 +
 .../hive/metastore/messaging/InsertMessage.java |    75 +
 .../messaging/MessageDeserializer.java          |   200 +
 .../metastore/messaging/MessageFactory.java     |   341 +
 .../metastore/messaging/OpenTxnMessage.java     |    38 +
 .../metastore/messaging/PartitionFiles.java     |    53 +
 .../messaging/event/filters/AndFilter.java      |    39 +
 .../messaging/event/filters/BasicFilter.java    |    33 +
 .../event/filters/DatabaseAndTableFilter.java   |    65 +
 .../event/filters/EventBoundaryFilter.java      |    34 +
 .../event/filters/MessageFormatFilter.java      |    36 +
 .../messaging/json/JSONAbortTxnMessage.java     |    88 +
 .../messaging/json/JSONAcidWriteMessage.java    |   150 +
 .../json/JSONAddForeignKeyMessage.java          |   102 +
 .../json/JSONAddNotNullConstraintMessage.java   |    97 +
 .../messaging/json/JSONAddPartitionMessage.java |   175 +
 .../json/JSONAddPrimaryKeyMessage.java          |   102 +
 .../json/JSONAddUniqueConstraintMessage.java    |    99 +
 .../messaging/json/JSONAllocWriteIdMessage.java |   113 +
 .../messaging/json/JSONAlterCatalogMessage.java |    90 +
 .../json/JSONAlterDatabaseMessage.java          |    97 +
 .../json/JSONAlterPartitionMessage.java         |   153 +
 .../messaging/json/JSONAlterTableMessage.java   |   128 +
 .../messaging/json/JSONCommitTxnMessage.java    |   183 +
 .../json/JSONCreateCatalogMessage.java          |    80 +
 .../json/JSONCreateDatabaseMessage.java         |    85 +
 .../json/JSONCreateFunctionMessage.java         |    87 +
 .../messaging/json/JSONCreateTableMessage.java  |   134 +
 .../messaging/json/JSONDropCatalogMessage.java  |    67 +
 .../json/JSONDropConstraintMessage.java         |    91 +
 .../messaging/json/JSONDropDatabaseMessage.java |    72 +
 .../messaging/json/JSONDropFunctionMessage.java |    79 +
 .../json/JSONDropPartitionMessage.java          |   135 +
 .../messaging/json/JSONDropTableMessage.java    |   121 +
 .../messaging/json/JSONInsertMessage.java       |   148 +
 .../messaging/json/JSONMessageDeserializer.java |   273 +
 .../messaging/json/JSONMessageFactory.java      |   402 +
 .../messaging/json/JSONOpenTxnMessage.java      |   106 +
 .../hive/metastore/metrics/JsonReporter.java    |   223 +
 .../hive/metastore/metrics/JvmPauseMonitor.java |   222 +
 .../hadoop/hive/metastore/metrics/Metrics.java  |   244 +
 .../metastore/metrics/MetricsConstants.java     |    46 +
 .../hive/metastore/metrics/PerfLogger.java      |   194 +
 .../hadoop/hive/metastore/model/MCatalog.java   |    58 +
 .../hive/metastore/model/MColumnDescriptor.java |    51 +
 .../hive/metastore/model/MConstraint.java       |   214 +
 .../hive/metastore/model/MCreationMetadata.java |    97 +
 .../hive/metastore/model/MDBPrivilege.java      |   142 +
 .../hadoop/hive/metastore/model/MDatabase.java  |   157 +
 .../hive/metastore/model/MDelegationToken.java  |    45 +
 .../hive/metastore/model/MFieldSchema.java      |    80 +
 .../hadoop/hive/metastore/model/MFunction.java  |   119 +
 .../hive/metastore/model/MGlobalPrivilege.java  |   130 +
 .../hadoop/hive/metastore/model/MISchema.java   |   107 +
 .../hadoop/hive/metastore/model/MIndex.java     |   200 +
 .../hadoop/hive/metastore/model/MMasterKey.java |    55 +
 .../metastore/model/MMetastoreDBProperties.java |    56 +
 .../hive/metastore/model/MNotificationLog.java  |   108 +
 .../metastore/model/MNotificationNextId.java    |    42 +
 .../hadoop/hive/metastore/model/MOrder.java     |    62 +
 .../hadoop/hive/metastore/model/MPartition.java |   155 +
 .../model/MPartitionColumnPrivilege.java        |   171 +
 .../model/MPartitionColumnStatistics.java       |   281 +
 .../hive/metastore/model/MPartitionEvent.java   |    97 +
 .../metastore/model/MPartitionPrivilege.java    |   149 +
 .../hive/metastore/model/MPrincipalDesc.java    |    59 +
 .../hive/metastore/model/MResourceUri.java      |    49 +
 .../hadoop/hive/metastore/model/MRole.java      |    80 +
 .../hadoop/hive/metastore/model/MRoleMap.java   |   120 +
 .../hive/metastore/model/MRuntimeStat.java      |    59 +
 .../hive/metastore/model/MSchemaVersion.java    |   127 +
 .../hadoop/hive/metastore/model/MSerDeInfo.java |   127 +
 .../metastore/model/MStorageDescriptor.java     |   277 +
 .../hive/metastore/model/MStringList.java       |    62 +
 .../hadoop/hive/metastore/model/MTable.java     |   273 +
 .../metastore/model/MTableColumnPrivilege.java  |   170 +
 .../metastore/model/MTableColumnStatistics.java |   272 +
 .../hive/metastore/model/MTablePrivilege.java   |   149 +
 .../model/MTxnWriteNotificationLog.java         |   123 +
 .../hadoop/hive/metastore/model/MType.java      |   105 +
 .../hive/metastore/model/MVersionTable.java     |    57 +
 .../hadoop/hive/metastore/model/MWMMapping.java |    83 +
 .../hadoop/hive/metastore/model/MWMPool.java    |    89 +
 .../hive/metastore/model/MWMResourcePlan.java   |   105 +
 .../hadoop/hive/metastore/model/MWMTrigger.java |    89 +
 .../hive/metastore/parser/ExpressionTree.java   |   606 +
 .../hadoop/hive/metastore/parser/Filter.g       |   486 +
 .../hive/metastore/parser/package-info.java     |    23 +
 .../spec/CompositePartitionSpecProxy.java       |   258 +
 .../spec/PartitionListComposingSpecProxy.java   |   209 +
 .../partition/spec/PartitionSpecProxy.java      |   220 +
 .../spec/PartitionSpecWithSharedSDProxy.java    |   192 +
 .../hive/metastore/security/DBTokenStore.java   |   180 +
 .../security/DelegationTokenIdentifier.java     |    52 +
 .../security/DelegationTokenSecretManager.java  |   134 +
 .../security/DelegationTokenSelector.java       |    33 +
 .../security/DelegationTokenStore.java          |   116 +
 .../metastore/security/DelegationTokenTool.java |   252 +
 .../security/HadoopThriftAuthBridge.java        |   700 +
 .../security/HadoopThriftAuthBridge23.java      |   114 +
 .../metastore/security/MemoryTokenStore.java    |   118 +
 .../MetastoreDelegationTokenManager.java        |   180 +
 .../security/TUGIContainingTransport.java       |    96 +
 .../TokenStoreDelegationTokenSecretManager.java |   334 +
 .../metastore/security/ZooKeeperTokenStore.java |   474 +
 .../hive/metastore/tools/HiveMetaTool.java      |   490 +
 .../hive/metastore/tools/HiveSchemaHelper.java  |   673 +
 .../metastore/tools/MetastoreSchemaTool.java    |   460 +
 .../hive/metastore/tools/SQLGenerator.java      |   187 +
 .../metastore/tools/SchemaToolCommandLine.java  |   308 +
 .../hive/metastore/tools/SchemaToolTask.java    |    32 +
 .../tools/SchemaToolTaskAlterCatalog.java       |    90 +
 .../tools/SchemaToolTaskCreateCatalog.java      |   132 +
 .../tools/SchemaToolTaskCreateUser.java         |   115 +
 .../metastore/tools/SchemaToolTaskInfo.java     |    43 +
 .../metastore/tools/SchemaToolTaskInit.java     |    73 +
 .../tools/SchemaToolTaskMoveDatabase.java       |    96 +
 .../tools/SchemaToolTaskMoveTable.java          |   142 +
 .../metastore/tools/SchemaToolTaskUpgrade.java  |   116 +
 .../metastore/tools/SchemaToolTaskValidate.java |   630 +
 .../hadoop/hive/metastore/tools/SmokeTest.java  |   102 +
 .../txn/AcidCompactionHistoryService.java       |    71 +
 .../metastore/txn/AcidHouseKeeperService.java   |    71 +
 .../txn/AcidOpenTxnsCounterService.java         |    72 +
 .../hive/metastore/txn/AcidWriteSetService.java |    69 +
 .../hive/metastore/txn/CompactionInfo.java      |   170 +
 .../metastore/txn/CompactionTxnHandler.java     |  1107 ++
 .../hadoop/hive/metastore/txn/TxnDbUtil.java    |   514 +
 .../hadoop/hive/metastore/txn/TxnHandler.java   |  5051 +++++++
 .../hadoop/hive/metastore/txn/TxnStore.java     |   504 +
 .../hadoop/hive/metastore/txn/TxnUtils.java     |   471 +
 .../hive/metastore/utils/CommonCliOptions.java  |   160 +
 .../hadoop/hive/metastore/utils/FileUtils.java  |   537 +
 .../hadoop/hive/metastore/utils/HdfsUtils.java  |   395 +
 .../metastore/utils/HiveStrictManagedUtils.java |   100 +
 .../hadoop/hive/metastore/utils/LogUtils.java   |   140 +
 .../hive/metastore/utils/MetaStoreUtils.java    |  1840 +++
 .../metastore/utils/MetastoreVersionInfo.java   |   133 +
 .../hive/metastore/utils/SecurityUtils.java     |   313 +
 .../hive/metastore/utils/StringableMap.java     |    80 +
 .../main/resources/datanucleus-log4j.properties |    17 +
 .../main/resources/metastore-log4j2.properties  |    71 +
 .../src/main/resources/metastore-site.xml       |    34 +
 .../src/main/resources/package.jdo              |  1420 ++
 .../src/main/resources/saveVersion.sh           |    91 +
 .../metastore-server/src/main/scripts/base      |   237 +
 .../src/main/scripts/ext/metastore.sh           |    41 +
 .../src/main/scripts/ext/schemaTool.sh          |    33 +
 .../src/main/scripts/ext/smokeTest.sh           |    33 +
 .../src/main/scripts/metastore-config.sh        |    69 +
 .../src/main/scripts/schematool                 |    21 +
 .../src/main/scripts/start-metastore            |    22 +
 .../main/sql/derby/hive-schema-1.2.0.derby.sql  |   405 +
 .../main/sql/derby/hive-schema-3.0.0.derby.sql  |   692 +
 .../main/sql/derby/hive-schema-3.1.0.derby.sql  |   720 +
 .../main/sql/derby/hive-schema-4.0.0.derby.sql  |   720 +
 .../sql/derby/upgrade-1.2.0-to-2.0.0.derby.sql  |    62 +
 .../sql/derby/upgrade-2.0.0-to-2.1.0.derby.sql  |    22 +
 .../sql/derby/upgrade-2.1.0-to-2.2.0.derby.sql  |    59 +
 .../sql/derby/upgrade-2.2.0-to-2.3.0.derby.sql  |     5 +
 .../sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql  |   283 +
 .../sql/derby/upgrade-3.0.0-to-3.1.0.derby.sql  |    68 +
 .../sql/derby/upgrade-3.1.0-to-4.0.0.derby.sql  |     6 +
 .../src/main/sql/derby/upgrade.order.derby      |    18 +
 .../src/main/sql/mssql/create-user.mssql.sql    |     5 +
 .../main/sql/mssql/hive-schema-1.2.0.mssql.sql  |   947 ++
 .../main/sql/mssql/hive-schema-3.0.0.mssql.sql  |  1246 ++
 .../main/sql/mssql/hive-schema-3.1.0.mssql.sql  |  1284 ++
 .../main/sql/mssql/hive-schema-4.0.0.mssql.sql  |  1284 ++
 .../sql/mssql/upgrade-1.2.0-to-2.0.0.mssql.sql  |    73 +
 .../sql/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql  |    39 +
 .../sql/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql  |    43 +
 .../sql/mssql/upgrade-2.2.0-to-2.3.0.mssql.sql  |     7 +
 .../sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql  |   352 +
 .../sql/mssql/upgrade-3.0.0-to-3.1.0.mssql.sql  |    70 +
 .../sql/mssql/upgrade-3.1.0-to-4.0.0.mssql.sql  |     6 +
 .../src/main/sql/mssql/upgrade.order.mssql      |    12 +
 .../src/main/sql/mysql/create-user.mysql.sql    |     8 +
 .../main/sql/mysql/hive-schema-1.2.0.mysql.sql  |   910 ++
 .../main/sql/mysql/hive-schema-3.0.0.mysql.sql  |  1183 ++
 .../main/sql/mysql/hive-schema-3.1.0.mysql.sql  |  1218 ++
 .../main/sql/mysql/hive-schema-4.0.0.mysql.sql  |  1218 ++
 .../sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql  |    75 +
 .../sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql  |    42 +
 .../sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql  |    43 +
 .../sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql  |     8 +
 .../sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql  |   326 +
 .../sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql  |    71 +
 .../sql/mysql/upgrade-3.1.0-to-4.0.0.mysql.sql  |     6 +
 .../src/main/sql/mysql/upgrade.order.mysql      |    18 +
 .../src/main/sql/oracle/create-user.oracle.sql  |     3 +
 .../sql/oracle/hive-schema-1.2.0.oracle.sql     |   856 ++
 .../sql/oracle/hive-schema-3.0.0.oracle.sql     |  1140 ++
 .../sql/oracle/hive-schema-3.1.0.oracle.sql     |  1175 ++
 .../sql/oracle/hive-schema-4.0.0.oracle.sql     |  1175 ++
 .../oracle/upgrade-1.2.0-to-2.0.0.oracle.sql    |    83 +
 .../oracle/upgrade-2.0.0-to-2.1.0.oracle.sql    |    39 +
 .../oracle/upgrade-2.1.0-to-2.2.0.oracle.sql    |    58 +
 .../oracle/upgrade-2.2.0-to-2.3.0.oracle.sql    |     7 +
 .../oracle/upgrade-2.3.0-to-3.0.0.oracle.sql    |   342 +
 .../oracle/upgrade-3.0.0-to-3.1.0.oracle.sql    |    70 +
 .../oracle/upgrade-3.1.0-to-4.0.0.oracle.sql    |     6 +
 .../src/main/sql/oracle/upgrade.order.oracle    |    14 +
 .../main/sql/postgres/create-user.postgres.sql  |     2 +
 .../sql/postgres/hive-schema-1.2.0.postgres.sql |  1562 +++
 .../sql/postgres/hive-schema-3.0.0.postgres.sql |  1827 +++
 .../sql/postgres/hive-schema-3.1.0.postgres.sql |  1866 +++
 .../sql/postgres/hive-schema-4.0.0.postgres.sql |  1866 +++
 .../upgrade-1.2.0-to-2.0.0.postgres.sql         |    73 +
 .../upgrade-2.0.0-to-2.1.0.postgres.sql         |    40 +
 .../upgrade-2.1.0-to-2.2.0.postgres.sql         |    39 +
 .../upgrade-2.2.0-to-2.3.0.postgres.sql         |     8 +
 .../upgrade-2.3.0-to-3.0.0.postgres.sql         |   360 +
 .../upgrade-3.0.0-to-3.1.0.postgres.sql         |    72 +
 .../upgrade-3.1.0-to-4.0.0.postgres.sql         |     6 +
 .../main/sql/postgres/upgrade.order.postgres    |    18 +
 .../hadoop/hive/common/TestStatsSetupConst.java |   114 +
 .../ndv/fm/TestFMSketchSerialization.java       |   101 +
 .../hive/common/ndv/hll/TestHLLNoBias.java      |   117 +
 .../common/ndv/hll/TestHLLSerialization.java    |   270 +
 .../hive/common/ndv/hll/TestHyperLogLog.java    |   338 +
 .../common/ndv/hll/TestHyperLogLogDense.java    |    85 +
 .../common/ndv/hll/TestHyperLogLogMerge.java    |   147 +
 .../common/ndv/hll/TestHyperLogLogSparse.java   |    84 +
 .../common/ndv/hll/TestSparseEncodeHash.java    |    59 +
 .../metastore/AlternateFailurePreListener.java  |    62 +
 .../metastore/DummyEndFunctionListener.java     |    47 +
 .../metastore/DummyJdoConnectionUrlHook.java    |    45 +
 .../hadoop/hive/metastore/DummyListener.java    |   126 +
 .../metastore/DummyMetaStoreInitListener.java   |    39 +
 .../hadoop/hive/metastore/DummyPreListener.java |    49 +
 .../DummyRawStoreControlledCommit.java          |  1226 ++
 .../DummyRawStoreForJdoConnection.java          |  1212 ++
 .../apache/hadoop/hive/metastore/FakeDerby.java |   404 +
 .../HiveMetaStoreClientPreCatalog.java          |  3424 +++++
 .../InjectableBehaviourObjectStore.java         |   211 +
 .../hive/metastore/IpAddressListener.java       |   102 +
 .../hive/metastore/MetaStoreTestUtils.java      |   291 +
 .../MockPartitionExpressionForMetastore.java    |    58 +
 .../hive/metastore/NonCatCallsWithCatalog.java  |  1158 ++
 .../hadoop/hive/metastore/TestAdminUser.java    |    49 +
 .../hive/metastore/TestAggregateStatsCache.java |   272 +
 .../metastore/TestCatalogNonDefaultClient.java  |    74 +
 .../metastore/TestCatalogNonDefaultSvr.java     |    68 +
 .../hive/metastore/TestCatalogOldClient.java    |    44 +
 .../hadoop/hive/metastore/TestDeadline.java     |   130 +
 .../metastore/TestEmbeddedHiveMetaStore.java    |    51 +
 .../hadoop/hive/metastore/TestFilterHooks.java  |   254 +
 .../hive/metastore/TestHiveAlterHandler.java    |   121 +
 .../hive/metastore/TestHiveMetaStore.java       |  3103 +++++
 .../metastore/TestHiveMetaStoreGetMetaConf.java |   115 +
 .../TestHiveMetaStorePartitionSpecs.java        |   383 +
 .../TestHiveMetaStoreSchemaMethods.java         |  1248 ++
 .../metastore/TestHiveMetaStoreTimeout.java     |   142 +
 .../hive/metastore/TestHiveMetaStoreTxns.java   |   267 +
 ...TestHiveMetaStoreWithEnvironmentContext.java |   191 +
 .../hive/metastore/TestHiveMetastoreCli.java    |    68 +
 .../hive/metastore/TestLockRequestBuilder.java  |   587 +
 .../hive/metastore/TestMarkPartition.java       |   118 +
 .../hive/metastore/TestMarkPartitionRemote.java |    34 +
 .../TestMetaStoreConnectionUrlHook.java         |    49 +
 .../TestMetaStoreEndFunctionListener.java       |   146 +
 .../metastore/TestMetaStoreEventListener.java   |   471 +
 .../TestMetaStoreEventListenerOnlyOnCommit.java |   121 +
 .../TestMetaStoreEventListenerWithOldConf.java  |   129 +
 .../metastore/TestMetaStoreInitListener.java    |    56 +
 .../metastore/TestMetaStoreListenersError.java  |    97 +
 .../metastore/TestMetaStoreSchemaFactory.java   |    72 +
 .../hive/metastore/TestMetaStoreSchemaInfo.java |    55 +
 .../hadoop/hive/metastore/TestObjectStore.java  |   904 ++
 .../metastore/TestObjectStoreInitRetry.java     |   135 +
 .../metastore/TestObjectStoreSchemaMethods.java |   602 +
 .../hadoop/hive/metastore/TestOldSchema.java    |   233 +
 .../TestPartitionNameWhitelistValidation.java   |   125 +
 .../hive/metastore/TestRawStoreProxy.java       |    67 +
 .../hive/metastore/TestRemoteHiveMetaStore.java |    64 +
 .../TestRemoteHiveMetaStoreIpAddress.java       |    66 +
 .../TestRemoteUGIHiveMetaStoreIpAddress.java    |    31 +
 .../TestRetriesInRetryingHMSHandler.java        |   111 +
 .../hive/metastore/TestRetryingHMSHandler.java  |    82 +
 .../metastore/TestSetUGIOnBothClientServer.java |    34 +
 .../hive/metastore/TestSetUGIOnOnlyClient.java  |    35 +
 .../hive/metastore/TestSetUGIOnOnlyServer.java  |    35 +
 .../apache/hadoop/hive/metastore/TestStats.java |   732 +
 .../hive/metastore/TestTableIterable.java       |    76 +
 .../hive/metastore/VerifyingObjectStore.java    |   219 +
 .../annotation/MetastoreCheckinTest.java        |    25 +
 .../metastore/annotation/MetastoreTest.java     |    24 +
 .../metastore/annotation/MetastoreUnitTest.java |    25 +
 .../hive/metastore/cache/TestCachedStore.java   |  1075 ++
 .../metastore/cache/TestCatalogCaching.java     |   142 +
 .../metastore/client/MetaStoreClientTest.java   |    95 +
 .../client/MetaStoreFactoryForTests.java        |   112 +
 .../metastore/client/TestAddPartitions.java     |  1736 +++
 .../client/TestAddPartitionsFromPartSpec.java   |  1267 ++
 .../metastore/client/TestAlterPartitions.java   |  1117 ++
 .../metastore/client/TestAppendPartitions.java  |   594 +
 .../hive/metastore/client/TestCatalogs.java     |   267 +
 .../metastore/client/TestCheckConstraint.java   |   363 +
 .../hive/metastore/client/TestDatabases.java    |   634 +
 .../metastore/client/TestDefaultConstraint.java |   363 +
 .../metastore/client/TestDropPartitions.java    |   659 +
 .../client/TestExchangePartitions.java          |  1337 ++
 .../hive/metastore/client/TestForeignKey.java   |   538 +
 .../hive/metastore/client/TestFunctions.java    |   765 ++
 .../metastore/client/TestGetPartitions.java     |   608 +
 .../hive/metastore/client/TestGetTableMeta.java |   330 +
 .../metastore/client/TestListPartitions.java    |  1522 ++
 .../metastore/client/TestNotNullConstraint.java |   355 +
 .../hive/metastore/client/TestPrimaryKey.java   |   468 +
 .../hive/metastore/client/TestRuntimeStats.java |   154 +
 .../TestTablesCreateDropAlterTruncate.java      |  1385 ++
 .../metastore/client/TestTablesGetExists.java   |   514 +
 .../hive/metastore/client/TestTablesList.java   |   320 +
 .../metastore/client/TestUniqueConstraint.java  |   356 +
 .../hive/metastore/client/package-info.java     |    22 +
 .../merge/DecimalColumnStatsMergerTest.java     |   235 +
 .../hive/metastore/conf/TestMetastoreConf.java  |   433 +
 .../TestDataSourceProviderFactory.java          |   248 +
 .../hive/metastore/dbinstall/DbInstallBase.java |   265 +
 .../hive/metastore/dbinstall/ITestMysql.java    |    82 +
 .../hive/metastore/dbinstall/ITestOracle.java   |    83 +
 .../hive/metastore/dbinstall/ITestPostgres.java |    82 +
 .../metastore/dbinstall/ITestSqlServer.java     |    84 +
 .../json/TestJSONMessageDeserializer.java       |   115 +
 .../hive/metastore/metrics/TestMetrics.java     |   164 +
 .../minihms/AbstractMetaStoreService.java       |   173 +
 .../minihms/ClusterMetaStoreForTests.java       |    32 +
 .../minihms/EmbeddedMetaStoreForTests.java      |    33 +
 .../hadoop/hive/metastore/minihms/MiniHMS.java  |    76 +
 .../minihms/RemoteMetaStoreForTests.java        |    43 +
 .../tools/TestMetastoreSchemaTool.java          |    70 +
 .../tools/TestSchemaToolForMetastore.java       |   534 +
 .../metastore/txn/TestTxnHandlerNegative.java   |    58 +
 .../hadoop/hive/metastore/txn/TestTxnUtils.java |   239 +
 .../hive/metastore/utils/TestHdfsUtils.java     |   348 +
 .../metastore/utils/TestMetaStoreUtils.java     |   291 +
 .../src/test/resources/log4j2.properties        |    35 +
 standalone-metastore/pom.xml                    |     1 +
 upgrade-acid/pom.xml                            |     2 +-
 1132 files changed, 165663 insertions(+), 164577 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 33f209d..0d4aa44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ itests/hive-blobstore/src/test/resources/blobstore-conf.xml
 patchprocess
 standalone-metastore/src/gen/version
 standalone-metastore/metastore-common/src/gen/version
+standalone-metastore/metastore-server/src/gen/version

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/hcatalog/core/pom.xml
----------------------------------------------------------------------
diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml
index 06e83e1..6afe8c4 100644
--- a/hcatalog/core/pom.xml
+++ b/hcatalog/core/pom.xml
@@ -74,6 +74,13 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <!-- inter-project -->
     <dependency>
       <groupId>com.google.guava</groupId>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/hcatalog/webhcat/java-client/pom.xml
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/java-client/pom.xml b/hcatalog/webhcat/java-client/pom.xml
index 185c785..66ebfb5 100644
--- a/hcatalog/webhcat/java-client/pom.xml
+++ b/hcatalog/webhcat/java-client/pom.xml
@@ -82,6 +82,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>
       <artifactId>hive-hcatalog-core</artifactId>
       <version>${project.version}</version>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/hcatalog/webhcat/svr/pom.xml
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml
index 8e4bc70..d19e99a 100644
--- a/hcatalog/webhcat/svr/pom.xml
+++ b/hcatalog/webhcat/svr/pom.xml
@@ -208,6 +208,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>${junit.version}</version>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/itests/hcatalog-unit/pom.xml
----------------------------------------------------------------------
diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml
index 0568cf6..593c9de 100644
--- a/itests/hcatalog-unit/pom.xml
+++ b/itests/hcatalog-unit/pom.xml
@@ -104,6 +104,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
       <artifactId>hive-exec</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/itests/hive-blobstore/pom.xml
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml
index b8d5f0d..83c26da 100644
--- a/itests/hive-blobstore/pom.xml
+++ b/itests/hive-blobstore/pom.xml
@@ -68,6 +68,19 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
       <artifactId>hive-it-unit</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/itests/hive-minikdc/pom.xml
----------------------------------------------------------------------
diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml
index 406c407..10801a0 100644
--- a/itests/hive-minikdc/pom.xml
+++ b/itests/hive-minikdc/pom.xml
@@ -87,6 +87,19 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <classifier>tests</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
       <artifactId>hive-serde</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/itests/hive-unit-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml
index 3288659..4ebb866 100644
--- a/itests/hive-unit-hadoop2/pom.xml
+++ b/itests/hive-unit-hadoop2/pom.xml
@@ -107,6 +107,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
       <artifactId>hive-serde</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/itests/hive-unit/pom.xml
----------------------------------------------------------------------
diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml
index 6081884..711856e 100644
--- a/itests/hive-unit/pom.xml
+++ b/itests/hive-unit/pom.xml
@@ -183,6 +183,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
       <artifactId>hive-serde</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -568,7 +574,7 @@
                   <fileset dir="${basedir}/${hive.path.to.root}/metastore/scripts/"/>
                 </copy>
                 <copy todir="${test.tmp.dir}/scripts/metastore/upgrade" overwrite="true">
-                  <fileset dir="${basedir}/${hive.path.to.root}/standalone-metastore/metastore-common/src/main/sql/"/>
+                  <fileset dir="${basedir}/${hive.path.to.root}/standalone-metastore/metastore-server/src/main/sql/"/>
                 </copy>
               </target>
             </configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/itests/qtest-accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml
index e0c31e4..abfb5cb 100644
--- a/itests/qtest-accumulo/pom.xml
+++ b/itests/qtest-accumulo/pom.xml
@@ -80,6 +80,19 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
       <artifactId>hive-it-custom-serde</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/itests/qtest-spark/pom.xml
----------------------------------------------------------------------
diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml
index c33aa90..d77dc89 100644
--- a/itests/qtest-spark/pom.xml
+++ b/itests/qtest-spark/pom.xml
@@ -140,6 +140,19 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
       <artifactId>hive-it-custom-serde</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/itests/qtest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml
index 8020743..5767806 100644
--- a/itests/qtest/pom.xml
+++ b/itests/qtest/pom.xml
@@ -71,6 +71,19 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
       <artifactId>hive-it-custom-serde</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/itests/util/pom.xml
----------------------------------------------------------------------
diff --git a/itests/util/pom.xml b/itests/util/pom.xml
index e1aece6..9a36446 100644
--- a/itests/util/pom.xml
+++ b/itests/util/pom.xml
@@ -119,6 +119,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
       <artifactId>hive-llap-server</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/llap-server/pom.xml
----------------------------------------------------------------------
diff --git a/llap-server/pom.xml b/llap-server/pom.xml
index 6b52d5d..e7932b3 100644
--- a/llap-server/pom.xml
+++ b/llap-server/pom.xml
@@ -247,6 +247,13 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <!-- test inter-project -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/metastore/pom.xml
----------------------------------------------------------------------
diff --git a/metastore/pom.xml b/metastore/pom.xml
index a75ab97..7f751a4 100644
--- a/metastore/pom.xml
+++ b/metastore/pom.xml
@@ -49,6 +49,11 @@
       <artifactId>hive-standalone-metastore-common</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 	<dependency>
 		<groupId>javolution</groupId>
 		<artifactId>javolution</artifactId>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/packaging/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/packaging/src/main/assembly/bin.xml b/packaging/src/main/assembly/bin.xml
index 373ed99..eeed3ec 100644
--- a/packaging/src/main/assembly/bin.xml
+++ b/packaging/src/main/assembly/bin.xml
@@ -222,7 +222,7 @@
     </fileSet>
 
     <fileSet>
-      <directory>${project.parent.basedir}/standalone-metastore/metastore-common/src/main/sql</directory>
+      <directory>${project.parent.basedir}/standalone-metastore/metastore-server/src/main/sql</directory>
       <includes>
         <include>**/*</include>
       </includes>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/packaging/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/packaging/src/main/assembly/src.xml b/packaging/src/main/assembly/src.xml
index d9db67d..6b6d9db 100644
--- a/packaging/src/main/assembly/src.xml
+++ b/packaging/src/main/assembly/src.xml
@@ -97,6 +97,7 @@
         <include>spark-client/**/*</include>
         <include>storage-api/**/*</include>
         <include>standalone-metastore/metastore-common/**/*</include>
+        <include>standalone-metastore/metastore-server/**/*</include>
         <include>streaming/**/*</include>
         <include>testutils/**/*</include>
         <include>upgrade-acid/**/*</include>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/ql/pom.xml
----------------------------------------------------------------------
diff --git a/ql/pom.xml b/ql/pom.xml
index fe11d06..a55cbe3 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -463,6 +463,13 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <!-- test inter-project -->
     <dependency>
       <groupId>org.apache.parquet</groupId>
@@ -916,6 +923,7 @@
                   <include>org.apache.hive:hive-llap-client</include>
                   <include>org.apache.hive:hive-metastore</include>
                   <include>org.apache.hive:hive-standalone-metastore-common</include>
+                  <include>org.apache.hive:hive-standalone-metastore-server</include>
                   <include>org.apache.hive:hive-service-rpc</include>
                   <include>com.esotericsoftware:kryo-shaded</include>
                   <include>com.esotericsoftware:minlog</include>

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/service/pom.xml
----------------------------------------------------------------------
diff --git a/service/pom.xml b/service/pom.xml
index 7023472..eca6f3b 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -235,6 +235,13 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-standalone-metastore-server</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <!-- test inter-project -->
     <dependency>
       <groupId>junit</groupId>