You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2015/09/28 03:10:29 UTC

[09/33] hive git commit: Merge branch 'master' into beeline-cli

Merge branch 'master' into beeline-cli


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

Branch: refs/heads/master
Commit: 00e0d55a8bab27c82655e1aa237138847fd964b3
Parents: 2243de3 2a77e87
Author: Xuefu Zhang <xz...@Cloudera.com>
Authored: Thu Jun 25 20:40:55 2015 -0700
Committer: Xuefu Zhang <xz...@Cloudera.com>
Committed: Thu Jun 25 20:40:55 2015 -0700

----------------------------------------------------------------------
 NOTICE                                          |    2 +-
 README.txt                                      |   36 +-
 RELEASE_NOTES.txt                               | 1020 ++-
 accumulo-handler/pom.xml                        |    2 +-
 .../accumulo/AccumuloConnectionParameters.java  |  111 +-
 .../hive/accumulo/AccumuloStorageHandler.java   |   50 +
 .../hive/accumulo/HiveAccumuloHelper.java       |  280 +
 .../mr/HiveAccumuloTableInputFormat.java        |   74 +-
 .../mr/HiveAccumuloTableOutputFormat.java       |   63 +-
 .../TestAccumuloConnectionParameters.java       |   19 +
 .../hive/accumulo/TestHiveAccumuloHelper.java   |   75 +
 .../mr/TestHiveAccumuloTableInputFormat.java    |    8 +-
 .../mr/TestHiveAccumuloTableOutputFormat.java   |    2 +-
 .../positive/accumulo_predicate_pushdown.q.out  |   76 +-
 .../results/positive/accumulo_queries.q.out     |   70 +-
 ant/pom.xml                                     |    2 +-
 .../apache/hadoop/hive/ant/QTestGenTask.java    |   37 +-
 beeline/pom.xml                                 |    8 +-
 .../java/org/apache/hive/beeline/BeeLine.java   |    2 +-
 .../org/apache/hive/beeline/BeeLineOpts.java    |    9 +
 .../java/org/apache/hive/beeline/Commands.java  |   18 +-
 .../apache/hive/beeline/HiveSchemaHelper.java   |    1 -
 .../org/apache/hive/beeline/HiveSchemaTool.java |    3 +
 .../hive/beeline/TestBeelineArgParsing.java     |   32 +-
 .../test/resources/DummyDriver-1.0-SNAPSHOT.jar |  Bin 2812 -> 0 bytes
 beeline/src/test/resources/DummyDriver.txt      |   59 +
 .../src/test/resources/postgresql-9.3.jdbc3.jar |  Bin 539003 -> 0 bytes
 bin/ext/hiveserver2.cmd                         |   51 +-
 bin/hive.cmd                                    |    2 +-
 cli/pom.xml                                     |    2 +-
 common/pom.xml                                  |   22 +-
 .../hadoop/hive/common/JvmPauseMonitor.java     |  229 +
 .../hive/common/jsonexplain/tez/Attr.java       |    6 +-
 .../hive/common/jsonexplain/tez/Connection.java |    6 +-
 .../hadoop/hive/common/jsonexplain/tez/Op.java  |   64 +-
 .../hive/common/jsonexplain/tez/Printer.java    |   41 +
 .../hive/common/jsonexplain/tez/Stage.java      |   95 +-
 .../common/jsonexplain/tez/TezJsonParser.java   |   63 +-
 .../hive/common/jsonexplain/tez/Vertex.java     |   75 +-
 .../hive/common/metrics/LegacyMetrics.java      |  229 +
 .../hadoop/hive/common/metrics/Metrics.java     |  253 -
 .../hive/common/metrics/common/Metrics.java     |   64 +
 .../common/metrics/common/MetricsFactory.java   |   62 +
 .../metrics/metrics2/CodahaleMetrics.java       |  347 +
 .../metrics/metrics2/MetricsReporting.java      |   27 +
 .../org/apache/hadoop/hive/conf/HiveConf.java   |   93 +-
 .../hive/conf/LoopingByteArrayInputStream.java  |    2 +-
 .../apache/hive/common/util/HiveTestUtils.java  |   46 +
 .../hive/common/metrics/TestLegacyMetrics.java  |  295 +
 .../hadoop/hive/common/metrics/TestMetrics.java |  286 -
 .../metrics/metrics2/TestCodahaleMetrics.java   |  138 +
 .../hive/common/type/TestHiveBaseChar.java      |    2 +-
 .../hive/common/type/TestHiveVarchar.java       |   22 +-
 contrib/pom.xml                                 |    2 +-
 .../util/typedbytes/TypedBytesInput.java        |    2 +-
 .../util/typedbytes/TypedBytesOutput.java       |    2 +-
 .../util/typedbytes/TypedBytesRecordInput.java  |    2 +-
 .../util/typedbytes/TypedBytesRecordOutput.java |    2 +-
 .../typedbytes/TypedBytesWritableInput.java     |    2 +-
 .../typedbytes/TypedBytesWritableOutput.java    |    2 +-
 .../test/results/clientpositive/url_hook.q.out  |    4 +
 data/conf/spark/standalone/hive-site.xml        |    6 +
 data/conf/spark/yarn-client/hive-site.xml       |    6 +
 data/files/ct_events_clean.txt                  |   76 +
 data/files/customers.txt                        |    3 +
 data/files/emp2.txt                             |   16 +
 data/files/nested_orders.txt                    |    8 +
 data/files/orders.txt                           |    8 +
 data/files/service_request_clean.txt            |   76 +
 data/files/sortdp.txt                           |   32 +
 data/files/store_200                            |   12 +
 data/files/vectortab_a_1k                       | 1000 +++
 data/files/vectortab_b_1k                       | 1000 +++
 data/scripts/q_test_cleanup.sql                 |    2 +-
 data/scripts/q_test_cleanup_for_encryption.sql  |    2 +-
 data/scripts/q_test_init_for_encryption.sql     |    2 +-
 dev-support/jenkins-submit-build.sh             |   14 +-
 hbase-handler/pom.xml                           |    2 +-
 .../hive/hbase/HBaseTestStructSerializer.java   |   20 +-
 .../results/positive/external_table_ppd.q.out   |    8 +-
 .../results/positive/hbase_custom_key2.q.out    |   18 +-
 .../results/positive/hbase_custom_key3.q.out    |   24 +-
 .../results/positive/hbase_ppd_key_range.q.out  |   76 +-
 .../test/results/positive/hbase_pushdown.q.out  |   68 +-
 .../test/results/positive/hbase_queries.q.out   |   42 +-
 .../test/results/positive/hbase_timestamp.q.out |   32 +-
 .../test/results/positive/ppd_key_ranges.q.out  |   32 +-
 hcatalog/core/pom.xml                           |    2 +-
 .../hive/hcatalog/common/HCatException.java     |    2 +-
 .../data/HCatRecordObjectInspectorFactory.java  |    2 +-
 .../hcatalog/data/schema/HCatFieldSchema.java   |    6 +-
 .../hive/hcatalog/mapreduce/OutputJobInfo.java  |    2 +-
 .../hive/hcatalog/data/TestJsonSerDe.java       |    2 +-
 hcatalog/hcatalog-pig-adapter/pom.xml           |    2 +-
 .../apache/hive/hcatalog/pig/HCatLoader.java    |    8 -
 .../hive/hcatalog/pig/TestHCatLoader.java       |   44 -
 .../hcatalog/pig/TestHCatLoaderEncryption.java  |   27 +-
 hcatalog/pom.xml                                |    2 +-
 hcatalog/server-extensions/pom.xml              |    9 +-
 .../src/test/e2e/templeton/inpdir/xmlmapper.py  |   15 +
 .../src/test/e2e/templeton/inpdir/xmlreducer.py |   16 +
 .../tests/jobsubmission_streaming.conf          |    2 +-
 hcatalog/streaming/pom.xml                      |    2 +-
 .../streaming/DelimitedInputWriter.java         |    2 +-
 .../hive/hcatalog/streaming/HiveEndPoint.java   |    2 +-
 .../hive/hcatalog/streaming/TestStreaming.java  |    2 +-
 hcatalog/webhcat/java-client/pom.xml            |    2 +-
 .../hive/hcatalog/api/TestHCatClient.java       |    2 +-
 hcatalog/webhcat/svr/pom.xml                    |    2 +-
 .../hive/hcatalog/templeton/AppConfig.java      |    2 +
 .../hive/hcatalog/templeton/HcatDelegator.java  |    4 +-
 .../hive/hcatalog/templeton/HiveDelegator.java  |   15 +-
 .../hive/hcatalog/templeton/JarDelegator.java   |    8 +-
 .../hcatalog/templeton/LauncherDelegator.java   |   14 +
 .../hive/hcatalog/templeton/PigDelegator.java   |   13 +-
 .../apache/hive/hcatalog/templeton/Server.java  |   34 +-
 .../hive/hcatalog/templeton/SqoopDelegator.java |   20 +-
 .../hcatalog/templeton/StreamingDelegator.java  |    3 +-
 .../templeton/tool/JobSubmissionConstants.java  |    3 +
 .../hcatalog/templeton/tool/LaunchMapper.java   |  241 +-
 .../templeton/tool/TempletonControllerJob.java  |    7 +-
 hwi/pom.xml                                     |    2 +-
 itests/custom-serde/pom.xml                     |    2 +-
 itests/hcatalog-unit/pom.xml                    |    2 +-
 itests/hive-jmh/pom.xml                         |    2 +-
 .../benchmark/storage/ColumnarStorageBench.java |    4 +-
 itests/hive-minikdc/pom.xml                     |   22 +-
 .../hive/minikdc/TestHs2HooksWithMiniKdc.java   |    2 +-
 itests/hive-unit-hadoop2/pom.xml                |    2 +-
 itests/hive-unit/pom.xml                        |   90 +-
 .../org/apache/hadoop/hive/UtilsForTest.java    |   41 +
 .../apache/hadoop/hive/hooks/TestHs2Hooks.java  |   10 +-
 .../hadoop/hive/metastore/TestFilterHooks.java  |   29 +-
 .../hive/metastore/TestMetaStoreMetrics.java    |   94 +
 .../TestHiveAuthorizerCheckInvocation.java      |   34 +-
 .../plugin/TestHiveAuthorizerShowFilters.java   |    6 +-
 .../hive/ql/txn/compactor/TestCompactor.java    |   11 +-
 .../org/apache/hive/jdbc/TestJdbcDriver2.java   |   20 +
 .../apache/hive/jdbc/TestJdbcWithMiniHS2.java   |  123 +
 .../authorization/TestJdbcMetadataApiAuth.java  |  260 +
 .../TestJdbcWithSQLAuthorization.java           |   18 +
 itests/pom.xml                                  |    3 +-
 itests/qtest-accumulo/pom.xml                   |  508 ++
 .../test/java/org/apache/hive/TestDummy.java    |   31 +
 itests/qtest-spark/pom.xml                      |    2 +-
 itests/qtest/pom.xml                            |   23 +-
 .../test/resources/testconfiguration.properties |   30 +-
 itests/test-serde/pom.xml                       |    2 +-
 itests/util/pom.xml                             |    2 +-
 .../org/apache/hadoop/hive/ql/QTestUtil.java    |   27 +-
 jdbc/pom.xml                                    |    2 +-
 .../org/apache/hive/jdbc/HiveConnection.java    |   50 +-
 .../apache/hive/jdbc/HivePreparedStatement.java |    2 +-
 .../apache/hive/jdbc/HiveQueryResultSet.java    |   50 +-
 .../org/apache/hive/jdbc/HiveStatement.java     |   32 +-
 .../hive/jdbc/HttpRequestInterceptorBase.java   |   18 +
 metastore/dbs/derby/execute.sh                  |   37 -
 metastore/dbs/derby/prepare.sh                  |   63 -
 metastore/dbs/postgres/execute.sh               |   29 -
 metastore/dbs/postgres/prepare.sh               |   72 -
 metastore/pom.xml                               |    2 +-
 .../upgrade/derby/hive-schema-2.0.0.derby.sql   |  336 +
 .../derby/upgrade-1.2.0-to-2.0.0.derby.sql      |    3 +
 .../scripts/upgrade/derby/upgrade.order.derby   |    2 +-
 .../upgrade/mssql/hive-schema-2.0.0.mssql.sql   |  947 +++
 .../mssql/upgrade-1.2.0-to-2.0.0.mssql.sql      |    5 +
 .../scripts/upgrade/mssql/upgrade.order.mssql   |    2 +-
 .../upgrade/mysql/021-HIVE-7018.mysql.sql       |   53 +
 .../upgrade/mysql/hive-schema-1.3.0.mysql.sql   |   10 +-
 .../upgrade/mysql/hive-schema-2.0.0.mysql.sql   |  834 +++
 .../mysql/upgrade-1.2.0-to-1.3.0.mysql.sql      |    2 +-
 .../mysql/upgrade-1.2.0-to-2.0.0.mysql.sql      |    4 +
 .../scripts/upgrade/mysql/upgrade.order.mysql   |    2 +-
 .../upgrade/oracle/hive-schema-2.0.0.oracle.sql |  788 ++
 .../oracle/upgrade-1.2.0-to-2.0.0.oracle.sql    |    4 +
 .../scripts/upgrade/oracle/upgrade.order.oracle |    2 +-
 .../postgres/hive-schema-1.3.0.postgres.sql     |   36 -
 .../postgres/hive-schema-2.0.0.postgres.sql     | 1457 ++++
 .../upgrade-1.2.0-to-2.0.0.postgres.sql         |   12 +
 .../upgrade/postgres/upgrade.order.postgres     |    2 +-
 .../apache/hadoop/hive/metastore/Deadline.java  |    2 +-
 .../hadoop/hive/metastore/HiveAlterHandler.java |   42 +-
 .../hadoop/hive/metastore/HiveMetaStore.java    |  246 +-
 .../hive/metastore/HiveMetaStoreClient.java     |   13 +-
 .../hive/metastore/HiveMetaStoreFsImpl.java     |    1 -
 .../hive/metastore/MetaStoreDirectSql.java      |   26 +-
 .../hive/metastore/MetaStoreSchemaInfo.java     |    8 +-
 .../hadoop/hive/metastore/ObjectStore.java      |    6 +-
 .../hive/metastore/StatObjectConverter.java     |   16 +-
 .../apache/hadoop/hive/metastore/Warehouse.java |   14 +-
 .../hive/metastore/txn/CompactionInfo.java      |    9 +
 .../metastore/txn/CompactionTxnHandler.java     |   28 +-
 .../hadoop/hive/metastore/txn/TxnHandler.java   |   36 +-
 odbc/pom.xml                                    |    2 +-
 packaging/pom.xml                               |    2 +-
 pom.xml                                         |   53 +-
 ql/pom.xml                                      |    9 +-
 .../java/org/apache/hadoop/hive/ql/Driver.java  |   11 +-
 .../apache/hadoop/hive/ql/exec/ColumnInfo.java  |    2 +-
 .../org/apache/hadoop/hive/ql/exec/DDLTask.java |   37 +-
 .../hive/ql/exec/DefaultFetchFormatter.java     |    1 -
 .../apache/hadoop/hive/ql/exec/ExplainTask.java |   58 +-
 .../hive/ql/exec/ExprNodeEvaluatorFactory.java  |   12 +-
 .../ql/exec/ExprNodeGenericFuncEvaluator.java   |    3 +-
 .../hive/ql/exec/ExprNodeNullEvaluator.java     |   47 -
 .../hadoop/hive/ql/exec/FunctionRegistry.java   |   12 +-
 .../hadoop/hive/ql/exec/MapJoinOperator.java    |    6 +-
 .../hive/ql/exec/OrcFileMergeOperator.java      |   70 +-
 .../hive/ql/exec/PTFRollingPartition.java       |   30 +-
 .../hive/ql/exec/PartitionKeySampler.java       |    9 +-
 .../hadoop/hive/ql/exec/ReduceSinkOperator.java |    7 +-
 .../apache/hadoop/hive/ql/exec/TaskFactory.java |    2 +-
 .../apache/hadoop/hive/ql/exec/TaskRunner.java  |    1 +
 .../apache/hadoop/hive/ql/exec/Utilities.java   |   39 +-
 .../hadoop/hive/ql/exec/mr/ExecDriver.java      |   16 +-
 .../persistence/BytesBytesMultiHashMap.java     |   48 +-
 .../persistence/HybridHashTableContainer.java   |   59 +-
 .../persistence/MapJoinBytesTableContainer.java |   74 +-
 .../hadoop/hive/ql/exec/spark/CacheTran.java    |   54 +
 .../hive/ql/exec/spark/GroupByShuffler.java     |    4 +
 .../hive/ql/exec/spark/HashTableLoader.java     |   23 +-
 .../ql/exec/spark/HivePairFlatMapFunction.java  |    1 +
 .../ql/exec/spark/HiveSparkClientFactory.java   |    1 +
 .../ql/exec/spark/LocalHiveSparkClient.java     |    8 +-
 .../hadoop/hive/ql/exec/spark/MapInput.java     |   16 +
 .../hadoop/hive/ql/exec/spark/MapTran.java      |   22 +-
 .../hadoop/hive/ql/exec/spark/ReduceTran.java   |   23 +-
 .../ql/exec/spark/RemoteHiveSparkClient.java    |   16 +-
 .../hadoop/hive/ql/exec/spark/ShuffleTran.java  |   24 +
 .../hive/ql/exec/spark/SmallTableCache.java     |   73 +
 .../hive/ql/exec/spark/SortByShuffler.java      |    5 +
 .../hadoop/hive/ql/exec/spark/SparkPlan.java    |  150 +
 .../hive/ql/exec/spark/SparkPlanGenerator.java  |   25 +-
 .../hive/ql/exec/spark/SparkShuffler.java       |    2 +
 .../hadoop/hive/ql/exec/spark/SparkTran.java    |    6 +
 .../hive/ql/exec/spark/SparkUtilities.java      |   53 +-
 .../ql/exec/spark/session/SparkSessionImpl.java |    2 +-
 .../spark/session/SparkSessionManagerImpl.java  |   63 +-
 .../ql/exec/spark/status/SparkJobMonitor.java   |    2 +-
 .../hive/ql/exec/tez/HashTableLoader.java       |   74 +-
 .../hive/ql/exec/tez/HiveSplitGenerator.java    |   24 +
 .../hadoop/hive/ql/exec/tez/TezJobMonitor.java  |   12 +-
 .../hive/ql/exec/tez/TezSessionPoolManager.java |   21 +-
 .../hive/ql/exec/tez/TezSessionState.java       |   10 -
 .../hive/ql/exec/vector/BytesColumnVector.java  |    9 +
 .../hive/ql/exec/vector/ColumnVector.java       |   10 +
 .../ql/exec/vector/VectorColumnSetInfo.java     |   42 +-
 .../hive/ql/exec/vector/VectorCopyRow.java      |   35 +-
 .../ql/exec/vector/VectorFilterOperator.java    |    5 +-
 .../ql/exec/vector/VectorGroupByOperator.java   |   16 +-
 .../ql/exec/vector/VectorMapJoinOperator.java   |    8 +-
 .../VectorMapJoinOuterFilteredOperator.java     |    6 +-
 .../ql/exec/vector/VectorizationContext.java    |  111 +-
 .../ql/exec/vector/VectorizedBatchUtil.java     |    7 +-
 .../mapjoin/VectorMapJoinCommonOperator.java    |   58 +-
 .../VectorMapJoinGenerateResultOperator.java    |   47 +-
 ...pJoinInnerBigOnlyGenerateResultOperator.java |   53 +-
 .../VectorMapJoinInnerBigOnlyLongOperator.java  |   15 +-
 ...ctorMapJoinInnerBigOnlyMultiKeyOperator.java |   15 +-
 ...VectorMapJoinInnerBigOnlyStringOperator.java |   12 +-
 ...ectorMapJoinInnerGenerateResultOperator.java |   39 +-
 .../mapjoin/VectorMapJoinInnerLongOperator.java |   17 +-
 .../VectorMapJoinInnerMultiKeyOperator.java     |   19 +-
 .../VectorMapJoinInnerStringOperator.java       |   17 +-
 ...orMapJoinLeftSemiGenerateResultOperator.java |   40 +-
 .../VectorMapJoinLeftSemiLongOperator.java      |   13 +-
 .../VectorMapJoinLeftSemiMultiKeyOperator.java  |   17 +-
 .../VectorMapJoinLeftSemiStringOperator.java    |   17 +-
 ...ectorMapJoinOuterGenerateResultOperator.java |  805 +-
 .../mapjoin/VectorMapJoinOuterLongOperator.java |  189 +-
 .../VectorMapJoinOuterMultiKeyOperator.java     |  184 +-
 .../VectorMapJoinOuterStringOperator.java       |  185 +-
 .../mapjoin/VectorMapJoinRowBytesContainer.java |    2 +-
 .../fast/VectorMapJoinFastBytesHashMap.java     |    8 +-
 .../VectorMapJoinFastBytesHashMultiSet.java     |    4 +-
 .../fast/VectorMapJoinFastBytesHashTable.java   |   10 +-
 .../mapjoin/fast/VectorMapJoinFastKeyStore.java |   10 +-
 .../fast/VectorMapJoinFastLongHashMap.java      |    2 +-
 .../fast/VectorMapJoinFastLongHashTable.java    |   18 +-
 .../fast/VectorMapJoinFastTableContainer.java   |    2 +-
 .../fast/VectorMapJoinFastValueStore.java       |    8 +-
 .../VectorMapJoinOptimizedLongCommon.java       |    4 +-
 .../apache/hadoop/hive/ql/hooks/ATSHook.java    |   27 +-
 .../hadoop/hive/ql/io/HiveInputFormat.java      |   39 +-
 .../org/apache/hadoop/hive/ql/io/IOContext.java |    2 +-
 .../ql/io/avro/AvroContainerOutputFormat.java   |    2 +-
 .../hadoop/hive/ql/io/merge/MergeFileTask.java  |    6 +-
 .../hive/ql/io/orc/ColumnStatisticsImpl.java    |  217 +-
 .../ql/io/orc/ConversionTreeReaderFactory.java  |   38 +
 .../hive/ql/io/orc/OrcFileKeyWrapper.java       |   27 +-
 .../io/orc/OrcFileStripeMergeRecordReader.java  |   23 +-
 .../hadoop/hive/ql/io/orc/OrcInputFormat.java   |    8 +-
 .../hadoop/hive/ql/io/orc/OrcRecordUpdater.java |   24 +-
 .../apache/hadoop/hive/ql/io/orc/OrcUtils.java  |    6 +-
 .../hive/ql/io/orc/RecordReaderFactory.java     |  269 +
 .../hadoop/hive/ql/io/orc/RecordReaderImpl.java |   11 +-
 .../hadoop/hive/ql/io/orc/WriterImpl.java       |    2 +-
 .../io/parquet/FilterPredicateLeafBuilder.java  |    8 +-
 .../hive/ql/io/parquet/LeafFilterFactory.java   |   20 +-
 .../ql/io/parquet/MapredParquetInputFormat.java |    3 +-
 .../io/parquet/MapredParquetOutputFormat.java   |    2 +-
 .../parquet/VectorizedParquetInputFormat.java   |    2 +-
 .../convert/DataWritableRecordConverter.java    |    8 +-
 .../ql/io/parquet/convert/ETypeConverter.java   |   10 +-
 .../convert/HiveCollectionConverter.java        |   29 +-
 .../io/parquet/convert/HiveGroupConverter.java  |   24 +-
 .../io/parquet/convert/HiveSchemaConverter.java |   18 +-
 .../io/parquet/convert/HiveStructConverter.java |    6 +-
 .../hive/ql/io/parquet/convert/Repeated.java    |   38 +-
 .../parquet/read/DataWritableReadSupport.java   |   20 +-
 .../read/ParquetRecordReaderWrapper.java        |   31 +-
 .../serde/AbstractParquetMapInspector.java      |   13 +-
 .../serde/DeepParquetHiveMapInspector.java      |    6 +-
 .../serde/ParquetHiveArrayInspector.java        |   43 +-
 .../ql/io/parquet/serde/ParquetHiveSerDe.java   |    4 +-
 .../serde/StandardParquetHiveMapInspector.java  |    6 +-
 .../hive/ql/io/parquet/timestamp/NanoTime.java  |    6 +-
 .../parquet/write/DataWritableWriteSupport.java |    8 +-
 .../ql/io/parquet/write/DataWritableWriter.java |   10 +-
 .../write/ParquetRecordWriterWrapper.java       |    6 +-
 .../ql/io/rcfile/stats/PartialScanTask.java     |    4 +-
 .../io/rcfile/truncate/ColumnTruncateTask.java  |    4 +-
 .../hive/ql/io/sarg/SearchArgumentImpl.java     |   10 +-
 .../hadoop/hive/ql/lockmgr/DbLockManager.java   |    4 +-
 .../hadoop/hive/ql/lockmgr/DbTxnManager.java    |    2 +-
 .../hadoop/hive/ql/lockmgr/DummyTxnManager.java |   15 -
 .../hadoop/hive/ql/lockmgr/HiveLockObject.java  |    2 +-
 .../zookeeper/ZooKeeperHiveLockManager.java     |    2 +
 .../apache/hadoop/hive/ql/metadata/Hive.java    |   17 +-
 .../formatting/JsonMetaDataFormatter.java       |    2 +-
 .../metadata/formatting/MetaDataFormatter.java  |    2 +-
 .../formatting/TextMetaDataFormatter.java       |   76 +-
 .../hive/ql/optimizer/ColumnPrunerProcCtx.java  |   27 +
 .../ql/optimizer/ColumnPrunerProcFactory.java   |   49 +-
 .../hive/ql/optimizer/ConstantPropagate.java    |   12 +-
 .../ql/optimizer/ConstantPropagateProcCtx.java  |   21 +
 .../optimizer/ConstantPropagateProcFactory.java |  235 +-
 .../hive/ql/optimizer/ConvertJoinMapJoin.java   |   46 +-
 .../hive/ql/optimizer/GenMRTableScan1.java      |    2 +-
 .../hive/ql/optimizer/GenMapRedUtils.java       |    5 +-
 .../hive/ql/optimizer/GroupByOptimizer.java     |    7 +-
 .../ql/optimizer/NonBlockingOpDeDupProc.java    |    9 -
 .../hadoop/hive/ql/optimizer/Optimizer.java     |    4 +
 .../PrunerExpressionOperatorFactory.java        |    3 -
 .../ql/optimizer/ReduceSinkMapJoinProc.java     |    2 +-
 .../optimizer/RemoveDynamicPruningBySize.java   |   19 +-
 .../hive/ql/optimizer/SimpleFetchOptimizer.java |    2 -
 .../ql/optimizer/calcite/HiveCalciteUtil.java   |  143 +-
 .../ql/optimizer/calcite/HiveRelCollation.java  |   18 +
 .../ql/optimizer/calcite/HiveRelOptUtil.java    |  167 +-
 .../ql/optimizer/calcite/RelOptHiveTable.java   |    6 +-
 .../calcite/reloperators/HiveAggregate.java     |   58 +
 .../calcite/reloperators/HiveGroupingID.java    |   17 +
 .../calcite/reloperators/HiveMultiJoin.java     |  198 +
 .../calcite/reloperators/HiveProject.java       |    5 +-
 .../calcite/reloperators/HiveSemiJoin.java      |   79 +
 .../calcite/reloperators/HiveSortExchange.java  |   18 +
 .../rules/HiveExpandDistinctAggregatesRule.java |  278 +
 .../rules/HiveInsertExchange4JoinRule.java      |   27 +-
 .../rules/HiveJoinProjectTransposeRule.java     |   60 +
 .../calcite/rules/HiveJoinToMultiJoinRule.java  |  309 +-
 .../calcite/rules/HivePreFilteringRule.java     |  218 +
 .../calcite/rules/HiveProjectMergeRule.java     |    1 -
 .../calcite/rules/HiveRelFieldTrimmer.java      |  181 +
 .../calcite/rules/HiveWindowingFixRule.java     |  163 +
 .../calcite/translator/ASTConverter.java        |    2 -
 .../calcite/translator/HiveOpConverter.java     |  304 +-
 .../translator/HiveOpConverterPostProc.java     |   90 +-
 .../calcite/translator/PlanModifierUtil.java    |   47 +-
 .../calcite/translator/RexNodeConverter.java    |    5 +-
 .../correlation/ReduceSinkDeDuplication.java    |   15 +-
 .../ql/optimizer/lineage/ExprProcFactory.java   |    3 +-
 .../ql/optimizer/pcr/PcrExprProcFactory.java    |    3 +-
 .../hive/ql/optimizer/physical/Vectorizer.java  |  204 +-
 .../spark/SetSparkReducerParallelism.java       |   30 +-
 .../spark/SparkReduceSinkMapJoinProc.java       |    2 +-
 .../stats/annotation/StatsRulesProcFactory.java |  285 +-
 .../hadoop/hive/ql/parse/CalcitePlanner.java    |  121 +-
 .../hive/ql/parse/DDLSemanticAnalyzer.java      |    3 +-
 .../hive/ql/parse/ExplainSemanticAnalyzer.java  |    9 +-
 .../hadoop/hive/ql/parse/GenTezUtils.java       |   24 +
 .../apache/hadoop/hive/ql/parse/HiveParser.g    |   11 +-
 .../hive/ql/parse/OptimizeTezProcContext.java   |   14 +
 .../hadoop/hive/ql/parse/PTFInvocationSpec.java |    8 +
 .../hadoop/hive/ql/parse/PTFTranslator.java     |   15 +-
 .../apache/hadoop/hive/ql/parse/ParseUtils.java |   42 +-
 .../hive/ql/parse/ProcessAnalyzeTable.java      |    4 +-
 .../org/apache/hadoop/hive/ql/parse/QB.java     |   19 +
 .../hadoop/hive/ql/parse/SemanticAnalyzer.java  |  270 +-
 .../hive/ql/parse/TableAccessAnalyzer.java      |    6 +-
 .../hadoop/hive/ql/parse/TaskCompiler.java      |    4 +-
 .../hadoop/hive/ql/parse/TezCompiler.java       |   24 +-
 .../hive/ql/parse/TypeCheckProcFactory.java     |    4 +-
 .../hadoop/hive/ql/parse/WindowingSpec.java     |   86 +-
 .../hive/ql/parse/spark/GenSparkUtils.java      |    2 +-
 .../parse/spark/SparkProcessAnalyzeTable.java   |    2 +-
 .../hive/ql/plan/AbstractOperatorDesc.java      |    2 +-
 .../hadoop/hive/ql/plan/ColStatistics.java      |   33 +-
 .../hadoop/hive/ql/plan/ConditionalWork.java    |    4 +-
 .../hive/ql/plan/ExprNodeConstantDesc.java      |   15 +-
 .../hadoop/hive/ql/plan/ExprNodeNullDesc.java   |   69 -
 .../apache/hadoop/hive/ql/plan/FilterDesc.java  |    4 +-
 .../apache/hadoop/hive/ql/plan/JoinDesc.java    |    7 -
 .../apache/hadoop/hive/ql/plan/PlanUtils.java   |   28 +-
 .../hadoop/hive/ql/plan/ReduceSinkDesc.java     |   15 +-
 .../apache/hadoop/hive/ql/plan/Statistics.java  |   15 +-
 .../hadoop/hive/ql/plan/TableScanDesc.java      |   22 +-
 .../hadoop/hive/ql/plan/VectorGroupByDesc.java  |   23 +-
 .../hadoop/hive/ql/plan/ptf/BoundaryDef.java    |   42 +-
 .../hadoop/hive/ql/plan/ptf/CurrentRowDef.java  |   12 +-
 .../hive/ql/plan/ptf/RangeBoundaryDef.java      |   38 +-
 .../hive/ql/plan/ptf/ValueBoundaryDef.java      |   50 +-
 .../hadoop/hive/ql/plan/ptf/WindowFrameDef.java |   31 +-
 .../hadoop/hive/ql/processors/SetProcessor.java |    3 +
 .../AuthorizationPreEventListener.java          |    8 +-
 .../AuthorizationMetaStoreFilterHook.java       |    9 +-
 .../authorization/plugin/HiveOperationType.java |   19 +-
 .../plugin/HivePrivilegeObjectUtils.java        |   51 +
 .../plugin/sqlstd/Operation2Privilege.java      |   17 +-
 .../SQLStdHiveAuthorizationValidator.java       |    5 +
 .../hadoop/hive/ql/session/OperationLog.java    |    2 +-
 .../hadoop/hive/ql/session/SessionState.java    |   26 +-
 .../apache/hadoop/hive/ql/stats/StatsUtils.java |  264 +-
 .../hive/ql/txn/compactor/CompactorMR.java      |    9 +-
 .../hadoop/hive/ql/txn/compactor/Initiator.java |    2 +-
 .../hadoop/hive/ql/txn/compactor/Worker.java    |    3 +-
 .../org/apache/hadoop/hive/ql/udf/UDFCrc32.java |   75 +
 .../org/apache/hadoop/hive/ql/udf/UDFMd5.java   |   33 +-
 .../apache/hadoop/hive/ql/udf/UDFRegExp.java    |   76 -
 .../org/apache/hadoop/hive/ql/udf/UDFSha1.java  |   88 +
 .../hive/ql/udf/generic/GenericUDAFAverage.java |   43 +-
 .../ql/udf/generic/GenericUDAFCollectList.java  |   15 +-
 .../ql/udf/generic/GenericUDAFCollectSet.java   |   14 +-
 .../ql/udf/generic/GenericUDAFFirstValue.java   |   47 +-
 .../ql/udf/generic/GenericUDAFLastValue.java    |   39 +-
 .../hive/ql/udf/generic/GenericUDAFMax.java     |   51 +-
 .../hive/ql/udf/generic/GenericUDAFMin.java     |    8 +-
 .../GenericUDAFMkCollectionEvaluator.java       |   21 +-
 .../generic/GenericUDAFStreamingEvaluator.java  |   85 +-
 .../hive/ql/udf/generic/GenericUDAFSum.java     |   41 +-
 .../hadoop/hive/ql/udf/generic/GenericUDF.java  |   23 -
 .../hive/ql/udf/generic/GenericUDFBaseDTI.java  |   18 +
 .../hive/ql/udf/generic/GenericUDFCoalesce.java |    2 +-
 .../hive/ql/udf/generic/GenericUDFDecode.java   |    2 +-
 .../hive/ql/udf/generic/GenericUDFEncode.java   |    2 +-
 .../hive/ql/udf/generic/GenericUDFGreatest.java |    1 +
 .../hive/ql/udf/generic/GenericUDFInstr.java    |    2 +-
 .../hive/ql/udf/generic/GenericUDFLocate.java   |    2 +-
 .../ql/udf/generic/GenericUDFParamUtils.java    |   71 +
 .../hive/ql/udf/generic/GenericUDFPrintf.java   |    3 +-
 .../hive/ql/udf/generic/GenericUDFRegExp.java   |  133 +
 .../hive/ql/udf/generic/GenericUDFSha2.java     |  137 +
 .../ql/udf/generic/GenericUDFSortArray.java     |   17 +-
 .../udf/generic/GenericUDFSubstringIndex.java   |  159 +
 .../udf/generic/GenericUDFToUnixTimeStamp.java  |    6 +-
 .../ql/udf/generic/GenericUDFTranslate.java     |    8 +-
 .../ql/udf/generic/GenericUDFUnixTimeStamp.java |   36 +-
 .../hive/ql/udf/generic/GenericUDFUtils.java    |    6 +-
 .../hadoop/hive/ql/udf/ptf/MatchPath.java       |    5 +-
 .../hive/ql/udf/ptf/WindowingTableFunction.java |  174 +-
 .../apache/hadoop/hive/ql/TestTxnCommands2.java |   18 +
 .../hadoop/hive/ql/exec/TestUtilities.java      |   11 +
 .../exec/vector/TestVectorGroupByOperator.java  |    2 +-
 .../hadoop/hive/ql/io/orc/TestFileDump.java     |    9 +-
 .../io/parquet/AbstractTestParquetDirect.java   |   26 +-
 .../ql/io/parquet/TestArrayCompatibility.java   |   78 +-
 .../ql/io/parquet/TestDataWritableWriter.java   |   52 +-
 .../ql/io/parquet/TestHiveSchemaConverter.java  |   16 +-
 .../hive/ql/io/parquet/TestMapStructures.java   |   64 +-
 .../parquet/TestMapredParquetInputFormat.java   |    2 +-
 .../parquet/TestMapredParquetOutputFormat.java  |    2 +-
 .../io/parquet/TestParquetRowGroupFilter.java   |    6 +-
 .../hive/ql/io/parquet/TestParquetSerDe.java    |    8 +-
 .../serde/TestAbstractParquetMapInspector.java  |    4 +-
 .../serde/TestDeepParquetHiveMapInspector.java  |    4 +-
 .../serde/TestParquetHiveArrayInspector.java    |    3 +-
 .../TestStandardParquetHiveMapInspector.java    |    4 +-
 .../hive/ql/io/sarg/TestSearchArgumentImpl.java |   29 +-
 .../hive/ql/lockmgr/TestDummyTxnManager.java    |  119 +-
 .../apache/hadoop/hive/ql/parse/TestIUD.java    |    7 +
 .../hadoop/hive/ql/plan/TestViewEntity.java     |   53 +-
 .../hadoop/hive/ql/session/TestAddResource.java |  116 +-
 .../hive/ql/session/TestSessionState.java       |   30 +-
 .../hadoop/hive/ql/udaf/TestStreamingSum.java   |   16 +-
 .../apache/hadoop/hive/ql/udf/TestUDFCrc32.java |   74 +
 .../apache/hadoop/hive/ql/udf/TestUDFJson.java  |   18 +
 .../apache/hadoop/hive/ql/udf/TestUDFSha1.java  |   57 +
 .../ql/udf/generic/TestGenericUDFRegexp.java    |  135 +
 .../hive/ql/udf/generic/TestGenericUDFSha2.java |  271 +
 .../ql/udf/generic/TestGenericUDFSortArray.java |  158 +
 .../generic/TestGenericUDFSubstringIndex.java   |   97 +
 .../clientnegative/lockneg_try_lock_db_in_use.q |    2 +-
 .../clientnegative/ptf_negative_NoWindowDefn.q  |    9 +
 .../table_nonprintable_negative.q               |   11 +
 .../udaf_collect_set_unsupported.q              |    3 +
 .../clientnegative/udf_sort_array_wrong3.q      |    2 +-
 .../clientpositive/alter_change_db_location.q   |    5 +
 .../queries/clientpositive/alter_merge_2_orc.q  |    6 +-
 .../clientpositive/alter_table_partition_drop.q |   11 +
 .../queries/clientpositive/ambiguitycheck.q     |    2 -
 .../clientpositive/authorization_view_sqlstd.q  |    4 +
 ql/src/test/queries/clientpositive/auto_join0.q |   12 +-
 ql/src/test/queries/clientpositive/auto_join1.q |    3 +
 .../test/queries/clientpositive/auto_join21.q   |    1 +
 .../test/queries/clientpositive/auto_join29.q   |    1 +
 .../test/queries/clientpositive/auto_join30.q   |    1 +
 .../clientpositive/auto_sortmerge_join_10.q     |    1 +
 .../clientpositive/auto_sortmerge_join_13.q     |    1 +
 .../clientpositive/auto_sortmerge_join_14.q     |    1 +
 .../clientpositive/auto_sortmerge_join_15.q     |    1 +
 .../clientpositive/auto_sortmerge_join_5.q      |    3 +
 .../clientpositive/auto_sortmerge_join_9.q      |    1 +
 .../queries/clientpositive/autogen_colalias.q   |    4 +-
 .../queries/clientpositive/avro_timestamp.q     |    2 +
 .../queries/clientpositive/avro_timestamp_win.q |   28 +
 ql/src/test/queries/clientpositive/bucket2.q    |    1 +
 ql/src/test/queries/clientpositive/bucket3.q    |    1 +
 ql/src/test/queries/clientpositive/bucket4.q    |    1 +
 .../clientpositive/bucket_map_join_tez1.q       |    1 +
 .../clientpositive/bucket_map_join_tez2.q       |    1 +
 ql/src/test/queries/clientpositive/cbo_gby.q    |    3 +
 .../test/queries/clientpositive/cbo_rp_join0.q  |   26 +
 .../test/queries/clientpositive/cbo_rp_join1.q  |   22 +
 .../test/queries/clientpositive/cbo_subq_in.q   |    1 +
 .../test/queries/clientpositive/cbo_udf_udaf.q  |    2 +
 .../test/queries/clientpositive/cbo_windowing.q |    6 +-
 .../clientpositive/correlationoptimizer1.q      |    1 +
 ql/src/test/queries/clientpositive/count.q      |    1 +
 ql/src/test/queries/clientpositive/cross_join.q |    1 +
 .../clientpositive/cross_product_check_1.q      |   10 +-
 .../clientpositive/cross_product_check_2.q      |    7 +-
 .../clientpositive/crtseltbl_serdeprops.q       |   11 +
 ql/src/test/queries/clientpositive/ctas.q       |    2 +
 ql/src/test/queries/clientpositive/cteViews.q   |   41 +
 .../disable_merge_for_bucketing.q               |    1 +
 .../clientpositive/dynamic_partition_pruning.q  |    1 +
 .../dynamic_partition_pruning_2.q               |   18 +
 .../clientpositive/dynpart_sort_opt_bucketing.q |   73 +
 .../dynpart_sort_opt_vectorization.q            |    1 +
 .../clientpositive/dynpart_sort_optimization.q  |    1 +
 .../clientpositive/dynpart_sort_optimization2.q |    8 +-
 .../clientpositive/encryption_drop_partition.q  |   18 +
 .../clientpositive/encryption_drop_table.q      |   18 +
 .../clientpositive/encryption_drop_view.q       |    6 +
 .../encryption_insert_partition_dynamic.q       |    8 +-
 .../encryption_insert_partition_static.q        |   41 +-
 .../clientpositive/encryption_insert_values.q   |   15 +
 .../encryption_join_unencrypted_tbl.q           |    4 +-
 ...yption_join_with_different_encryption_keys.q |    8 +-
 .../encryption_load_data_to_encrypted_tables.q  |    4 +-
 .../clientpositive/encryption_move_tbl.q        |   20 +
 .../encryption_select_read_only_encrypted_tbl.q |    4 +-
 .../clientpositive/exec_parallel_column_stats.q |    5 +
 .../test/queries/clientpositive/explainuser_2.q |    7 +-
 .../test/queries/clientpositive/explainuser_3.q |  115 +
 .../clientpositive/filter_cond_pushdown.q       |   19 +
 .../clientpositive/filter_join_breaktask2.q     |    2 +
 ql/src/test/queries/clientpositive/fold_case.q  |    8 +
 .../clientpositive/fold_eq_with_case_when.q     |   21 +
 ql/src/test/queries/clientpositive/groupby1.q   |    1 +
 ql/src/test/queries/clientpositive/groupby2.q   |    1 +
 ql/src/test/queries/clientpositive/groupby3.q   |    1 +
 ...groupby_complex_types_multi_single_reducer.q |    8 +-
 .../clientpositive/groupby_grouping_sets6.q     |    1 -
 ql/src/test/queries/clientpositive/having.q     |    1 +
 .../clientpositive/hybridgrace_hashjoin_1.q     |    1 +
 .../clientpositive/hybridgrace_hashjoin_2.q     |    6 +-
 .../test/queries/clientpositive/insert_into1.q  |   16 +-
 .../test/queries/clientpositive/insert_into2.q  |   15 +-
 .../clientpositive/insert_into_with_schema2.q   |   34 +
 .../clientpositive/insert_nonacid_from_acid.q   |    2 +
 ql/src/test/queries/clientpositive/join0.q      |    1 +
 ql/src/test/queries/clientpositive/join1.q      |    1 +
 ql/src/test/queries/clientpositive/join42.q     |   36 +
 ql/src/test/queries/clientpositive/join43.q     |   83 +
 .../join_merge_multi_expressions.q              |    2 +
 .../test/queries/clientpositive/join_nullsafe.q |    3 +
 .../clientpositive/json_serde_qualified_types.q |   12 +
 .../queries/clientpositive/limit_pushdown.q     |    1 +
 .../queries/clientpositive/load_dyn_part1.q     |    1 +
 .../queries/clientpositive/load_dyn_part2.q     |    1 +
 .../queries/clientpositive/load_dyn_part3.q     |    1 +
 .../test/queries/clientpositive/lvj_mapjoin.q   |    1 +
 .../queries/clientpositive/mapjoin_decimal.q    |    7 +-
 .../queries/clientpositive/mapjoin_mapjoin.q    |    1 +
 ql/src/test/queries/clientpositive/mapreduce1.q |    1 +
 ql/src/test/queries/clientpositive/mapreduce2.q |    1 +
 ql/src/test/queries/clientpositive/merge1.q     |    1 +
 ql/src/test/queries/clientpositive/merge2.q     |    1 +
 ql/src/test/queries/clientpositive/mergejoin.q  |    3 +-
 .../clientpositive/metadata_only_queries.q      |    1 +
 ql/src/test/queries/clientpositive/mrr.q        |    3 +
 .../clientpositive/orc_int_type_promotion.q     |   79 +
 ql/src/test/queries/clientpositive/orc_merge1.q |    3 +
 ql/src/test/queries/clientpositive/orc_merge2.q |    1 +
 ql/src/test/queries/clientpositive/orc_merge3.q |    1 +
 ql/src/test/queries/clientpositive/orc_merge4.q |    1 +
 ql/src/test/queries/clientpositive/orc_merge5.q |    1 +
 ql/src/test/queries/clientpositive/orc_merge6.q |    1 +
 ql/src/test/queries/clientpositive/orc_merge7.q |    1 +
 ql/src/test/queries/clientpositive/orc_merge9.q |   44 +
 .../clientpositive/orc_merge_incompat1.q        |    1 +
 .../clientpositive/orc_merge_incompat2.q        |    1 +
 ql/src/test/queries/clientpositive/parallel.q   |    1 +
 .../queries/clientpositive/partition_date2.q    |    2 +
 .../clientpositive/partition_timestamp.q        |    2 +
 .../clientpositive/partition_timestamp2.q       |    2 +
 .../clientpositive/partition_timestamp2_win.q   |   58 +
 .../clientpositive/partition_timestamp_win.q    |   59 +
 ql/src/test/queries/clientpositive/ptf.q        |    1 +
 .../test/queries/clientpositive/ptf_matchpath.q |    1 +
 .../test/queries/clientpositive/ptf_streaming.q |    1 +
 .../queries/clientpositive/ql_rewrite_gbtoidx.q |    4 +-
 .../queries/clientpositive/script_env_var1.q    |    4 +-
 .../test/queries/clientpositive/script_pipe.q   |    1 +
 .../queries/clientpositive/selectDistinctStar.q |    5 +-
 .../clientpositive/select_dummy_source.q        |    1 +
 ql/src/test/queries/clientpositive/skewjoin.q   |   12 +-
 .../queries/clientpositive/stats_noscan_1.q     |    1 +
 .../queries/clientpositive/stats_only_null.q    |    4 +
 .../queries/clientpositive/subquery_exists.q    |    2 +
 .../test/queries/clientpositive/subquery_in.q   |    1 +
 .../queries/clientpositive/table_nonprintable.q |   30 +
 ql/src/test/queries/clientpositive/temp_table.q |    7 +-
 .../clientpositive/tez_bmj_schema_evolution.q   |    1 +
 ql/src/test/queries/clientpositive/tez_dml.q    |    3 +
 ql/src/test/queries/clientpositive/tez_join.q   |    1 +
 .../test/queries/clientpositive/tez_join_hash.q |    3 +
 .../clientpositive/tez_join_result_complex.q    |  139 +
 .../queries/clientpositive/tez_join_tests.q     |    1 +
 .../queries/clientpositive/tez_joins_explain.q  |    2 +-
 .../queries/clientpositive/tez_multi_union.q    |    1 +
 .../clientpositive/tez_schema_evolution.q       |   12 +-
 .../test/queries/clientpositive/tez_self_join.q |   33 +
 ql/src/test/queries/clientpositive/tez_smb_1.q  |   32 +
 .../test/queries/clientpositive/tez_smb_main.q  |    1 +
 ql/src/test/queries/clientpositive/tez_union.q  |    1 +
 ql/src/test/queries/clientpositive/tez_union2.q |    1 +
 .../tez_union_dynamic_partition.q               |   22 +
 .../queries/clientpositive/tez_union_group_by.q |    1 +
 .../clientpositive/tez_union_multiinsert.q      |    1 +
 ql/src/test/queries/clientpositive/transform1.q |    1 +
 .../queries/clientpositive/udaf_collect_set_2.q |  222 +
 .../clientpositive/udaf_percentile_approx_23.q  |    4 +-
 ql/src/test/queries/clientpositive/udf_crc32.q  |   13 +
 .../clientpositive/udf_folder_constants.q       |   11 +
 ql/src/test/queries/clientpositive/udf_sha1.q   |   13 +
 ql/src/test/queries/clientpositive/udf_sha2.q   |   41 +
 .../queries/clientpositive/udf_sort_array.q     |   10 +
 .../clientpositive/udf_substring_index.q        |   32 +
 .../queries/clientpositive/udf_unix_timestamp.q |    8 +-
 ql/src/test/queries/clientpositive/union2.q     |    1 +
 ql/src/test/queries/clientpositive/union3.q     |    1 +
 ql/src/test/queries/clientpositive/union35.q    |    2 -
 ql/src/test/queries/clientpositive/union4.q     |    1 +
 ql/src/test/queries/clientpositive/union5.q     |    1 +
 ql/src/test/queries/clientpositive/union6.q     |    1 +
 ql/src/test/queries/clientpositive/union7.q     |    1 +
 ql/src/test/queries/clientpositive/union8.q     |    1 +
 ql/src/test/queries/clientpositive/union9.q     |    1 +
 .../queries/clientpositive/unionDistinct_1.q    |    1 +
 .../queries/clientpositive/unionDistinct_2.q    |    2 +
 .../update_after_multiple_inserts.q             |    2 +
 .../clientpositive/update_all_partitioned.q     |    4 +-
 .../queries/clientpositive/update_all_types.q   |    2 +
 .../queries/clientpositive/update_orig_table.q  |    2 +
 .../clientpositive/update_where_partitioned.q   |    4 +-
 .../queries/clientpositive/vector_aggregate_9.q |    1 +
 .../queries/clientpositive/vector_between_in.q  |    1 +
 .../clientpositive/vector_binary_join_groupby.q |    1 +
 .../test/queries/clientpositive/vector_bucket.q |    1 +
 .../clientpositive/vector_cast_constant.q       |    1 +
 .../test/queries/clientpositive/vector_char_2.q |    1 +
 .../test/queries/clientpositive/vector_char_4.q |    1 +
 .../clientpositive/vector_char_mapjoin1.q       |    1 +
 .../queries/clientpositive/vector_char_simple.q |    1 +
 .../queries/clientpositive/vector_coalesce.q    |   52 +-
 .../queries/clientpositive/vector_coalesce_2.q  |    1 +
 .../clientpositive/vector_count_distinct.q      |    1 +
 .../queries/clientpositive/vector_data_types.q  |   13 +-
 .../test/queries/clientpositive/vector_date_1.q |    1 +
 .../queries/clientpositive/vector_decimal_1.q   |    1 +
 .../clientpositive/vector_decimal_10_0.q        |    1 +
 .../queries/clientpositive/vector_decimal_2.q   |    1 +
 .../clientpositive/vector_decimal_aggregate.q   |    1 +
 .../clientpositive/vector_decimal_cast.q        |    1 +
 .../clientpositive/vector_decimal_expressions.q |   12 +-
 .../clientpositive/vector_decimal_mapjoin.q     |    1 +
 .../clientpositive/vector_decimal_math_funcs.q  |    1 +
 .../clientpositive/vector_decimal_precision.q   |    1 +
 .../clientpositive/vector_decimal_round.q       |    1 +
 .../clientpositive/vector_decimal_round_2.q     |    1 +
 .../queries/clientpositive/vector_decimal_udf.q |    1 +
 .../clientpositive/vector_decimal_udf2.q        |    1 +
 .../queries/clientpositive/vector_distinct_2.q  |    1 +
 ql/src/test/queries/clientpositive/vector_elt.q |    1 +
 .../queries/clientpositive/vector_groupby_3.q   |    1 +
 .../clientpositive/vector_groupby_reduce.q      |    4 +
 .../clientpositive/vector_grouping_sets.q       |   64 +
 .../queries/clientpositive/vector_if_expr.q     |    1 +
 .../queries/clientpositive/vector_inner_join.q  |    1 +
 .../queries/clientpositive/vector_interval_1.q  |    1 +
 .../queries/clientpositive/vector_interval_2.q  |    1 +
 .../clientpositive/vector_interval_mapjoin.q    |   88 +
 .../test/queries/clientpositive/vector_join30.q |  161 +
 .../clientpositive/vector_join_filters.q        |   38 +
 .../queries/clientpositive/vector_join_nulls.q  |   33 +
 .../clientpositive/vector_left_outer_join.q     |    1 +
 .../clientpositive/vector_left_outer_join2.q    |    3 +
 .../clientpositive/vector_leftsemi_mapjoin.q    |    1 +
 .../clientpositive/vector_mapjoin_reduce.q      |    1 +
 .../vector_mr_diff_schema_alias.q               |    1 +
 .../clientpositive/vector_multi_insert.q        |    1 +
 .../vector_non_string_partition.q               |    1 +
 .../clientpositive/vector_null_projection.q     |   21 +
 .../clientpositive/vector_nullsafe_join.q       |   73 +
 .../queries/clientpositive/vector_orderby_5.q   |    1 +
 .../queries/clientpositive/vector_outer_join0.q |    1 +
 .../queries/clientpositive/vector_outer_join1.q |   20 +-
 .../queries/clientpositive/vector_outer_join2.q |   19 +-
 .../queries/clientpositive/vector_outer_join3.q |   18 +-
 .../queries/clientpositive/vector_outer_join4.q |   17 +-
 .../queries/clientpositive/vector_outer_join5.q |  174 +
 .../vector_partition_diff_num_cols.q            |    1 +
 .../vector_partitioned_date_time.q              |    5 +-
 .../vector_partitioned_date_time_win.q          |  129 +
 .../vector_reduce_groupby_decimal.q             |    1 +
 .../clientpositive/vector_string_concat.q       |    1 +
 .../queries/clientpositive/vector_varchar_4.q   |    1 +
 .../clientpositive/vector_varchar_mapjoin1.q    |    1 +
 .../clientpositive/vector_varchar_simple.q      |    1 +
 .../queries/clientpositive/vectorization_0.q    |    3 +
 .../queries/clientpositive/vectorization_1.q    |    3 +
 .../queries/clientpositive/vectorization_10.q   |    3 +
 .../queries/clientpositive/vectorization_11.q   |    3 +
 .../queries/clientpositive/vectorization_12.q   |    3 +
 .../queries/clientpositive/vectorization_13.q   |  142 +-
 .../queries/clientpositive/vectorization_14.q   |    3 +
 .../queries/clientpositive/vectorization_15.q   |    3 +
 .../queries/clientpositive/vectorization_16.q   |    1 +
 .../queries/clientpositive/vectorization_17.q   |   51 +
 .../queries/clientpositive/vectorization_2.q    |    3 +
 .../queries/clientpositive/vectorization_3.q    |    3 +
 .../queries/clientpositive/vectorization_4.q    |    3 +
 .../queries/clientpositive/vectorization_5.q    |    3 +
 .../queries/clientpositive/vectorization_6.q    |    3 +
 .../queries/clientpositive/vectorization_7.q    |   80 +-
 .../queries/clientpositive/vectorization_8.q    |   81 +-
 .../queries/clientpositive/vectorization_9.q    |   39 +-
 .../clientpositive/vectorization_decimal_date.q |    1 +
 .../queries/clientpositive/vectorization_div0.q |    1 +
 .../clientpositive/vectorization_limit.q        |    1 +
 .../clientpositive/vectorization_part_project.q |    5 +-
 .../clientpositive/vectorization_pushdown.q     |    1 +
 .../vectorization_short_regress.q               |  420 +-
 .../clientpositive/vectorized_bucketmapjoin1.q  |    1 +
 .../queries/clientpositive/vectorized_case.q    |    1 +
 .../queries/clientpositive/vectorized_casts.q   |    3 +
 .../queries/clientpositive/vectorized_context.q |    1 +
 .../clientpositive/vectorized_date_funcs.q      |    3 +
 .../clientpositive/vectorized_distinct_gby.q    |    3 +-
 .../vectorized_dynamic_partition_pruning.q      |    1 +
 .../queries/clientpositive/vectorized_mapjoin.q |    3 +
 .../clientpositive/vectorized_math_funcs.q      |    1 +
 .../clientpositive/vectorized_nested_mapjoin.q  |    3 +
 .../queries/clientpositive/vectorized_parquet.q |    1 +
 .../clientpositive/vectorized_rcfile_columnar.q |    2 +-
 .../clientpositive/vectorized_shufflejoin.q     |   11 +-
 .../clientpositive/vectorized_string_funcs.q    |    1 +
 .../clientpositive/vectorized_timestamp_funcs.q |   42 +-
 ql/src/test/queries/clientpositive/windowing.q  |    2 +-
 .../clientpositive/windowing_windowspec.q       |    2 -
 .../clientpositive/windowing_windowspec2.q      |   60 +
 .../clientpositive/windowing_windowspec3.q      |   62 +
 ql/src/test/resources/RefreshedJarClassV1.txt   |   26 +
 ql/src/test/resources/RefreshedJarClassV2.txt   |   26 +
 ql/src/test/resources/SessionStateTest.jar.v1   |  Bin 2176 -> 0 bytes
 ql/src/test/resources/SessionStateTest.jar.v2   |  Bin 2177 -> 0 bytes
 .../clientnegative/authorization_ctas2.q.out    |    2 +
 .../lockneg_try_lock_db_in_use.q.out            |    9 +-
 .../ptf_negative_NoWindowDefn.q.out             |    1 +
 .../table_nonprintable_negative.q.out           |   19 +
 .../udaf_collect_set_unsupported.q.out          |    1 +
 .../clientnegative/udf_sort_array_wrong1.q.out  |    2 +-
 .../clientnegative/udf_sort_array_wrong2.q.out  |    2 +-
 .../clientnegative/udf_sort_array_wrong3.q.out  |    2 +-
 .../results/clientpositive/add_part_exist.q.out |    2 +
 ql/src/test/results/clientpositive/alter1.q.out |    4 +
 ql/src/test/results/clientpositive/alter2.q.out |    4 +
 ql/src/test/results/clientpositive/alter3.q.out |    4 +
 ql/src/test/results/clientpositive/alter4.q.out |    4 +
 ql/src/test/results/clientpositive/alter5.q.out |    4 +
 .../alter_change_db_location.q.out              |   37 +
 .../results/clientpositive/alter_db_owner.q.out |    6 +
 .../results/clientpositive/alter_index.q.out    |    2 +
 .../clientpositive/alter_merge_2_orc.q.out      |   16 +-
 .../clientpositive/alter_rename_partition.q.out |    6 +
 .../alter_table_partition_drop.q.out            |   74 +
 .../clientpositive/annotate_stats_filter.q.out  |   28 +-
 .../clientpositive/annotate_stats_join.q.out    |    8 +-
 .../annotate_stats_join_pkfk.q.out              |   42 +-
 .../clientpositive/annotate_stats_limit.q.out   |    2 +-
 .../clientpositive/annotate_stats_part.q.out    |   10 +-
 .../clientpositive/annotate_stats_select.q.out  |    6 +-
 .../clientpositive/annotate_stats_table.q.out   |    4 +-
 .../authorization_owner_actions_db.q.out        |    2 +
 .../authorization_view_sqlstd.q.out             |   14 +
 .../results/clientpositive/auto_join0.q.out     |  235 +-
 .../results/clientpositive/auto_join1.q.out     |    8 +-
 .../results/clientpositive/auto_join14.q.out    |   12 +-
 .../results/clientpositive/auto_join16.q.out    |    4 +-
 .../results/clientpositive/auto_join30.q.out    |   24 +
 .../results/clientpositive/auto_join31.q.out    |    4 +
 .../results/clientpositive/auto_join32.q.out    |   32 +-
 .../results/clientpositive/auto_join8.q.out     |   14 +-
 .../clientpositive/auto_join_stats.q.out        |   28 +-
 .../clientpositive/auto_join_stats2.q.out       |    8 +-
 .../auto_join_without_localtask.q.out           |   60 +
 .../clientpositive/auto_sortmerge_join_1.q.out  |    8 +
 .../clientpositive/auto_sortmerge_join_12.q.out |    2 +-
 .../clientpositive/auto_sortmerge_join_14.q.out |    4 +
 .../clientpositive/auto_sortmerge_join_15.q.out |    4 +
 .../clientpositive/auto_sortmerge_join_2.q.out  |    8 +
 .../clientpositive/auto_sortmerge_join_3.q.out  |    8 +
 .../clientpositive/auto_sortmerge_join_4.q.out  |    8 +
 .../clientpositive/auto_sortmerge_join_5.q.out  |   14 +
 .../clientpositive/auto_sortmerge_join_6.q.out  |   66 +
 .../clientpositive/auto_sortmerge_join_7.q.out  |    8 +
 .../clientpositive/auto_sortmerge_join_8.q.out  |    8 +
 .../clientpositive/auto_sortmerge_join_9.q.out  |  143 +
 .../clientpositive/autogen_colalias.q.out       |   12 +-
 .../clientpositive/avro_timestamp.q.java1.7.out |    8 +-
 .../clientpositive/avro_timestamp.q.java1.8.out |    8 +-
 .../avro_timestamp_win.q.java1.7.out            |  134 +
 .../avro_timestamp_win.q.java1.8.out            |  134 +
 .../clientpositive/binarysortable_1.q.out       |  Bin 4302 -> 4329 bytes
 .../clientpositive/bucket_map_join_1.q.out      |   10 +-
 .../clientpositive/bucket_map_join_2.q.out      |   10 +-
 .../results/clientpositive/bucketmapjoin1.q.out |   28 +-
 .../bucketsortoptimize_insert_2.q.out           |   20 +
 .../bucketsortoptimize_insert_4.q.out           |   16 +
 .../bucketsortoptimize_insert_5.q.out           |   20 +
 .../bucketsortoptimize_insert_6.q.out           |   24 +
 .../bucketsortoptimize_insert_7.q.out           |    2 +-
 .../test/results/clientpositive/cbo_gby.q.out   |   18 +-
 .../clientpositive/cbo_rp_auto_join1.q.out      |    4 +-
 .../results/clientpositive/cbo_rp_join0.q.out   | 6867 ++++++++++++++++++
 .../results/clientpositive/cbo_rp_join1.q.out   |  426 ++
 .../results/clientpositive/cbo_subq_in.q.out    |    2 +
 .../results/clientpositive/cbo_udf_udaf.q.out   |   18 +-
 .../results/clientpositive/cbo_windowing.q.out  |  122 +-
 .../clientpositive/column_access_stats.q.out    |   78 +-
 .../clientpositive/columnstats_partlvl.q.out    |   14 +-
 .../clientpositive/columnstats_partlvl_dp.q.out |    8 +-
 .../clientpositive/columnstats_tbllvl.q.out     |   14 +-
 .../results/clientpositive/complex_alias.q.out  |   42 +-
 .../clientpositive/compute_stats_date.q.out     |    2 +-
 .../clientpositive/correlationoptimizer1.q.out  |   16 +-
 .../clientpositive/correlationoptimizer10.q.out |    6 +-
 .../clientpositive/correlationoptimizer11.q.out |    8 +-
 .../clientpositive/correlationoptimizer15.q.out |    6 +-
 .../clientpositive/correlationoptimizer2.q.out  |   10 +-
 .../clientpositive/correlationoptimizer3.q.out  |   12 +-
 .../clientpositive/correlationoptimizer4.q.out  |    6 +-
 .../clientpositive/correlationoptimizer5.q.out  |    6 +
 .../clientpositive/correlationoptimizer6.q.out  |   48 +-
 .../results/clientpositive/create_view.q.out    |    2 +
 .../clientpositive/cross_product_check_1.q.out  |   20 +-
 .../clientpositive/cross_product_check_2.q.out  |   76 +-
 .../clientpositive/crtseltbl_serdeprops.q.out   |   35 +
 ql/src/test/results/clientpositive/ctas.q.out   |    2 +
 .../test/results/clientpositive/cteViews.q.out  |  242 +
 .../test/results/clientpositive/database.q.out  |   12 +
 .../clientpositive/database_location.q.out      |    8 +
 .../clientpositive/database_properties.q.out    |    6 +
 .../clientpositive/dbtxnmgr_query5.q.out        |    2 +
 .../clientpositive/decimal_precision2.q.out     |   28 +-
 .../clientpositive/describe_database.q.out      |    4 +
 .../clientpositive/describe_database_json.q.out |   12 +
 .../clientpositive/describe_table_json.q.out    |    4 +
 .../display_colstats_tbllvl.q.out               |    6 +-
 .../dynpart_sort_opt_bucketing.q.out            |  277 +
 .../dynpart_sort_optimization2.q.out            |  166 +-
 .../encrypted/encryption_drop_partition.q.out   |   81 +
 .../encrypted/encryption_drop_table.q.out       |   62 +
 .../encrypted/encryption_drop_view.q.out        |   34 +
 .../encryption_insert_partition_dynamic.q.out   |   32 +-
 .../encryption_insert_partition_static.q.out    |  387 +-
 .../encrypted/encryption_insert_values.q.out    |   71 +
 .../encryption_join_unencrypted_tbl.q.out       |   16 +-
 ...on_join_with_different_encryption_keys.q.out |   16 +-
 ...cryption_load_data_to_encrypted_tables.q.out |    8 +-
 .../encrypted/encryption_move_tbl.q.out         |   55 +
 ...ryption_select_read_only_encrypted_tbl.q.out |    8 +-
 .../exec_parallel_column_stats.q.out            |   51 +
 .../clientpositive/explain_logical.q.out        |   28 +-
 .../clientpositive/explain_rearrange.q.out      |   32 +-
 .../clientpositive/filter_cond_pushdown.q.out   |  382 +
 .../clientpositive/filter_join_breaktask.q.out  |   12 +-
 .../clientpositive/filter_join_breaktask2.q.out |    8 +-
 .../results/clientpositive/filter_numeric.q.out |    6 +-
 .../test/results/clientpositive/fold_case.q.out |  186 +-
 .../clientpositive/fold_eq_with_case_when.q.out |  231 +
 .../test/results/clientpositive/fold_when.q.out |   32 +-
 .../test/results/clientpositive/groupby10.q.out |  140 +-
 .../test/results/clientpositive/groupby11.q.out |   70 +-
 .../test/results/clientpositive/groupby2.q.out  |   33 +-
 .../clientpositive/groupby2_map_skew.q.out      |   33 +-
 .../test/results/clientpositive/groupby8.q.out  |  140 +-
 .../clientpositive/groupby8_map_skew.q.out      |   70 +-
 ...pby_complex_types_multi_single_reducer.q.out |   68 +-
 .../results/clientpositive/groupby_cube1.q.out  |  137 +-
 .../clientpositive/groupby_grouping_sets2.q.out |   36 +-
 .../clientpositive/groupby_grouping_sets3.q.out |   32 +-
 .../clientpositive/groupby_grouping_sets4.q.out |   72 +-
 .../clientpositive/groupby_grouping_sets5.q.out |   44 +-
 .../clientpositive/groupby_grouping_sets6.q.out |   70 +-
 .../results/clientpositive/groupby_ppd.q.out    |   34 +-
 .../clientpositive/groupby_rollup1.q.out        |  123 +-
 .../results/clientpositive/groupby_sort_6.q.out |   46 +-
 ql/src/test/results/clientpositive/having.q.out |   28 +-
 .../test/results/clientpositive/having2.q.out   |   32 +-
 .../identity_project_remove_skip.q.out          |    6 +
 .../results/clientpositive/implicit_cast1.q.out |    8 +-
 .../clientpositive/index_auto_empty.q.out       |    8 +-
 .../clientpositive/index_auto_unused.q.out      |    4 +-
 .../results/clientpositive/index_creation.q.out |    2 +
 .../results/clientpositive/index_serde.q.out    |    6 +-
 .../clientpositive/index_skewtable.q.out        |   12 +-
 .../clientpositive/infer_const_type.q.out       |   28 +-
 ql/src/test/results/clientpositive/input2.q.out |    4 +
 .../test/results/clientpositive/input21.q.out   |   10 +-
 .../test/results/clientpositive/input23.q.out   |    8 +-
 .../test/results/clientpositive/input24.q.out   |    4 +-
 .../test/results/clientpositive/input25.q.out   |   36 +-
 .../test/results/clientpositive/input26.q.out   |   28 +-
 ql/src/test/results/clientpositive/input3.q.out |    4 +
 ql/src/test/results/clientpositive/input6.q.out |    2 +-
 ql/src/test/results/clientpositive/input9.q.out |    6 +-
 .../results/clientpositive/input_part4.q.out    |    6 +-
 .../test/results/clientpositive/insert1.q.out   |   46 +-
 .../results/clientpositive/insert_into1.q.out   |   86 +-
 .../results/clientpositive/insert_into2.q.out   |   82 +-
 .../insert_into_with_schema2.q.out              |  135 +
 .../insert_nonacid_from_acid.q.out              |   20 +-
 ql/src/test/results/clientpositive/join14.q.out |   14 +-
 ql/src/test/results/clientpositive/join19.q.out |   62 +-
 ql/src/test/results/clientpositive/join28.q.out |    2 +-
 ql/src/test/results/clientpositive/join29.q.out |    6 +
 ql/src/test/results/clientpositive/join31.q.out |    6 +
 ql/src/test/results/clientpositive/join32.q.out |    2 +-
 .../clientpositive/join32_lessSize.q.out        |   10 +-
 ql/src/test/results/clientpositive/join33.q.out |    2 +-
 ql/src/test/results/clientpositive/join42.q.out |  312 +
 ql/src/test/results/clientpositive/join43.q.out |  648 ++
 ql/src/test/results/clientpositive/join8.q.out  |   16 +-
 .../join_cond_pushdown_unqual1.q.out            |   48 +-
 .../join_cond_pushdown_unqual2.q.out            |   24 +-
 .../join_cond_pushdown_unqual3.q.out            |   48 +-
 .../join_cond_pushdown_unqual4.q.out            |   24 +-
 .../results/clientpositive/join_hive_626.q.out  |   28 +-
 .../join_merge_multi_expressions.q.out          |    6 +-
 .../results/clientpositive/join_nullsafe.q.out  |   16 +-
 .../results/clientpositive/join_reorder.q.out   |   92 +-
 .../results/clientpositive/join_reorder2.q.out  |   68 +-
 .../results/clientpositive/join_reorder3.q.out  |   68 +-
 .../results/clientpositive/join_reorder4.q.out  |   54 +-
 .../test/results/clientpositive/join_view.q.out |   18 +-
 .../json_serde_qualified_types.q.out            |   33 +
 .../test/results/clientpositive/keyword_1.q.out |    8 +-
 .../clientpositive/lateral_view_explode2.q.out  |    6 +-
 .../list_bucket_query_oneskew_2.q.out           |   22 +-
 .../clientpositive/mapjoin_subquery.q.out       |    4 +-
 .../clientpositive/mapjoin_subquery2.q.out      |   20 +-
 .../results/clientpositive/merge_join_1.q.out   |   32 +-
 .../results/clientpositive/mergejoins.q.out     |   40 +-
 .../clientpositive/mergejoins_mixed.q.out       |  332 +-
 .../results/clientpositive/metadataonly1.q.out  |   72 +-
 .../results/clientpositive/multiMapJoin1.q.out  |   76 +
 .../results/clientpositive/multiMapJoin2.q.out  |   30 +-
 .../clientpositive/multigroupby_singlemr.q.out  |  136 +-
 .../results/clientpositive/nullformatCTAS.q.out |    6 +-
 .../results/clientpositive/nullgroup3.q.out     |   16 +-
 .../results/clientpositive/nullgroup5.q.out     |   14 +-
 .../clientpositive/optimize_nullscan.q.out      |   82 +-
 .../clientpositive/orc_int_type_promotion.q.out |  377 +
 .../results/clientpositive/orc_merge1.q.out     |    8 +-
 .../results/clientpositive/orc_merge9.q.out     |  186 +
 .../clientpositive/orc_predicate_pushdown.q.out |   36 +-
 .../clientpositive/partition_boolexpr.q.out     |    8 +-
 .../clientpositive/partition_date2.q.out        |    8 +-
 .../clientpositive/partition_timestamp.q.out    |    8 +-
 .../clientpositive/partition_timestamp2.q.out   |    8 +-
 .../partition_timestamp2_win.q.out              |  399 +
 .../partition_timestamp_win.q.out               |  316 +
 .../test/results/clientpositive/ppd_gby.q.out   |   41 +-
 .../test/results/clientpositive/ppd_gby2.q.out  |   49 +-
 .../results/clientpositive/ppd_gby_join.q.out   |   68 +-
 .../test/results/clientpositive/ppd_join.q.out  |   64 +-
 .../test/results/clientpositive/ppd_join2.q.out |   81 +-
 .../test/results/clientpositive/ppd_join3.q.out |   91 +-
 .../test/results/clientpositive/ppd_join4.q.out |   24 +-
 .../test/results/clientpositive/ppd_join5.q.out |   22 +-
 .../clientpositive/ppd_outer_join2.q.out        |   16 +-
 .../clientpositive/ppd_outer_join3.q.out        |   16 +-
 .../clientpositive/ppd_outer_join4.q.out        |   32 +-
 .../clientpositive/ppd_outer_join5.q.out        |   72 +-
 .../clientpositive/ppd_repeated_alias.q.out     |   78 +-
 .../results/clientpositive/ppd_udf_col.q.out    |  190 +-
 .../test/results/clientpositive/ppd_union.q.out |   42 +-
 .../results/clientpositive/ppd_union_view.q.out |   46 +-
 ql/src/test/results/clientpositive/ppd_vc.q.out |    8 +-
 .../clientpositive/ql_rewrite_gbtoidx.q.out     |  258 +-
 .../ql_rewrite_gbtoidx_cbo_1.q.out              |  260 +-
 .../ql_rewrite_gbtoidx_cbo_2.q.out              |   16 +-
 .../query_result_fileformat.q.out               |   12 +-
 ql/src/test/results/clientpositive/quote1.q.out |    6 +-
 .../results/clientpositive/quotedid_basic.q.out |   70 +-
 .../results/clientpositive/quotedid_skew.q.out  |   40 +-
 .../clientpositive/reduce_deduplicate.q.out     |   16 +-
 .../results/clientpositive/rename_column.q.out  |    4 +
 .../runtime_skewjoin_mapjoin_spark.q.out        |   27 +-
 .../test/results/clientpositive/sample6.q.out   |   12 +-
 .../clientpositive/script_env_var1.q.out        |    8 +-
 .../clientpositive/selectDistinctStar.q.out     |   92 +-
 .../clientpositive/select_dummy_source.q.out    |   34 +-
 .../test/results/clientpositive/semijoin.q.out  |   10 +-
 .../results/clientpositive/show_functions.q.out |    6 +
 .../results/clientpositive/show_tables.q.out    |   18 +
 .../test/results/clientpositive/skewjoin.q.out  |   89 +-
 .../clientpositive/skewjoin_mapjoin1.q.out      |  112 +-
 .../clientpositive/skewjoin_mapjoin10.q.out     |   26 +-
 .../clientpositive/skewjoin_mapjoin11.q.out     |   32 +-
 .../clientpositive/skewjoin_mapjoin2.q.out      |   72 +-
 .../clientpositive/skewjoin_mapjoin3.q.out      |   32 +-
 .../clientpositive/skewjoin_mapjoin4.q.out      |   40 +-
 .../clientpositive/skewjoin_mapjoin5.q.out      |   50 +-
 .../clientpositive/skewjoin_mapjoin6.q.out      |   48 +-
 .../clientpositive/skewjoin_mapjoin7.q.out      |   68 +-
 .../clientpositive/skewjoin_mapjoin8.q.out      |   20 +-
 .../clientpositive/skewjoin_mapjoin9.q.out      |   40 +-
 .../skewjoin_union_remove_1.q.out               |  144 +-
 .../skewjoin_union_remove_2.q.out               |   48 +-
 .../results/clientpositive/skewjoinopt1.q.out   |  144 +-
 .../results/clientpositive/skewjoinopt10.q.out  |   52 +-
 .../results/clientpositive/skewjoinopt11.q.out  |   84 +-
 .../results/clientpositive/skewjoinopt12.q.out  |   40 +-
 .../results/clientpositive/skewjoinopt13.q.out  |   28 +-
 .../results/clientpositive/skewjoinopt14.q.out  |   48 +-
 .../results/clientpositive/skewjoinopt15.q.out  |   34 +-
 .../results/clientpositive/skewjoinopt16.q.out  |   40 +-
 .../results/clientpositive/skewjoinopt17.q.out  |   80 +-
 .../results/clientpositive/skewjoinopt18.q.out  |    6 +-
 .../results/clientpositive/skewjoinopt19.q.out  |   40 +-
 .../results/clientpositive/skewjoinopt2.q.out   |  168 +-
 .../results/clientpositive/skewjoinopt20.q.out  |   40 +-
 .../results/clientpositive/skewjoinopt3.q.out   |   80 +-
 .../results/clientpositive/skewjoinopt4.q.out   |   80 +-
 .../results/clientpositive/skewjoinopt5.q.out   |   40 +-
 .../results/clientpositive/skewjoinopt6.q.out   |   40 +-
 .../results/clientpositive/skewjoinopt7.q.out   |   52 +-
 .../results/clientpositive/skewjoinopt8.q.out   |   52 +-
 .../results/clientpositive/skewjoinopt9.q.out   |   54 +-
 .../results/clientpositive/smb_mapjoin9.q.out   |    8 +-
 .../spark/annotate_stats_join.q.out             |  212 +-
 .../clientpositive/spark/auto_join0.q.out       |   97 +-
 .../clientpositive/spark/auto_join1.q.out       |   68 +-
 .../clientpositive/spark/auto_join10.q.out      |   28 +-
 .../clientpositive/spark/auto_join11.q.out      |   32 +-
 .../clientpositive/spark/auto_join14.q.out      |   70 +-
 .../clientpositive/spark/auto_join16.q.out      |   68 +-
 .../clientpositive/spark/auto_join17.q.out      |   60 +-
 .../clientpositive/spark/auto_join18.q.out      |   30 +-
 .../spark/auto_join18_multi_distinct.q.out      |   30 +-
 .../clientpositive/spark/auto_join19.q.out      |   56 +-
 .../clientpositive/spark/auto_join26.q.out      |   68 +-
 .../clientpositive/spark/auto_join27.q.out      |   31 +-
 .../clientpositive/spark/auto_join32.q.out      |  104 +-
 .../clientpositive/spark/auto_join4.q.out       |   14 +-
 .../clientpositive/spark/auto_join5.q.out       |   24 +-
 .../clientpositive/spark/auto_join6.q.out       |   10 +-
 .../clientpositive/spark/auto_join8.q.out       |   16 +-
 .../clientpositive/spark/auto_join9.q.out       |   56 +-
 .../spark/auto_join_filters.q.out               |    4 +-
 .../clientpositive/spark/auto_join_nulls.q.out  |    6 +-
 .../clientpositive/spark/auto_join_stats.q.out  |    4 +-
 .../clientpositive/spark/auto_join_stats2.q.out |    8 +-
 .../spark/auto_join_without_localtask.q.out     |   32 +-
 .../spark/auto_sortmerge_join_10.q.out          |   10 +
 .../spark/auto_sortmerge_join_12.q.out          |    2 +-
 .../spark/auto_sortmerge_join_5.q.out           |    6 +
 .../spark/bucket_map_join_1.q.out               |   10 +-
 .../spark/bucket_map_join_2.q.out               |   10 +-
 .../clientpositive/spark/bucketmapjoin1.q.out   |   28 +-
 .../spark/bucketsortoptimize_insert_7.q.out     |   18 +-
 .../results/clientpositive/spark/cbo_gby.q.out  |   24 +-
 .../clientpositive/spark/cbo_subq_in.q.out      |    2 +
 .../clientpositive/spark/cbo_udf_udaf.q.out     |   18 +-
 .../spark/column_access_stats.q.out             |  104 +-
 .../spark/constprog_partitioner.q.out           |   80 +-
 .../results/clientpositive/spark/count.q.out    |   24 +-
 .../clientpositive/spark/cross_join.q.out       |   74 +-
 .../spark/cross_product_check_1.q.out           |   60 +-
 .../spark/cross_product_check_2.q.out           |  106 +-
 .../results/clientpositive/spark/ctas.q.out     |    2 +
 .../spark/filter_join_breaktask.q.out           |   12 +-
 .../spark/filter_join_breaktask2.q.out          |    8 +-
 .../results/clientpositive/spark/groupby1.q.out |    8 +-
 .../clientpositive/spark/groupby10.q.out        |   88 +-
 .../clientpositive/spark/groupby11.q.out        |   44 +-
 .../results/clientpositive/spark/groupby2.q.out |   25 +-
 .../results/clientpositive/spark/groupby3.q.out |    8 +-
 .../clientpositive/spark/groupby3_map.q.out     |    8 +-
 .../spark/groupby3_map_multi_distinct.q.out     |    8 +-
 .../spark/groupby3_map_skew.q.out               |    8 +-
 .../clientpositive/spark/groupby3_noskew.q.out  |    6 +-
 .../spark/groupby3_noskew_multi_distinct.q.out  |    6 +-
 .../results/clientpositive/spark/groupby4.q.out |    6 +-
 .../results/clientpositive/spark/groupby8.q.out |   88 +-
 .../spark/groupby8_map_skew.q.out               |   44 +-
 ...pby_complex_types_multi_single_reducer.q.out |   90 +-
 .../clientpositive/spark/groupby_cube1.q.out    |  151 +-
 .../clientpositive/spark/groupby_map_ppr.q.out  |    8 +-
 .../spark/groupby_map_ppr_multi_distinct.q.out  |    8 +-
 .../clientpositive/spark/groupby_position.q.out |  130 +-
 .../clientpositive/spark/groupby_ppr.q.out      |    8 +-
 .../clientpositive/spark/groupby_rollup1.q.out  |  133 +-
 .../spark/groupby_sort_1_23.q.out               |  101 +-
 .../spark/groupby_sort_skew_1_23.q.out          |  101 +-
 .../results/clientpositive/spark/having.q.out   |   94 +-
 .../spark/index_auto_self_join.q.out            |  116 +-
 .../spark/infer_bucket_sort_map_operators.q.out |    5 +-
 .../spark/infer_bucket_sort_merge.q.out         |    4 +-
 .../clientpositive/spark/innerjoin.q.out        |   54 +-
 .../results/clientpositive/spark/insert1.q.out  |   46 +-
 .../clientpositive/spark/insert_into1.q.out     |   92 +-
 .../clientpositive/spark/insert_into2.q.out     |   88 +-
 .../results/clientpositive/spark/join1.q.out    |   38 +-
 .../results/clientpositive/spark/join10.q.out   |   28 +-
 .../results/clientpositive/spark/join11.q.out   |   18 +-
 .../results/clientpositive/spark/join14.q.out   |   60 +-
 .../results/clientpositive/spark/join16.q.out   |   36 +-
 .../results/clientpositive/spark/join17.q.out   |   52 +-
 .../results/clientpositive/spark/join18.q.out   |   12 +-
 .../spark/join18_multi_distinct.q.out           |   12 +-
 .../results/clientpositive/spark/join19.q.out   |   62 +-
 .../results/clientpositive/spark/join28.q.out   |    2 +-
 .../results/clientpositive/spark/join29.q.out   |   66 +-
 .../results/clientpositive/spark/join31.q.out   |  104 +-
 .../results/clientpositive/spark/join32.q.out   |    2 +-
 .../clientpositive/spark/join32_lessSize.q.out  |   10 +-
 .../results/clientpositive/spark/join33.q.out   |    2 +-
 .../results/clientpositive/spark/join34.q.out   |   44 +-
 .../results/clientpositive/spark/join35.q.out   |   96 +-
 .../results/clientpositive/spark/join4.q.out    |   16 +-
 .../results/clientpositive/spark/join40.q.out   |  116 +-
 .../results/clientpositive/spark/join5.q.out    |   20 +-
 .../results/clientpositive/spark/join6.q.out    |   10 +-
 .../results/clientpositive/spark/join8.q.out    |   18 +-
 .../results/clientpositive/spark/join9.q.out    |   42 +-
 .../clientpositive/spark/join_alt_syntax.q.out  |   42 +-
 .../spark/join_cond_pushdown_unqual1.q.out      |   48 +-
 .../spark/join_cond_pushdown_unqual2.q.out      |   24 +-
 .../spark/join_cond_pushdown_unqual3.q.out      |   48 +-
 .../spark/join_cond_pushdown_unqual4.q.out      |   24 +-
 .../clientpositive/spark/join_hive_626.q.out    |   28 +-
 .../spark/join_merge_multi_expressions.q.out    |    6 +-
 .../clientpositive/spark/join_nullsafe.q.out    |   16 +-
 .../clientpositive/spark/join_reorder.q.out     |   92 +-
 .../clientpositive/spark/join_reorder2.q.out    |   68 +-
 .../clientpositive/spark/join_reorder3.q.out    |   68 +-
 .../clientpositive/spark/join_reorder4.q.out    |   54 +-
 .../results/clientpositive/spark/join_vc.q.out  |   40 +-
 .../clientpositive/spark/join_view.q.out        |   18 +-
 .../spark/lateral_view_explode2.q.out           |    6 +-
 .../spark/limit_partition_metadataonly.q.out    |    4 +-
 .../clientpositive/spark/limit_pushdown.q.out   |  150 +-
 .../clientpositive/spark/load_dyn_part13.q.out  |   12 +-
 .../clientpositive/spark/load_dyn_part14.q.out  |    9 +
 .../clientpositive/spark/louter_join_ppr.q.out  |  514 +-
 .../clientpositive/spark/mapjoin_decimal.q.out  |   41 +-
 .../clientpositive/spark/mapjoin_subquery.q.out |    4 +-
 .../spark/mapjoin_subquery2.q.out               |   30 +-
 .../results/clientpositive/spark/merge1.q.out   |    4 +-
 .../results/clientpositive/spark/merge2.q.out   |    4 +-
 .../clientpositive/spark/mergejoins.q.out       |   40 +-
 .../clientpositive/spark/mergejoins_mixed.q.out |  332 +-
 .../spark/metadata_only_queries.q.out           |   12 +-
 .../clientpositive/spark/multi_insert.q.out     |   48 +
 ...i_insert_move_tasks_share_dependencies.q.out |   48 +
 .../clientpositive/spark/multi_join_union.q.out |    8 +
 .../spark/multigroupby_singlemr.q.out           |  146 +-
 .../spark/optimize_nullscan.q.out               |   76 +-
 .../results/clientpositive/spark/order2.q.out   |    2 +-
 .../spark/outer_join_ppr.q.java1.7.out          |  366 +-
 .../spark/outer_join_ppr.q.java1.8.out          |  366 +-
 .../clientpositive/spark/parallel_join1.q.out   |   38 +-
 .../clientpositive/spark/parallel_orderby.q.out |    6 +-
 .../test/results/clientpositive/spark/pcr.q.out |    4 +-
 .../clientpositive/spark/ppd_gby_join.q.out     |  144 +-
 .../results/clientpositive/spark/ppd_join.q.out |  124 +-
 .../clientpositive/spark/ppd_join2.q.out        |   81 +-
 .../clientpositive/spark/ppd_join3.q.out        |   91 +-
 .../clientpositive/spark/ppd_join4.q.out        |   24 +-
 .../clientpositive/spark/ppd_join5.q.out        |   54 +-
 .../clientpositive/spark/ppd_join_filter.q.out  |  442 +-
 .../clientpositive/spark/ppd_outer_join1.q.out  |  120 +-
 .../clientpositive/spark/ppd_outer_join2.q.out  |  158 +-
 .../clientpositive/spark/ppd_outer_join3.q.out  |  154 +-
 .../clientpositive/spark/ppd_outer_join4.q.out  |   32 +-
 .../clientpositive/spark/ppd_outer_join5.q.out  |   72 +-
 .../spark/ql_rewrite_gbtoidx.q.out              |  263 +-
 .../spark/ql_rewrite_gbtoidx_cbo_1.q.out        |  469 +-
 .../spark/reduce_deduplicate.q.out              |   16 +-
 .../clientpositive/spark/router_join_ppr.q.out  |  582 +-
 .../spark/runtime_skewjoin_mapjoin_spark.q.out  |    5 +-
 .../results/clientpositive/spark/sample6.q.out  |   12 +-
 .../clientpositive/spark/script_env_var1.q.out  |    8 +-
 .../results/clientpositive/spark/semijoin.q.out |   36 +-
 .../results/clientpositive/spark/skewjoin.q.out |  243 +-
 .../clientpositive/spark/skewjoin_noskew.q.out  |   32 +-
 .../spark/skewjoin_union_remove_1.q.out         |  120 +-
 .../spark/skewjoin_union_remove_2.q.out         |   42 +-
 .../clientpositive/spark/skewjoinopt1.q.out     |  120 +-
 .../clientpositive/spark/skewjoinopt10.q.out    |   32 +-
 .../clientpositive/spark/skewjoinopt11.q.out    |   64 +-
 .../clientpositive/spark/skewjoinopt12.q.out    |   30 +-
 .../clientpositive/spark/skewjoinopt13.q.out    |   28 +-
 .../clientpositive/spark/skewjoinopt14.q.out    |   40 +-
 .../clientpositive/spark/skewjoinopt15.q.out    |   40 +-
 .../clientpositive/spark/skewjoinopt16.q.out    |   30 +-
 .../clientpositive/spark/skewjoinopt17.q.out    |   60 +-
 .../clientpositive/spark/skewjoinopt18.q.out    |    6 +-
 .../clientpositive/spark/skewjoinopt19.q.out    |   30 +-
 .../clientpositive/spark/skewjoinopt2.q.out     |  128 +-
 .../clientpositive/spark/skewjoinopt20.q.out    |   30 +-
 .../clientpositive/spark/skewjoinopt3.q.out     |   60 +-
 .../clientpositive/spark/skewjoinopt4.q.out     |   60 +-
 .../clientpositive/spark/skewjoinopt5.q.out     |   30 +-
 .../clientpositive/spark/skewjoinopt6.q.out     |   30 +-
 .../clientpositive/spark/skewjoinopt7.q.out     |   42 +-
 .../clientpositive/spark/skewjoinopt8.q.out     |   42 +-
 .../clientpositive/spark/skewjoinopt9.q.out     |   42 +-
 .../results/clientpositive/spark/stats1.q.out   |    8 +-
 .../results/clientpositive/spark/stats12.q.out  |    2 +-
 .../results/clientpositive/spark/stats13.q.out  |    2 +-
 .../results/clientpositive/spark/stats2.q.out   |    2 +-
 .../results/clientpositive/spark/stats7.q.out   |    2 +-
 .../results/clientpositive/spark/stats8.q.out   |    2 +-
 .../clientpositive/spark/stats_noscan_2.q.out   |    8 +-
 .../clientpositive/spark/stats_only_null.q.out  |    8 +-
 .../clientpositive/spark/subquery_exists.q.out  |   22 +-
 .../clientpositive/spark/subquery_in.q.out      |  230 +-
 .../spark/subquery_multiinsert.q.java1.7.out    |   14 +-
 .../spark/subquery_multiinsert.q.java1.8.out    |   14 +-
 .../spark/table_access_keys_stats.q.out         |   18 +-
 .../clientpositive/spark/temp_table.q.out       |  100 +-
 .../spark/tez_joins_explain.q.out               |    2 -
 .../clientpositive/spark/transform1.q.out       |    8 +-
 .../clientpositive/spark/udf_in_file.q.out      |    8 +-
 .../results/clientpositive/spark/union.q.out    |   12 +-
 .../results/clientpositive/spark/union10.q.out  |   18 +-
 .../results/clientpositive/spark/union11.q.out  |   93 +-
 .../results/clientpositive/spark/union12.q.out  |   14 +-
 .../results/clientpositive/spark/union13.q.out  |    8 +-
 .../results/clientpositive/spark/union14.q.out  |   84 +-
 .../results/clientpositive/spark/union15.q.out  |  111 +-
 .../results/clientpositive/spark/union16.q.out  |  125 +
 .../results/clientpositive/spark/union17.q.out  |   24 +-
 .../results/clientpositive/spark/union18.q.out  |   10 +
 .../results/clientpositive/spark/union19.q.out  |   16 +-
 .../results/clientpositive/spark/union2.q.out   |   12 +-
 .../results/clientpositive/spark/union20.q.out  |   28 +-
 .../results/clientpositive/spark/union21.q.out  |   24 +-
 .../results/clientpositive/spark/union22.q.out  |    9 +
 .../results/clientpositive/spark/union23.q.out  |    7 +
 .../results/clientpositive/spark/union24.q.out  |   71 +-
 .../results/clientpositive/spark/union25.q.out  |   52 +-
 .../results/clientpositive/spark/union26.q.out  |   16 +
 .../results/clientpositive/spark/union27.q.out  |    8 +
 .../results/clientpositive/spark/union28.q.out  |   76 +-
 .../results/clientpositive/spark/union29.q.out  |   12 +
 .../results/clientpositive/spark/union3.q.out   |   12 +
 .../results/clientpositive/spark/union30.q.out  |   80 +-
 .../results/clientpositive/spark/union31.q.out  |   32 +
 .../results/clientpositive/spark/union32.q.out  |   30 +
 .../results/clientpositive/spark/union33.q.out  |   26 +-
 .../results/clientpositive/spark/union34.q.out  |   63 +-
 .../results/clientpositive/spark/union4.q.out   |   12 +-
 .../results/clientpositive/spark/union5.q.out   |   62 +-
 .../results/clientpositive/spark/union6.q.out   |    8 +-
 .../results/clientpositive/spark/union7.q.out   |   82 +-
 .../results/clientpositive/spark/union8.q.out   |   13 +-
 .../results/clientpositive/spark/union9.q.out   |   19 +-
 .../spark/union_lateralview.q.out               |   24 +
 .../clientpositive/spark/union_ppr.q.out        |   10 +
 .../clientpositive/spark/union_remove_1.q.out   |   28 +-
 .../clientpositive/spark/union_remove_10.q.out  |   24 +-
 .../clientpositive/spark/union_remove_11.q.out  |   12 +
 .../clientpositive/spark/union_remove_12.q.out  |   14 +-
 .../clientpositive/spark/union_remove_13.q.out  |   22 +-
 .../clientpositive/spark/union_remove_14.q.out  |   14 +-
 .../clientpositive/spark/union_remove_15.q.out  |   30 +-
 .../clientpositive/spark/union_remove_16.q.out  |   30 +-
 .../clientpositive/spark/union_remove_17.q.out  |    8 +
 .../clientpositive/spark/union_remove_18.q.out  |   30 +-
 .../clientpositive/spark/union_remove_19.q.out  |  220 +-
 .../clientpositive/spark/union_remove_2.q.out   |   24 +-
 .../clientpositive/spark/union_remove_20.q.out  |   30 +-
 .../clientpositive/spark/union_remove_21.q.out  |   82 +-
 .../clientpositive/spark/union_remove_22.q.out  |   52 +-
 .../clientpositive/spark/union_remove_23.q.out  |   30 +-
 .../clientpositive/spark/union_remove_24.q.out  |   30 +-
 .../clientpositive/spark/union_remove_25.q.out  |   44 +-
 .../clientpositive/spark/union_remove_3.q.out   |   12 +
 .../clientpositive/spark/union_remove_4.q.out   |   28 +-
 .../clientpositive/spark/union_remove_5.q.out   |   24 +-
 .../clientpositive/spark/union_remove_6.q.out   |   22 +-
 .../spark/union_remove_6_subq.q.out             |   44 +-
 .../clientpositive/spark/union_remove_7.q.out   |   28 +-
 .../clientpositive/spark/union_remove_8.q.out   |   24 +-
 .../clientpositive/spark/union_remove_9.q.out   |   22 +-
 .../clientpositive/spark/union_top_level.q.out  |   66 +-
 .../clientpositive/spark/union_view.q.out       |  143 +
 .../spark/vector_cast_constant.q.java1.7.out    |    6 +-
 .../spark/vector_cast_constant.q.java1.8.out    |    6 +-
 .../spark/vector_count_distinct.q.out           |    6 +-
 .../spark/vector_data_types.q.out               |  116 +-
 .../spark/vector_decimal_aggregate.q.out        |   12 +-
 .../spark/vector_distinct_2.q.out               |    4 +-
 .../clientpositive/spark/vector_elt.q.out       |    2 +-
 .../clientpositive/spark/vector_groupby_3.q.out |    6 +-
 .../spark/vector_mapjoin_reduce.q.out           |  261 +-
 .../clientpositive/spark/vector_orderby_5.q.out |    6 +-
 .../spark/vector_string_concat.q.out            |    6 +-
 .../clientpositive/spark/vectorization_0.q.out  |   28 +-
 .../clientpositive/spark/vectorization_1.q.out  |    8 +-
 .../clientpositive/spark/vectorization_10.q.out |  428 +-
 .../clientpositive/spark/vectorization_11.q.out |   74 +-
 .../clientpositive/spark/vectorization_12.q.out |  994 +--
 .../clientpositive/spark/vectorization_13.q.out |  430 +-
 .../clientpositive/spark/vectorization_14.q.out | 1182 +--
 .../clientpositive/spark/vectorization_15.q.out |   68 +-
 .../clientpositive/spark/vectorization_16.q.out |    8 +-
 .../clientpositive/spark/vectorization_17.q.out |  507 ++
 .../clientpositive/spark/vectorization_2.q.out  |    8 +-
 .../clientpositive/spark/vectorization_3.q.out  |    8 +-
 .../clientpositive/spark/vectorization_4.q.out  |    8 +-
 .../clientpositive/spark/vectorization_5.q.out  |    8 +-
 .../clientpositive/spark/vectorization_6.q.out  | 3042 ++++----
 .../clientpositive/spark/vectorization_7.q.out  |  328 +-
 .../clientpositive/spark/vectorization_8.q.out  |  314 +-
 .../clientpositive/spark/vectorization_9.q.out  |  965 ++-
 .../spark/vectorization_div0.q.out              |    6 +-
 .../spark/vectorization_part_project.q.out      |   42 +-
 .../spark/vectorization_pushdown.q.out          |    8 +-
 .../spark/vectorization_short_regress.q.out     | 1338 ++--
 .../clientpositive/spark/vectorized_case.q.out  |    2 +-
 .../spark/vectorized_mapjoin.q.out              |   68 +-
 .../spark/vectorized_nested_mapjoin.q.out       |    8 +-
 .../spark/vectorized_rcfile_columnar.q.out      |   24 +-
 .../spark/vectorized_shufflejoin.q.out          |   89 +-
 .../spark/vectorized_timestamp_funcs.q.out      |  408 +-
 .../clientpositive/spark/windowing.q.out        |    4 +-
 .../test/results/clientpositive/stats12.q.out   |    2 +-
 .../test/results/clientpositive/stats13.q.out   |    2 +-
 ql/src/test/results/clientpositive/stats2.q.out |    2 +-
 ql/src/test/results/clientpositive/stats7.q.out |    2 +-
 ql/src/test/results/clientpositive/stats8.q.out |    2 +-
 .../results/clientpositive/stats_noscan_2.q.out |    8 +-
 .../subq_where_serialization.q.out              |    5 +
 .../clientpositive/subquery_exists.q.out        |    2 +
 .../clientpositive/subquery_in_having.q.out     |  132 +-
 .../subquery_multiinsert.q.java1.7.out          |   18 +-
 .../clientpositive/subquery_notexists.q.out     |   12 +-
 .../subquery_notexists_having.q.out             |   12 +-
 .../results/clientpositive/subquery_notin.q.out |   50 +-
 .../subquery_notin_having.q.java1.7.out         |   70 +-
 .../subquery_unqual_corr_expr.q.out             |    8 +-
 .../subquery_unqualcolumnrefs.q.out             |   74 +-
 .../results/clientpositive/subquery_views.q.out |   20 +-
 .../symlink_text_input_format.q.out             |   24 +-
 .../clientpositive/table_nonprintable.q.out     |   72 +
 .../results/clientpositive/temp_table.q.out     |   84 +-
 .../temp_table_display_colstats_tbllvl.q.out    |    6 +-
 .../clientpositive/temp_table_names.q.out       |    8 +
 .../tez/acid_vectorization_partition.q.out      |   20 +-
 .../clientpositive/tez/alter_merge_2_orc.q.out  |   16 +-
 .../results/clientpositive/tez/auto_join0.q.out |   91 +-
 .../results/clientpositive/tez/auto_join1.q.out |    8 +-
 .../tez/auto_sortmerge_join_10.q.out            |   14 +
 .../tez/auto_sortmerge_join_12.q.out            |    5 +-
 .../tez/auto_sortmerge_join_5.q.out             |    6 +
 .../results/clientpositive/tez/cbo_gby.q.out    |   18 +-
 .../clientpositive/tez/cbo_subq_in.q.out        |    2 +
 .../clientpositive/tez/cbo_udf_udaf.q.out       |   18 +-
 .../clientpositive/tez/cbo_windowing.q.out      |  122 +-
 .../tez/cross_product_check_1.q.out             |   20 +-
 .../tez/cross_product_check_2.q.out             |   88 +-
 .../test/results/clientpositive/tez/ctas.q.out  |    2 +
 .../tez/dynamic_partition_pruning.q.out         |  390 +-
 .../tez/dynamic_partition_pruning_2.q.out       |  126 +
 .../tez/dynpart_sort_optimization2.q.out        |  166 +-
 .../clientpositive/tez/explainuser_1.q.out      | 1713 +++--
 .../clientpositive/tez/explainuser_2.q.out      | 1053 ++-
 .../clientpositive/tez/explainuser_3.q.out      |  522 ++
 .../tez/filter_join_breaktask2.q.out            |    8 +-
 .../results/clientpositive/tez/groupby2.q.out   |   17 +-
 .../results/clientpositive/tez/having.q.out     |   28 +-
 .../tez/hybridgrace_hashjoin_2.q.out            |   20 +-
 .../clientpositive/tez/insert_into1.q.out       |   86 +-
 .../clientpositive/tez/insert_into2.q.out       |   82 +-
 .../clientpositive/tez/join_nullsafe.q.out      |   20 +-
 .../clientpositive/tez/limit_pushdown.q.out     |   31 +-
 .../clientpositive/tez/mapjoin_decimal.q.out    |   42 +-
 .../results/clientpositive/tez/mergejoin.q.out  |   12 +
 .../clientpositive/tez/metadataonly1.q.out      |   72 +-
 .../test/results/clientpositive/tez/mrr.q.out   | 2074 +++---
 .../clientpositive/tez/optimize_nullscan.q.out  |   72 +-
 .../results/clientpositive/tez/orc_merge1.q.out |    8 +-
 .../clientpositive/tez/script_env_var1.q.out    |    8 +-
 .../clientpositive/tez/selectDistinctStar.q.out |  108 +-
 .../results/clientpositive/tez/skewjoin.q.out   |   84 +-
 .../clientpositive/tez/stats_only_null.q.out    |  422 ++
 .../clientpositive/tez/subquery_exists.q.out    |    2 +
 .../results/clientpositive/tez/temp_table.q.out |   93 +-
 .../results/clientpositive/tez/tez_dml.q.out    | 2008 ++---
 .../results/clientpositive/tez/tez_join.q.out   |   28 +-
 .../clientpositive/tez/tez_join_hash.q.out      |  297 +-
 .../tez/tez_join_result_complex.q.out           | 2159 ++++++
 .../clientpositive/tez/tez_joins_explain.q.out  |    2 -
 .../clientpositive/tez/tez_multi_union.q.out    | 1002 +--
 .../tez/tez_schema_evolution.q.out              |   96 +-
 .../clientpositive/tez/tez_self_join.q.out      |  205 +
 .../results/clientpositive/tez/tez_smb_1.q.out  |  278 +
 .../clientpositive/tez/tez_smb_main.q.out       |   20 +
 .../results/clientpositive/tez/tez_union.q.out  |   81 +
 .../results/clientpositive/tez/tez_union2.q.out |   18 +
 .../tez/tez_union_dynamic_partition.q.out       |  148 +
 .../clientpositive/tez/tez_union_group_by.q.out |   51 +-
 .../tez/tez_union_multiinsert.q.out             |  126 +-
 .../results/clientpositive/tez/transform1.q.out |    8 +-
 .../results/clientpositive/tez/union2.q.out     |   10 +
 .../results/clientpositive/tez/union3.q.out     |   12 +
 .../results/clientpositive/tez/union4.q.out     |   12 +
 .../results/clientpositive/tez/union5.q.out     |   12 +-
 .../results/clientpositive/tez/union6.q.out     |   10 +
 .../results/clientpositive/tez/union7.q.out     |   12 +-
 .../results/clientpositive/tez/union8.q.out     |    9 +
 .../results/clientpositive/tez/union9.q.out     |   15 +
 .../clientpositive/tez/unionDistinct_1.q.out    |  817 ++-
 .../clientpositive/tez/unionDistinct_2.q.out    |   38 +-
 .../tez/update_after_multiple_inserts.q.out     |   12 +-
 .../tez/update_all_partitioned.q.out            |   14 +-
 .../clientpositive/tez/update_all_types.q.out   |   48 +-
 .../clientpositive/tez/update_orig_table.q.out  |   17 +-
 .../tez/update_where_partitioned.q.out          |   20 +-
 .../clientpositive/tez/vector_bucket.q.out      |   10 +-
 .../clientpositive/tez/vector_coalesce.q.out    |  400 +-
 .../tez/vector_count_distinct.q.out             |   29 +-
 .../clientpositive/tez/vector_data_types.q.out  |  116 +-
 .../clientpositive/tez/vector_date_1.q.out      |   20 +-
 .../tez/vector_decimal_expressions.q.out        |   99 +-
 .../tez/vector_groupby_reduce.q.out             |   10 +-
 .../tez/vector_grouping_sets.q.out              |  266 +
 .../clientpositive/tez/vector_interval_2.q.out  |   60 +-
 .../tez/vector_interval_mapjoin.q.out           |  281 +
 .../clientpositive/tez/vector_join30.q.out      | 1367 ++++
 .../tez/vector_join_filters.q.out               |  222 +
 .../clientpositive/tez/vector_join_nulls.q.out  |  195 +
 .../tez/vector_left_outer_join2.q.out           |   20 +-
 .../tez/vector_left_outer_join3.q.out           |  222 +
 .../tez/vector_leftsemi_mapjoin.q.out           | 1092 +--
 .../tez/vector_mr_diff_schema_alias.q.out       |   42 +-
 .../tez/vector_multi_insert.q.out               |   20 +-
 .../tez/vector_null_projection.q.out            |  178 +
 .../tez/vector_nullsafe_join.q.out              | 1210 +++
 .../clientpositive/tez/vector_outer_join1.q.out |  376 +-
 .../clientpositive/tez/vector_outer_join2.q.out |  122 +-
 .../clientpositive/tez/vector_outer_join3.q.out |  164 +-
 .../clientpositive/tez/vector_outer_join4.q.out | 1060 +--
 .../clientpositive/tez/vector_outer_join5.q.out | 1328 ++++
 .../tez/vector_partitioned_date_time.q.out      |   10 +-
 .../clientpositive/tez/vectorization_0.q.out    |    8 +-
 .../clientpositive/tez/vectorization_1.q.out    |    8 +-
 .../clientpositive/tez/vectorization_10.q.out   |  428 +-
 .../clientpositive/tez/vectorization_11.q.out   |   74 +-
 .../clientpositive/tez/vectorization_12.q.out   |  994 +--
 .../clientpositive/tez/vectorization_13.q.out   |  414 +-
 .../clientpositive/tez/vectorization_14.q.out   | 1170 +--
 .../clientpositive/tez/vectorization_15.q.out   |   58 +-
 .../clientpositive/tez/vectorization_17.q.out   |  507 ++
 .../clientpositive/tez/vectorization_2.q.out    |    8 +-
 .../clientpositive/tez/vectorization_3.q.out    |    8 +-
 .../clientpositive/tez/vectorization_4.q.out    |    8 +-
 .../clientpositive/tez/vectorization_5.q.out    |    8 +-
 .../clientpositive/tez/vectorization_6.q.out    | 3042 ++++----
 .../clientpositive/tez/vectorization_7.q.out    |  320 +-
 .../clientpositive/tez/vectorization_8.q.out    |  306 +-
 .../clientpositive/tez/vectorization_9.q.out    |  957 ++-
 .../tez/vectorization_limit.q.out               |   31 +-
 .../tez/vectorization_part_project.q.out        |   40 +-
 .../tez/vectorization_short_regress.q.out       | 1240 ++--
 .../clientpositive/tez/vectorized_casts.q.out   |   42 +-
 .../tez/vectorized_date_funcs.q.out             |  272 +-
 .../tez/vectorized_distinct_gby.q.out           |   56 +-
 .../vectorized_dynamic_partition_pruning.q.out  |  398 +-
 .../clientpositive/tez/vectorized_mapjoin.q.out |    8 +-
 .../tez/vectorized_nested_mapjoin.q.out         |    8 +-
 .../tez/vectorized_rcfile_columnar.q.out        |   24 +-
 .../tez/vectorized_shufflejoin.q.out            |   37 +-
 .../tez/vectorized_timestamp_funcs.q.out        |  396 +-
 .../tez/vectorized_timestamp_ints_casts.q.out   |  234 +
 .../tez_join_result_complex.q.out               | 1337 ++++
 .../clientpositive/timestamp_literal.q.out      |   12 +-
 .../results/clientpositive/transform1.q.out     |    8 +-
 .../results/clientpositive/type_widening.q.out  |    4 +-
 .../clientpositive/udaf_collect_set_2.q.out     |  742 ++
 .../udaf_percentile_approx_23.q.out             |   16 +-
 ql/src/test/results/clientpositive/udf5.q.out   |   30 +-
 .../results/clientpositive/udf_add_months.q.out |    4 +-
 .../clientpositive/udf_bitwise_shiftleft.q.out  |    4 +-
 .../clientpositive/udf_bitwise_shiftright.q.out |    4 +-
 .../udf_bitwise_shiftrightunsigned.q.out        |    4 +-
 .../test/results/clientpositive/udf_cbrt.q.out  |    4 +-
 .../test/results/clientpositive/udf_crc32.q.out |   60 +
 .../clientpositive/udf_current_database.q.out   |   16 +-
 .../clientpositive/udf_date_format.q.out        |    4 +-
 .../results/clientpositive/udf_decode.q.out     |    6 +-
 .../results/clientpositive/udf_factorial.q.out  |    4 +-
 .../clientpositive/udf_folder_constants.q.out   |  120 +
 .../clientpositive/udf_from_utc_timestamp.q.out |    4 +-
 .../results/clientpositive/udf_in_file.q.out    |   10 +-
 .../results/clientpositive/udf_last_day.q.out   |    4 +-
 .../results/clientpositive/udf_length.q.out     |    4 +-
 .../clientpositive/udf_levenshtein.q.out        |    4 +-
 .../test/results/clientpositive/udf_md5.q.out   |    4 +-
 .../clientpositive/udf_months_between.q.out     |    4 +-
 .../results/clientpositive/udf_quarter.q.out    |    4 +-
 .../test/results/clientpositive/udf_sha1.q.out  |   61 +
 .../test/results/clientpositive/udf_sha2.q.out  |  134 +
 .../results/clientpositive/udf_sort_array.q.out |   33 +
 .../results/clientpositive/udf_soundex.q.out    |    4 +-
 .../clientpositive/udf_substring_index.q.out    |  107 +
 .../clientpositive/udf_to_utc_timestamp.q.out   |    4 +-
 .../test/results/clientpositive/udf_trunc.q.out |   32 +-
 .../clientpositive/udf_unix_timestamp.q.out     |   32 +-
 .../results/clientpositive/udtf_stack.q.out     |    8 +-
 .../test/results/clientpositive/union10.q.out   |   12 +-
 .../test/results/clientpositive/union11.q.out   |   16 +-
 .../test/results/clientpositive/union12.q.out   |   12 +-
 .../test/results/clientpositive/union14.q.out   |   12 +-
 .../test/results/clientpositive/union15.q.out   |   16 +-
 .../test/results/clientpositive/union17.q.out   |   22 +-
 .../test/results/clientpositive/union18.q.out   |    8 +-
 .../test/results/clientpositive/union19.q.out   |   20 +-
 .../test/results/clientpositive/union20.q.out   |    4 +-
 .../test/results/clientpositive/union21.q.out   |   24 +-
 .../test/results/clientpositive/union22.q.out   |    7 +
 ql/src/test/results/clientpositive/union4.q.out |    8 +-
 ql/src/test/results/clientpositive/union5.q.out |   12 +-
 ql/src/test/results/clientpositive/union7.q.out |   12 +-
 .../clientpositive/unionDistinct_1.q.out        |  351 +-
 .../clientpositive/unionDistinct_2.q.out        |   42 +-
 .../results/clientpositive/union_remove_1.q.out |   24 +-
 .../clientpositive/union_remove_10.q.out        |   24 +-
 .../clientpositive/union_remove_11.q.out        |   30 +-
 .../clientpositive/union_remove_12.q.out        |   20 +-
 .../clientpositive/union_remove_13.q.out        |   28 +-
 .../clientpositive/union_remove_14.q.out        |   20 +-
 .../clientpositive/union_remove_15.q.out        |   28 +-
 .../clientpositive/union_remove_16.q.out        |   28 +-
 .../clientpositive/union_remove_17.q.out        |   20 +-
 .../clientpositive/union_remove_18.q.out        |   28 +-
 .../clientpositive/union_remove_19.q.out        |   56 +-
 .../results/clientpositive/union_remove_2.q.out |   24 +-
 .../clientpositive/union_remove_20.q.out        |   28 +-
 .../clientpositive/union_remove_21.q.out        |   24 +-
 .../clientpositive/union_remove_22.q.out        |   56 +-
 .../clientpositive/union_remove_23.q.out        |   34 +-
 .../clientpositive/union_remove_24.q.out        |   28 +-
 .../clientpositive/union_remove_25.q.out        |   24 +-
 .../results/clientpositive/union_remove_3.q.out |   30 +-
 .../results/clientpositive/union_remove_4.q.out |   24 +-
 .../results/clientpositive/union_remove_5.q.out |   24 +-
 .../results/clientpositive/union_remove_6.q.out |   32 +-
 .../clientpositive/union_remove_6_subq.q.out    |   32 +-
 .../results/clientpositive/union_remove_7.q.out |   24 +-
 .../results/clientpositive/union_remove_8.q.out |   24 +-
 .../results/clientpositive/union_remove_9.q.out |   32 +-
 .../results/clientpositive/union_view.q.out     |  216 +-
 .../update_after_multiple_inserts.q.out         |   12 +-
 .../clientpositive/update_all_partitioned.q.out |   14 +-
 .../clientpositive/update_all_types.q.out       |   48 +-
 .../clientpositive/update_orig_table.q.out      |   17 +-
 .../update_where_partitioned.q.out              |   20 +-
 .../results/clientpositive/vector_bucket.q.out  |   10 +-
 .../clientpositive/vector_coalesce.q.out        |  288 +-
 .../clientpositive/vector_data_types.q.out      |  116 +-
 .../results/clientpositive/vector_date_1.q.out  |   20 +-
 .../vector_decimal_expressions.q.out            |   73 +-
 .../clientpositive/vector_groupby_reduce.q.out  |   10 +-
 .../clientpositive/vector_grouping_sets.q.out   |  253 +
 .../clientpositive/vector_interval_2.q.out      |   60 +-
 .../vector_interval_mapjoin.q.out               |  281 +
 .../results/clientpositive/vector_join30.q.out  | 2218 ++++++
 .../clientpositive/vector_join_filters.q.out    |  222 +
 .../clientpositive/vector_join_nulls.q.out      |  195 +
 .../vector_left_outer_join2.q.out               |    8 +-
 .../vector_leftsemi_mapjoin.q.out               |   48 +-
 .../clientpositive/vector_mapjoin_reduce.q.out  |   12 +
 .../vector_mr_diff_schema_alias.q.out           |   42 +-
 .../clientpositive/vector_multi_insert.q.out    |    6 +-
 .../clientpositive/vector_null_projection.q.out |  167 +
 .../clientpositive/vector_nullsafe_join.q.out   | 1208 +++
 .../clientpositive/vector_outer_join1.q.out     |  368 +-
 .../clientpositive/vector_outer_join2.q.out     |  118 +-
 .../clientpositive/vector_outer_join3.q.out     |  152 +-
 .../clientpositive/vector_outer_join4.q.out     | 1052 +--
 .../clientpositive/vector_outer_join5.q.out     | 1300 ++++
 .../vector_partitioned_date_time.q.out          |   10 +-
 .../vector_partitioned_date_time_win.q.out      | 2036 ++++++
 .../clientpositive/vectorization_0.q.out        |    8 +-
 .../clientpositive/vectorization_1.q.out        |    8 +-
 .../clientpositive/vectorization_10.q.out       |  428 +-
 .../clientpositive/vectorization_11.q.out       |   74 +-
 .../clientpositive/vectorization_12.q.out       |  994 +--
 .../clientpositive/vectorization_13.q.out       |  414 +-
 .../clientpositive/vectorization_14.q.out       | 1170 +--
 .../clientpositive/vectorization_15.q.out       |   58 +-
 .../clientpositive/vectorization_17.q.out       |  500 ++
 .../clientpositive/vectorization_2.q.out        |    8 +-
 .../clientpositive/vectorization_3.q.out        |    8 +-
 .../clientpositive/vectorization_4.q.out        |    8 +-
 .../clientpositive/vectorization_5.q.out        |    8 +-
 .../clientpositive/vectorization_6.q.out        | 3042 ++++----
 .../clientpositive/vectorization_7.q.out        |  312 +-
 .../clientpositive/vectorization_8.q.out        |  298 +-
 .../clientpositive/vectorization_9.q.out        |  957 ++-
 .../vectorization_part_project.q.out            |   40 +-
 .../vectorization_short_regress.q.out           | 1240 ++--
 .../clientpositive/vectorized_casts.q.out       |   42 +-
 .../clientpositive/vectorized_date_funcs.q.out  |  272 +-
 .../vectorized_distinct_gby.q.out               |    4 +-
 .../clientpositive/vectorized_mapjoin.q.out     |    8 +-
 .../vectorized_nested_mapjoin.q.out             |    8 +-
 .../vectorized_rcfile_columnar.q.out            |   24 +-
 .../clientpositive/vectorized_shufflejoin.q.out |   44 +-
 .../vectorized_timestamp_funcs.q.out            |  396 +-
 .../test/results/clientpositive/windowing.q.out |    4 +-
 .../clientpositive/windowing_windowspec.q.out   |  108 -
 .../clientpositive/windowing_windowspec2.q.out  | 3084 ++++++++
 .../clientpositive/windowing_windowspec3.q.out  |  232 +
 serde/pom.xml                                   |    4 +-
 .../hadoop/hive/ql/io/sarg/SearchArgument.java  |    2 +-
 .../hive/serde2/ColumnProjectionUtils.java      |   29 +-
 .../hadoop/hive/serde2/NullStructSerDe.java     |    2 +-
 .../hive/serde2/io/HiveDecimalWritable.java     |    5 +-
 .../hive/serde2/io/HiveVarcharWritable.java     |    7 +-
 .../hive/serde2/io/TimestampWritable.java       |    2 +-
 .../hive/serde2/lazy/LazySerDeParameters.java   |   18 +
 .../MetadataListStructObjectInspector.java      |    2 +-
 .../ObjectInspectorConverters.java              |    5 +-
 .../objectinspector/ObjectInspectorUtils.java   |    6 +-
 .../AbstractPrimitiveObjectInspector.java       |    1 +
 .../PrimitiveObjectInspectorFactory.java        |    4 +-
 .../primitive/WritableVoidObjectInspector.java  |    5 +
 .../hive/serde2/typeinfo/CharTypeInfo.java      |    5 +-
 .../hive/serde2/typeinfo/DecimalTypeInfo.java   |    7 +-
 .../hive/serde2/typeinfo/PrimitiveTypeInfo.java |    5 +-
 .../hive/serde2/typeinfo/VarcharTypeInfo.java   |    5 +-
 .../apache/hadoop/hive/serde2/VerifyFast.java   |   10 +-
 .../hive/serde2/io/TestTimestampWritable.java   |    2 +-
 .../hive/serde2/lazy/TestLazySimpleSerDe.java   |    9 +-
 service/pom.xml                                 |    2 +-
 .../org/apache/hive/service/CookieSigner.java   |   18 +
 .../apache/hive/service/auth/HttpAuthUtils.java |    2 +-
 .../auth/LdapAuthenticationProviderImpl.java    |  460 +-
 .../service/auth/TSetIpAddressProcessor.java    |    4 +-
 .../org/apache/hive/service/cli/CLIService.java |   13 -
 .../apache/hive/service/cli/ColumnValue.java    |    2 +
 .../java/org/apache/hive/service/cli/Type.java  |    2 +-
 .../cli/operation/GetCatalogsOperation.java     |   12 +-
 .../cli/operation/GetColumnsOperation.java      |   34 +
 .../cli/operation/GetFunctionsOperation.java    |   25 +
 .../cli/operation/GetSchemasOperation.java      |   13 +
 .../cli/operation/GetTableTypesOperation.java   |    4 +
 .../cli/operation/GetTablesOperation.java       |   10 +
 .../cli/operation/GetTypeInfoOperation.java     |    4 +
 .../cli/operation/MetadataOperation.java        |   35 +
 .../service/cli/operation/OperationManager.java |   13 +-
 .../service/cli/operation/SQLOperation.java     |   16 +-
 .../hive/service/cli/session/HiveSession.java   |   12 +-
 .../service/cli/session/HiveSessionImpl.java    |   30 +-
 .../cli/session/HiveSessionImplwithUGI.java     |   21 -
 .../service/cli/session/SessionManager.java     |    6 +-
 .../service/cli/thrift/ThriftCLIService.java    |    4 +
 .../service/cli/thrift/ThriftHttpServlet.java   |   20 +-
 .../apache/hive/service/server/HiveServer2.java |   28 +-
 .../TestLdapAuthenticationProviderImpl.java     |   18 +
 shims/0.20S/pom.xml                             |    2 +-
 .../hadoop/hive/shims/Hadoop20SShims.java       |    5 -
 .../apache/hadoop/mapred/WebHCatJTShim20S.java  |   10 +
 shims/0.23/pom.xml                              |    2 +-
 .../apache/hadoop/hive/shims/Hadoop23Shims.java |   22 +-
 .../apache/hadoop/mapred/WebHCatJTShim23.java   |   18 +-
 shims/aggregator/pom.xml                        |    2 +-
 shims/common/pom.xml                            |    2 +-
 .../apache/hadoop/hive/shims/HadoopShims.java   |    7 +-
 .../hive/thrift/HadoopThriftAuthBridge.java     |    6 +-
 shims/pom.xml                                   |    2 +-
 shims/scheduler/pom.xml                         |    2 +-
 spark-client/pom.xml                            |    4 +-
 .../apache/hive/spark/client/JobContext.java    |    2 +-
 .../hive/spark/client/JobContextImpl.java       |    7 +-
 .../hive/spark/client/SparkClientImpl.java      |    5 +-
 .../hive/spark/client/SparkClientUtilities.java |   13 +-
 .../apache/hive/spark/client/rpc/RpcServer.java |   18 +
 testutils/metastore/dbs/derby/execute.sh        |   37 +
 testutils/metastore/dbs/derby/prepare.sh        |   63 +
 testutils/metastore/dbs/postgres/execute.sh     |   29 +
 testutils/metastore/dbs/postgres/prepare.sh     |   72 +
 testutils/pom.xml                               |    2 +-
 .../org/apache/hive/ptest/execution/PTest.java  |   12 +-
 .../ptest/execution/conf/TestConfiguration.java |   12 +-
 .../execution/conf/TestTestConfiguration.java   |   38 +-
 .../resources/test-configuration.properties     |    2 +
 1727 files changed, 103421 insertions(+), 39461 deletions(-)
----------------------------------------------------------------------