Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HIVE-27537 : Backport of HIVE-19416 to branch-3 #4450

Closed
wants to merge 19 commits into from

Conversation

amanraj2520
Copy link
Contributor

What changes were proposed in this pull request?

Why are the changes needed?

Does this PR introduce any user-facing change?

Is the change a dependency upgrade?

How was this patch tested?

sershe-apache and others added 7 commits April 26, 2023 21:15
…E-19416 subtasks, and also HIVE-20062, HIVE-20115 (Sergey Shelukhin)

Change-Id: I3c364a4bcc59b8db3e4be0b2ec5451e30a97548d

# Conflicts:
#	ql/src/java/org/apache/hadoop/hive/ql/io/AcidUtils.java
#	ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java
#	ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
#	ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java
#	ql/src/java/org/apache/hadoop/hive/ql/plan/AlterTableDesc.java
#	ql/src/java/org/apache/hadoop/hive/ql/stats/StatsUpdaterThread.java
#	ql/src/java/org/apache/hadoop/hive/ql/util/HiveStrictManagedMigration.java
#	ql/src/java/org/apache/hadoop/hive/ql/util/UpgradeTool.java
#	ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
#	ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
#	standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
#	standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php
#	standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
#	standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
#	standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
#	standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
#	standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
#	standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java
#	standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
#	standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java
#	standalone-metastore/src/main/resources/package.jdo
#	standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientPreCatalog.java
#	standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/InjectableBehaviourObjectStore.java
…Hemanth reviewed by Naveen Gangam)

(cherry picked from commit 1945e2f)
Upgrade Thrift to 0.13.0

Related work items: #1027219

# Conflicts:
#	pom.xml
#	ql/src/gen/thrift/gen-php/StageType.php
#	service-rpc/src/gen/thrift/gen-php/TGetOperationStatusResp.php
#	service/src/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
#	standalone-metastore/pom.xml
#	standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
#	standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
#	standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp
#	standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp
#	standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h
#	standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
#	standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterPartitionsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlterTableResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Catalog.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByNamesRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPartitionsByNamesResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplLastIdInfo.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php
#	standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
#	standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
#	standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
#	standalone-metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
#	standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java
#	standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TThreadPoolServer_Hive.java
#	standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/TUGIBasedProcessor.java
#	upgrade-acid/pom.xml
# Conflicts:
#	standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
#	standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
# Conflicts:
#	pom.xml
#	ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRTableScan1.java
#	ql/src/java/org/apache/hadoop/hive/ql/parse/ProcessAnalyzeTable.java
#	ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkProcessAnalyzeTable.java
#	ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStatsNoJobTask.java
#	standalone-metastore/pom.xml
# Conflicts:
#	standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
#	standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
#	standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
#	standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddCheckConstraintRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDefaultConstraintRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AllocateTableWriteIdsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CheckConstraintsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CommitTxnRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CreationMetadata.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DefaultConstraintsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataByExprResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetFileMetadataResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTablesResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ReplTblWriteIdStateRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SchemaVersion.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableValidWriteIds.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UniqueConstraintsResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMFullResourcePlan.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetAllResourcePlanResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMGetTriggersForResourePlanResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMValidateResourcePlanResponse.java
#	standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WriteNotificationLogRequest.java
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AbortTxnsRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AddCheckConstraintRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AddDefaultConstraintRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AddDynamicPartitions.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AddForeignKeyRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AddNotNullConstraintRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AddPartitionsRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AddPartitionsResult.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AddPrimaryKeyRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AddUniqueConstraintRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AggrStats.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AllocateTableWriteIdsRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/AllocateTableWriteIdsResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/CheckConstraintsResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ClearFileMetadataRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ClientCapabilities.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ColumnStatistics.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/CommitTxnRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/CompactionRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/CreationMetadata.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/Database.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/DefaultConstraintsResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/DropPartitionsResult.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/EnvironmentContext.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/FindSchemasByColsResp.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/FireEventRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/FireEventRequestData.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/FireEventResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ForeignKeysResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/Function.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetAllFunctionsResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetCatalogsResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetFileMetadataByExprRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetFileMetadataByExprResult.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetFileMetadataRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetFileMetadataResult.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetOpenTxnsInfoResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetOpenTxnsResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetPrincipalsInRoleResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetRoleGrantsForPrincipalResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetTableRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetTableResult.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetTablesRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetTablesResult.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetValidWriteIdsRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/GetValidWriteIdsResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/HeartbeatTxnRangeResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/InsertEventRequestData.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/LockRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/NotNullConstraintsResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/NotificationEventResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/OpenTxnRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/OpenTxnsResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/Partition.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PartitionListComposingSpec.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PartitionSpec.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PartitionSpecWithSharedSD.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PartitionValuesRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PartitionValuesResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PartitionValuesRow.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PartitionWithoutSD.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PartitionsByExprResult.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PartitionsStatsRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PartitionsStatsResult.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PrimaryKeysResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/PutFileMetadataRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ReplTblWriteIdStateRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/RequestPartsSpec.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/Schema.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/SchemaVersion.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/SerDeInfo.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/SetPartitionsStatsRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ShowCompactResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ShowLocksResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/SkewedInfo.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/StorageDescriptor.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/Table.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/TableStatsRequest.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/TableStatsResult.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/TableValidWriteIds.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastoreClient.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastoreIf.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_add_partitions_pspec_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_alter_partitions_with_environment_context_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_append_partition_with_environment_context_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_create_table_with_constraints_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_drop_partition_with_environment_context_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partition_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partitions_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_exchange_partitions_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_databases_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_tables_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_all_token_identifiers_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_databases_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_fields_with_environment_context_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_functions_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_master_keys_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_materialized_views_for_rewriting_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_part_specs_by_filter_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_ps_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_names_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partition_with_auth_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_filter_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_by_names_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_ps_with_auth_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_pspec_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_auth_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_partitions_with_auth_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_privilege_set_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_role_names_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_runtime_stats_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_all_versions_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_schema_with_environment_context_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_meta_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_meta_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_names_by_filter_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_objects_by_name_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_table_objects_by_name_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_by_type_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_tables_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_get_type_all_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_isPartitionMarkedForEvent_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_privileges_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_list_roles_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_markPartitionForEvent_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_has_valid_characters_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_spec_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_partition_name_to_vals_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_rename_partition_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_ugi_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_set_ugi_result.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore_truncate_table_args.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/UniqueConstraintsResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/WMFullResourcePlan.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/WMGetAllResourcePlanResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/WMGetTriggersForResourePlanResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/WMValidateResourcePlanResponse.php
#	standalone-metastore/src/gen/thrift/gen-php/metastore/WriteNotificationLogRequest.php
#	standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
#	standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
#	standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
#	standalone-metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
#	standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java
#	standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/client/TestTablesCreateDropAlterTruncate.java
Change-Id: I324b8031998fd9a4a789a0a729644cf79483f597
Copy link
Contributor

@sankarh sankarh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@amanraj2520

  1. Noticed several partial cherry-picks. Can you add details of trade-offs, what is skipped in cherry-picks and why is it not impacting overall functionality?
  2. Why there are custom test output fixes? Share justification for the same.
  3. Re-generate thrift files instead of cherry-picking those changes to ensure it is truly compatible with new thrift version.
  4. Update the title, description to list all the JIRA IDs involved in this backport.

@@ -171,7 +171,8 @@ CREATE TABLE "PARTITIONS" (
"LAST_ACCESS_TIME" bigint NOT NULL,
"PART_NAME" character varying(767) DEFAULT NULL::character varying,
"SD_ID" bigint,
"TBL_ID" bigint
"TBL_ID" bigint,
"WRITE_ID" bigint DEFAULT 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add WRITE_ID column in hive-schema-3.2.0.*.sql files only.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already done

@@ -395,7 +396,8 @@ CREATE TABLE "TBLS" (
"TBL_TYPE" character varying(128) DEFAULT NULL::character varying,
"VIEW_EXPANDED_TEXT" text,
"VIEW_ORIGINAL_TEXT" text,
"IS_REWRITE_ENABLED" boolean NOT NULL DEFAULT false
"IS_REWRITE_ENABLED" boolean NOT NULL DEFAULT false,
"WRITE_ID" bigint DEFAULT 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has been added already in all 3.2.0 schema files

@@ -51,6 +51,11 @@ CREATE TABLE MATERIALIZATION_REBUILD_LOCKS (
PRIMARY KEY(MRL_TXN_ID)
);

-- HIVE-19416
ALTER TABLE "TBLS" ADD COLUMN "WRITE_ID" bigint DEFAULT 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add this change only in upgrade-3.1.0-to-3.2.0.*.sql file only. If this file doesn't exist, then create one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure will do this.

@@ -28,7 +28,6 @@ UPDATE PARTITION_PARAMS SET TEMP=PARAM_VALUE, PARAM_VALUE=NULL;
ALTER TABLE PARTITION_PARAMS DROP COLUMN PARAM_VALUE;
ALTER TABLE PARTITION_PARAMS RENAME COLUMN TEMP TO PARAM_VALUE;


-- These lines need to be last. Insert any changes above.
UPDATE VERSION SET SCHEMA_VERSION='3.2.0', VERSION_COMMENT='Hive release version 3.2.0' where VER_ID=1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come 3.1.0-to-3.2.0 file exist for Oracle but not for Postgres?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is there for both. But this was just a space removal thats why it came as diff. Will check this

@amanraj2520
Copy link
Contributor Author

amanraj2520 commented Jul 29, 2023

@amanraj2520

  1. Noticed several partial cherry-picks. Can you add details of trade-offs, what is skipped in cherry-picks and why is it not impacting overall functionality?
  2. Why there are custom test output fixes? Share justification for the same.
  3. Re-generate thrift files instead of cherry-picking those changes to ensure it is truly compatible with new thrift version.
  4. Update the title, description to list all the JIRA IDs involved in this backport.
  1. I will add them.
  2. There are changes because the column size has changed. Because of a new column of write_id. But will add justification for some of them.
  3. This is already done.
  4. Sure will do this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants