You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2018/10/26 21:12:25 UTC

[75/75] [abbrv] hive git commit: HIVE-20605 : Merge branch 'master' into master-tez092

HIVE-20605 : Merge branch 'master' into master-tez092


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

Branch: refs/heads/master-tez092
Commit: c55347d5283fc89ed073f30f61ec87e3092ca2ce
Parents: 8151911 1002e89
Author: sergey <se...@apache.org>
Authored: Fri Oct 26 14:10:20 2018 -0700
Committer: sergey <se...@apache.org>
Committed: Fri Oct 26 14:10:20 2018 -0700

----------------------------------------------------------------------
 .../positive/accumulo_predicate_pushdown.q.out  |    40 +
 .../results/positive/accumulo_queries.q.out     |    22 +
 .../accumulo_single_sourced_multi_insert.q.out  |     6 +
 .../java/org/apache/hive/beeline/BeeLine.java   |    57 +-
 .../org/apache/hive/beeline/BeeLineOpts.java    |    10 +
 beeline/src/main/resources/BeeLine.properties   |     1 +
 .../org/apache/hadoop/hive/cli/CliDriver.java   |     6 +
 .../hadoop/hive/cli/TestCliDriverMethods.java   |     3 +
 .../hadoop/hive/common/GcTimeMonitor.java       |   261 +
 .../org/apache/hadoop/hive/common/LogUtils.java |    25 +
 .../org/apache/hadoop/hive/conf/Constants.java  |    20 +-
 .../org/apache/hadoop/hive/conf/HiveConf.java   |    95 +-
 .../hive/contrib/serde2/MultiDelimitSerDe.java  |   308 -
 .../results/clientnegative/serde_regex.q.out    |     4 +
 .../test/results/clientpositive/dboutput.q.out  |     8 +
 .../clientpositive/fileformat_base64.q.out      |     4 +
 .../results/clientpositive/serde_regex.q.out    |     4 +
 .../clientpositive/serde_typedbytes.q.out       |     4 +
 .../clientpositive/serde_typedbytes2.q.out      |     4 +
 .../clientpositive/serde_typedbytes3.q.out      |     4 +
 .../clientpositive/serde_typedbytes4.q.out      |     4 +
 .../clientpositive/serde_typedbytes5.q.out      |     4 +
 .../clientpositive/udaf_example_avg.q.out       |     4 +
 .../udaf_example_group_concat.q.out             |     4 +
 .../clientpositive/udaf_example_max.q.out       |     4 +
 .../clientpositive/udaf_example_max_n.q.out     |     4 +
 .../clientpositive/udaf_example_min.q.out       |     4 +
 .../clientpositive/udaf_example_min_n.q.out     |     4 +
 .../clientpositive/udf_example_add.q.out        |     4 +
 .../udf_example_arraymapstruct.q.out            |     4 +
 .../clientpositive/udf_example_format.q.out     |     4 +
 .../clientpositive/udf_row_sequence.q.out       |     4 +
 .../vector_udf_example_arraymapstruct.q.out     |     4 +
 data/conf/hive-site.xml                         |    10 +
 data/conf/perf-reg/spark/hive-site.xml          |     7 +-
 data/conf/perf-reg/tez/hive-site.xml            |    17 +-
 data/conf/spark/standalone/hive-site.xml        |     7 +-
 data/files/exported_table/_metadata             |     2 +-
 ...307-b382b8c7-271c-4025-be64-4a68f4db32e5_0_0 |   Bin 0 -> 501 bytes
 ...307-b382b8c7-271c-4025-be64-4a68f4db32e5_1_0 |   Bin 0 -> 465 bytes
 data/files/test.jceks                           |   Bin 0 -> 988 bytes
 data/scripts/q_perf_test_init.sql               |    96 +-
 data/scripts/q_perf_test_init_constraints.sql   |   771 +
 .../hadoop/hive/druid/DruidStorageHandler.java  |     1 +
 .../hive/druid/DruidStorageHandlerUtils.java    |     7 +-
 .../druid/io/DruidQueryBasedInputFormat.java    |    31 +-
 .../hadoop/hive/druid/serde/DruidSerDe.java     |     8 +-
 .../TestHiveDruidQueryBasedInputFormat.java     |     8 +-
 .../hadoop/hive/druid/serde/TestDruidSerDe.java |    34 +
 hbase-handler/pom.xml                           |    12 +-
 .../hive/hbase/HiveHBaseTableOutputFormat.java  |    64 +-
 .../hbase/TestHiveHBaseTableOutputFormat.java   |    38 +
 .../results/positive/external_table_ppd.q.out   |     4 +
 .../results/positive/hbase_custom_key2.q.out    |    12 +
 .../results/positive/hbase_custom_key3.q.out    |    16 +
 .../src/test/results/positive/hbase_ddl.q.out   |     4 +
 .../results/positive/hbase_ppd_key_range.q.out  |    40 +
 .../test/results/positive/hbase_pushdown.q.out  |    36 +
 .../test/results/positive/hbase_queries.q.out   |    22 +
 .../hbase_single_sourced_multi_insert.q.out     |     6 +
 .../test/results/positive/hbase_timestamp.q.out |    16 +
 .../src/test/results/positive/hbasestats.q.out  |    12 +
 .../test/results/positive/ppd_key_ranges.q.out  |    16 +
 .../listener/DbNotificationListener.java        |   353 +-
 .../json/JSONCreateFunctionMessage.java         |     3 +-
 .../messaging/json/JSONDropFunctionMessage.java |     3 +-
 .../messaging/json/JSONMessageFactory.java      |    39 +-
 hcatalog/webhcat/svr/pom.xml                    |    10 +-
 .../listener/DummyRawStoreFailEvent.java        |     9 +
 .../listener/TestDbNotificationListener.java    |   159 +-
 .../test/results/clientpositive/explain.q.out   |     4 +
 .../insert_into_dynamic_partitions.q.out        |   129 +-
 .../clientpositive/insert_into_table.q.out      |     4 +
 .../insert_overwrite_directory.q.out            |    10 +
 .../insert_overwrite_dynamic_partitions.q.out   |   129 +-
 .../clientpositive/insert_overwrite_table.q.out |     4 +
 .../clientpositive/orc_format_part.q.out        |    14 +-
 .../orc_nonstd_partitions_loc.q.out             |     8 +-
 .../clientpositive/parquet_format_part.q.out    |    14 +-
 .../parquet_nonstd_partitions_loc.q.out         |     8 +-
 .../clientpositive/rcfile_format_part.q.out     |    14 +-
 .../rcfile_nonstd_partitions_loc.q.out          |     6 +-
 .../write_final_output_blobstore.q.out          |     8 +
 .../apache/hadoop/hive/ql/TestAcidOnTez.java    |    45 +
 .../hadoop/hive/ql/TestLocationQueries.java     |     6 +-
 .../apache/hadoop/hive/ql/TestMTQueries.java    |     2 +-
 .../ql/exec/spark/TestSparkSessionTimeout.java  |    45 +-
 .../TestReplAcidTablesWithJsonMessage.java      |    43 +
 ...eplAcrossInstancesWithJsonMessageFormat.java |    45 +
 ...ncrementalLoadAcidTablesWithJsonMessage.java |    46 +
 .../ql/parse/TestReplWithJsonMessageFormat.java |    39 +
 .../hive/ql/parse/TestReplicationScenarios.java |   184 +-
 .../TestReplicationScenariosAcidTables.java     |    67 +-
 ...TestReplicationScenariosAcrossInstances.java |   195 +-
 ...ationScenariosIncrementalLoadAcidTables.java |    55 +-
 .../hadoop/hive/ql/parse/WarehouseInstance.java |    19 +-
 .../TestAuthorizationPreEventListener.java      |     3 +
 .../TestMetastoreAuthorizationProvider.java     |     3 +
 .../hive/ql/txn/compactor/TestCompactor.java    |    10 +-
 .../hive/jdbc/TestJdbcWithMiniLlapArrow.java    |   157 +-
 .../jdbc/TestTriggersTezSessionPoolManager.java |     4 +
 .../miniHS2/TestHs2ConnectionMetricsBinary.java |     7 +
 .../miniHS2/TestHs2ConnectionMetricsHttp.java   |     8 +-
 .../service/cli/session/TestQueryDisplay.java   |    83 +
 .../thrift/TestThriftCLIServiceSecurity.java    |    44 +
 itests/qtest-druid/pom.xml                      |     7 +-
 .../hadoop/hive/cli/TestTezPerfCliDriver.java   |     2 +-
 .../cli/TestTezPerfConstraintsCliDriver.java    |    73 +
 .../test/resources/testconfiguration.properties |   116 +-
 .../hadoop/hive/accumulo/AccumuloQTestUtil.java |    16 +-
 .../hadoop/hive/accumulo/AccumuloTestSetup.java |    21 +-
 .../control/AbstractCoreBlobstoreCliDriver.java |    17 +-
 .../hadoop/hive/cli/control/CliConfigs.java     |    22 +-
 .../hive/cli/control/CoreAccumuloCliDriver.java |    25 +-
 .../cli/control/CoreBlobstoreCliDriver.java     |     2 +-
 .../control/CoreBlobstoreNegativeCliDriver.java |     2 +-
 .../hadoop/hive/cli/control/CoreCliDriver.java  |    23 +-
 .../hive/cli/control/CoreCompareCliDriver.java  |    20 +-
 .../hadoop/hive/cli/control/CoreDummy.java      |     4 +-
 .../hive/cli/control/CoreHBaseCliDriver.java    |     7 +-
 .../cli/control/CoreHBaseNegativeCliDriver.java |     6 +-
 .../hive/cli/control/CoreNegativeCliDriver.java |    24 +-
 .../hive/cli/control/CorePerfCliDriver.java     |    20 +-
 .../hadoop/hive/hbase/HBaseQTestUtil.java       |    11 +-
 .../hadoop/hive/hbase/HBaseTestSetup.java       |     1 +
 .../apache/hadoop/hive/ql/QTestArguments.java   |    55 +-
 .../org/apache/hadoop/hive/ql/QTestUtil.java    |   176 +-
 .../hadoop/hive/ql/parse/CoreParseNegative.java |    25 +-
 jdbc-handler/pom.xml                            |    14 +
 .../hive/storage/jdbc/JdbcInputFormat.java      |   117 +-
 .../hive/storage/jdbc/JdbcInputSplit.java       |    73 +-
 .../hive/storage/jdbc/JdbcRecordReader.java     |     3 +-
 .../org/apache/hive/storage/jdbc/JdbcSerDe.java |   187 +-
 .../storage/jdbc/conf/JdbcStorageConfig.java    |    25 +-
 .../jdbc/conf/JdbcStorageConfigManager.java     |    55 +-
 .../hive/storage/jdbc/dao/DatabaseAccessor.java |    10 +-
 .../jdbc/dao/GenericJdbcDatabaseAccessor.java   |   184 +-
 .../storage/jdbc/dao/JdbcRecordIterator.java    |   129 +-
 .../jdbc/dao/JethroDatabaseAccessor.java        |     3 +-
 .../storage/jdbc/dao/MySqlDatabaseAccessor.java |    16 +-
 .../jdbc/spitter/DateIntervalSplitter.java      |    42 +
 .../jdbc/spitter/DecimalIntervalSplitter.java   |    50 +
 .../jdbc/spitter/DoubleIntervalSplitter.java    |    41 +
 .../storage/jdbc/spitter/IntervalSplitter.java  |    24 +
 .../jdbc/spitter/IntervalSplitterFactory.java   |    45 +
 .../jdbc/spitter/LongIntervalSpitter.java       |    42 +
 .../jdbc/spitter/TimestampIntervalSplitter.java |    43 +
 .../hive/storage/jdbc/TestJdbcInputFormat.java  |   219 +-
 .../dao/TestGenericJdbcDatabaseAccessor.java    |    18 +-
 .../org/apache/hive/jdbc/HiveConnection.java    |    92 +-
 .../apache/hive/jdbc/HiveQueryResultSet.java    |    11 +-
 .../jdbc/HttpKerberosRequestInterceptor.java    |    23 +-
 jdbc/src/java/org/apache/hive/jdbc/Utils.java   |     2 +-
 kafka-handler/README.md                         |   217 +
 kafka-handler/pom.xml                           |    28 +-
 .../hadoop/hive/kafka/GenericKafkaSerDe.java    |   162 -
 .../hadoop/hive/kafka/HiveKafkaProducer.java    |   256 +
 .../hadoop/hive/kafka/KafkaInputFormat.java     |   208 +
 .../hadoop/hive/kafka/KafkaInputSplit.java      |   209 +
 .../hadoop/hive/kafka/KafkaJsonSerDe.java       |    15 +-
 .../hadoop/hive/kafka/KafkaOutputFormat.java    |   109 +
 .../hive/kafka/KafkaPullerInputFormat.java      |   205 -
 .../hive/kafka/KafkaPullerInputSplit.java       |   213 -
 .../hive/kafka/KafkaPullerRecordReader.java     |   173 -
 .../hadoop/hive/kafka/KafkaRecordIterator.java  |    75 +-
 .../hadoop/hive/kafka/KafkaRecordReader.java    |   169 +
 .../hadoop/hive/kafka/KafkaRecordWritable.java  |   209 -
 .../hadoop/hive/kafka/KafkaScanTrimmer.java     |    83 +-
 .../apache/hadoop/hive/kafka/KafkaSerDe.java    |   380 +
 .../hadoop/hive/kafka/KafkaStorageHandler.java  |   320 +-
 .../hadoop/hive/kafka/KafkaStreamingUtils.java  |   255 -
 .../hadoop/hive/kafka/KafkaTableProperties.java |    84 +
 .../apache/hadoop/hive/kafka/KafkaUtils.java    |   303 +
 .../apache/hadoop/hive/kafka/KafkaWritable.java |   177 +
 .../hadoop/hive/kafka/MetadataColumn.java       |   110 +
 .../apache/hadoop/hive/kafka/RetryUtils.java    |   154 +
 .../hadoop/hive/kafka/SimpleKafkaWriter.java    |   170 +
 .../hive/kafka/TransactionalKafkaWriter.java    |   363 +
 .../hive/kafka/HiveKafkaProducerTest.java       |   179 +
 .../hadoop/hive/kafka/KafkaBrokerResource.java  |   100 +
 .../hadoop/hive/kafka/KafkaInputSplitTest.java  |   126 +
 .../hive/kafka/KafkaPullerInputSplitTest.java   |   131 -
 .../hive/kafka/KafkaRecordIteratorTest.java     |   249 +-
 .../hive/kafka/KafkaRecordWritableTest.java     |    84 -
 .../hadoop/hive/kafka/KafkaScanTrimmerTest.java |    46 +-
 .../hive/kafka/KafkaStorageHandlerTest.java     |   145 +
 .../hive/kafka/KafkaStreamingUtilsTest.java     |   108 -
 .../hadoop/hive/kafka/KafkaUtilsTest.java       |   120 +
 .../hadoop/hive/kafka/KafkaWritableTest.java    |    85 +
 .../hive/kafka/SimpleKafkaWriterTest.java       |   182 +
 .../kafka/TransactionalKafkaWriterTest.java     |   246 +
 .../org/apache/hadoop/hive/llap/LlapUtil.java   |    17 +
 .../hive/llap/counters/LlapIOCounters.java      |     4 +-
 .../hadoop/hive/llap/cache/BuddyAllocator.java  |    45 +-
 .../hive/llap/cache/LowLevelCacheCounters.java  |     3 +-
 .../llap/cli/LlapStatusOptionsProcessor.java    |    26 +-
 .../hive/llap/cli/LlapStatusServiceDriver.java  |   426 +-
 .../llap/counters/QueryFragmentCounters.java    |    10 +-
 .../daemon/impl/StatsRecordingThreadPool.java   |    42 +-
 .../hive/llap/io/api/impl/LlapRecordReader.java |    63 +-
 .../llap/io/decode/EncodedDataConsumer.java     |    43 +-
 .../llap/io/decode/OrcEncodedDataConsumer.java  |     6 +-
 .../llap/io/encoded/OrcEncodedDataReader.java   |    18 +-
 .../llap/io/encoded/SerDeEncodedDataReader.java |     9 +-
 .../hive/llap/cache/TestBuddyAllocator.java     |    17 +-
 .../cache/TestBuddyAllocatorForceEvict.java     |     4 +-
 .../hive/llap/cache/TestOrcMetadataCache.java   |     4 +-
 .../llap/cli/TestLlapStatusServiceDriver.java   |    98 +
 .../tezplugins/LlapTaskSchedulerService.java    |     7 +-
 pom.xml                                         |    14 +-
 ql/pom.xml                                      |    13 +
 .../metastore/SynchronizedMetaStoreClient.java  |     4 +
 .../java/org/apache/hadoop/hive/ql/Context.java |     9 +
 .../java/org/apache/hadoop/hive/ql/Driver.java  |   139 +-
 .../java/org/apache/hadoop/hive/ql/IDriver.java |     2 +
 .../org/apache/hadoop/hive/ql/MapRedStats.java  |    12 +-
 .../org/apache/hadoop/hive/ql/QueryDisplay.java |    82 +
 .../org/apache/hadoop/hive/ql/QueryInfo.java    |    10 +
 .../org/apache/hadoop/hive/ql/QueryState.java   |    23 +-
 .../ql/cache/results/QueryResultsCache.java     |    14 +-
 .../org/apache/hadoop/hive/ql/exec/DDLTask.java |     8 +-
 .../ql/exec/DefaultMemoryExhaustionChecker.java |    45 +
 .../apache/hadoop/hive/ql/exec/ExplainTask.java |    21 +-
 .../hadoop/hive/ql/exec/FileSinkOperator.java   |    12 +-
 .../hadoop/hive/ql/exec/FunctionRegistry.java   |    12 +-
 .../hive/ql/exec/HashTableSinkOperator.java     |     9 +-
 .../hadoop/hive/ql/exec/MapJoinOperator.java    |    11 +-
 .../apache/hadoop/hive/ql/exec/MapOperator.java |    10 +-
 .../hive/ql/exec/MemoryExhaustionChecker.java   |    28 +
 .../ql/exec/MemoryExhaustionCheckerFactory.java |    39 +
 .../apache/hadoop/hive/ql/exec/MemoryInfo.java  |   114 +
 .../hadoop/hive/ql/exec/OperatorUtils.java      |    91 +
 .../ql/exec/SparkMemoryExhaustionChecker.java   |    91 +
 .../apache/hadoop/hive/ql/exec/Utilities.java   |    80 +-
 .../hadoop/hive/ql/exec/mr/ExecMapper.java      |     6 +
 .../hadoop/hive/ql/exec/mr/ExecReducer.java     |     9 +-
 .../hive/ql/exec/mr/HadoopJobExecHelper.java    |    34 +-
 .../hadoop/hive/ql/exec/mr/MapRedTask.java      |    16 +
 .../hadoop/hive/ql/exec/repl/ReplDumpTask.java  |    78 +-
 .../hadoop/hive/ql/exec/repl/ReplLoadTask.java  |     9 +
 .../hadoop/hive/ql/exec/repl/ReplLoadWork.java  |     9 +-
 .../filesystem/DatabaseEventsIterator.java      |    49 +-
 .../repl/bootstrap/load/LoadConstraint.java     |     4 +-
 .../bootstrap/load/table/LoadPartitions.java    |    17 +-
 .../repl/bootstrap/load/table/LoadTable.java    |     2 +-
 .../IncrementalLoadEventsIterator.java          |     4 +-
 .../IncrementalLoadTasksBuilder.java            |    20 +-
 .../ql/exec/spark/LocalHiveSparkClient.java     |    38 +-
 .../ql/exec/spark/RemoteHiveSparkClient.java    |     4 +-
 .../ql/exec/spark/SparkMapRecordHandler.java    |     6 +
 .../ql/exec/spark/SparkReduceRecordHandler.java |    38 +-
 .../hive/ql/exec/spark/SparkUtilities.java      |     1 +
 .../ql/exec/spark/session/SparkSessionImpl.java |    88 +-
 .../spark/session/SparkSessionManagerImpl.java  |     1 +
 .../hadoop/hive/ql/exec/tez/DagUtils.java       |     8 +-
 .../ql/exec/tez/KillTriggerActionHandler.java   |     8 +-
 .../hive/ql/exec/tez/MapRecordProcessor.java    |     7 +
 .../hive/ql/exec/tez/ReduceRecordSource.java    |     9 +-
 .../hive/ql/exec/tez/WorkloadManager.java       |     3 +
 .../ql/exec/vector/VectorGroupByOperator.java   |    24 +-
 .../ql/exec/vector/VectorizationContext.java    |   116 +-
 .../vector/expressions/BucketNumExpression.java |    21 +-
 .../expressions/CastTimestampToString.java      |    10 +-
 .../VectorReduceSinkObjectHashOperator.java     |    32 +-
 .../apache/hadoop/hive/ql/hooks/ATSHook.java    |     3 +-
 .../hive/ql/hooks/EnforceReadOnlyTables.java    |     7 +-
 .../hive/ql/hooks/HiveProtoLoggingHook.java     |    71 +-
 .../org/apache/hadoop/hive/ql/io/AcidUtils.java |    47 +-
 .../org/apache/hadoop/hive/ql/io/HdfsUtils.java |     4 +-
 .../hadoop/hive/ql/io/HiveInputFormat.java      |     1 +
 .../hadoop/hive/ql/io/RecordIdentifier.java     |    17 +-
 .../hadoop/hive/ql/io/arrow/Serializer.java     |    33 +-
 .../apache/hadoop/hive/ql/io/orc/OrcFile.java   |    48 +-
 .../hadoop/hive/ql/io/orc/OrcInputFormat.java   |    36 +-
 .../hadoop/hive/ql/io/orc/OrcOutputFormat.java  |     9 +-
 .../hive/ql/io/orc/OrcRawRecordMerger.java      |    88 +-
 .../hadoop/hive/ql/io/orc/OrcRecordUpdater.java |     2 +-
 .../apache/hadoop/hive/ql/io/orc/OrcSplit.java  |    59 +-
 .../io/orc/VectorizedOrcAcidRowBatchReader.java |   756 +-
 .../vector/VectorizedParquetRecordReader.java   |     3 +-
 .../apache/hadoop/hive/ql/lock/CompileLock.java |   137 +
 .../hadoop/hive/ql/lock/CompileLockFactory.java |   125 +
 .../hadoop/hive/ql/lockmgr/DbTxnManager.java    |     2 +-
 .../apache/hadoop/hive/ql/metadata/Hive.java    |   555 +-
 .../metadata/HiveMaterializedViewsRegistry.java |    36 +-
 .../ql/metadata/SessionHiveMetaStoreClient.java |    54 +-
 .../hive/ql/metadata/events/EventUtils.java     |    16 +-
 .../hive/ql/optimizer/ConvertJoinMapJoin.java   |    43 +-
 .../hadoop/hive/ql/optimizer/Optimizer.java     |     7 +-
 .../hive/ql/optimizer/SharedWorkOptimizer.java  |    62 +
 .../optimizer/SortedDynPartitionOptimizer.java  |   117 +-
 .../calcite/HiveDefaultRelMetadataProvider.java |     2 +
 .../ql/optimizer/calcite/HiveRelOptUtil.java    |   238 +
 .../optimizer/calcite/HiveRexExecutorImpl.java  |     3 +-
 .../ql/optimizer/calcite/RelOptHiveTable.java   |    49 +-
 .../calcite/cost/HiveAlgorithmsUtil.java        |    30 +-
 .../calcite/cost/HiveOnTezCostModel.java        |    12 +-
 .../optimizer/calcite/reloperators/HiveIn.java  |    27 +
 .../reloperators/jdbc/HiveJdbcConverter.java    |   121 +-
 .../rules/HiveAggregateJoinTransposeRule.java   |     2 +-
 .../calcite/rules/HiveJoinConstraintsRule.java  |   228 +-
 .../rules/HiveJoinProjectTransposeRule.java     |     3 +-
 .../rules/HivePointLookupOptimizerRule.java     |    46 +-
 .../calcite/rules/HivePreFilteringRule.java     |    40 +-
 .../calcite/rules/HiveRelFieldTrimmer.java      |   269 +-
 .../calcite/rules/jdbc/HiveJdbcImplementor.java |    60 +
 .../rules/jdbc/JDBCJoinPushDownRule.java        |    57 +-
 .../rules/jdbc/JDBCUnionPushDownRule.java       |    32 +-
 .../calcite/stats/EstimateUniqueKeys.java       |   333 +
 .../stats/FilterSelectivityEstimator.java       |    33 +-
 .../stats/HiveRelMdColumnUniqueness.java        |    63 +
 .../calcite/stats/HiveRelMdRowCount.java        |     7 +-
 .../calcite/stats/HiveRelMdUniqueKeys.java      |   152 +-
 .../calcite/translator/ASTBuilder.java          |    28 +-
 .../calcite/translator/RexNodeConverter.java    |    39 +-
 .../translator/SqlFunctionConverter.java        |    29 +-
 .../physical/LlapClusterStateForCompile.java    |    12 +
 .../hive/ql/optimizer/physical/Vectorizer.java  |    33 +-
 .../ppr/PartitionExpressionForMetastore.java    |    13 +-
 .../stats/annotation/StatsRulesProcFactory.java |   129 +-
 .../hive/ql/parse/BaseSemanticAnalyzer.java     |    85 +-
 .../hadoop/hive/ql/parse/CalcitePlanner.java    |    57 +-
 .../ql/parse/ColumnStatsAutoGatherContext.java  |     2 +-
 .../hive/ql/parse/DDLSemanticAnalyzer.java      |     9 +-
 .../hive/ql/parse/ExplainConfiguration.java     |    18 +
 .../hive/ql/parse/ExplainSemanticAnalyzer.java  |    14 +-
 .../org/apache/hadoop/hive/ql/parse/HiveLexer.g |     1 +
 .../apache/hadoop/hive/ql/parse/HiveParser.g    |     5 +-
 .../hadoop/hive/ql/parse/IdentifiersParser.g    |     2 +-
 .../hive/ql/parse/ImportSemanticAnalyzer.java   |    13 +
 .../hive/ql/parse/LoadSemanticAnalyzer.java     |     6 +
 .../hadoop/hive/ql/parse/MapReduceCompiler.java |    13 +
 .../apache/hadoop/hive/ql/parse/ParseUtils.java |    28 +
 .../ql/parse/ReplicationSemanticAnalyzer.java   |    35 +-
 .../hadoop/hive/ql/parse/SemanticAnalyzer.java  |   124 +-
 .../hadoop/hive/ql/parse/TezCompiler.java       |    24 +
 .../ql/parse/UpdateDeleteSemanticAnalyzer.java  |    88 +-
 .../hadoop/hive/ql/parse/repl/CopyUtils.java    |    12 +-
 .../parse/repl/dump/events/AbortTxnHandler.java |    12 +-
 .../events/AbstractConstraintEventHandler.java  |     3 +-
 .../repl/dump/events/AbstractEventHandler.java  |    32 +-
 .../repl/dump/events/AddForeignKeyHandler.java  |    12 +-
 .../events/AddNotNullConstraintHandler.java     |    12 +-
 .../repl/dump/events/AddPartitionHandler.java   |    10 +-
 .../repl/dump/events/AddPrimaryKeyHandler.java  |    12 +-
 .../dump/events/AddUniqueConstraintHandler.java |    13 +-
 .../repl/dump/events/AllocWriteIdHandler.java   |    12 +-
 .../repl/dump/events/AlterDatabaseHandler.java  |    12 +-
 .../repl/dump/events/AlterPartitionHandler.java |    21 +-
 .../repl/dump/events/AlterTableHandler.java     |    18 +-
 .../repl/dump/events/CommitTxnHandler.java      |    28 +-
 .../repl/dump/events/CreateDatabaseHandler.java |    13 +-
 .../repl/dump/events/CreateFunctionHandler.java |    13 +-
 .../repl/dump/events/CreateTableHandler.java    |    15 +-
 .../parse/repl/dump/events/DefaultHandler.java  |     9 +
 .../repl/dump/events/DropConstraintHandler.java |    13 +-
 .../repl/dump/events/DropDatabaseHandler.java   |    12 +-
 .../repl/dump/events/DropFunctionHandler.java   |    12 +-
 .../repl/dump/events/DropPartitionHandler.java  |    12 +-
 .../repl/dump/events/DropTableHandler.java      |    12 +-
 .../repl/dump/events/EventHandlerFactory.java   |    44 +-
 .../parse/repl/dump/events/InsertHandler.java   |    22 +-
 .../parse/repl/dump/events/OpenTxnHandler.java  |    12 +-
 .../repl/dump/io/ConstraintsSerializer.java     |    10 +-
 .../load/message/AbstractMessageHandler.java    |     4 +-
 .../apache/hadoop/hive/ql/plan/ExplainWork.java |    17 +-
 .../hadoop/hive/ql/plan/ExprNodeDescUtils.java  |    34 +-
 .../hadoop/hive/ql/plan/LoadTableDesc.java      |     4 +-
 .../apache/hadoop/hive/ql/plan/MapJoinDesc.java |    26 +
 .../org/apache/hadoop/hive/ql/plan/MapWork.java |     2 +-
 .../apache/hadoop/hive/ql/plan/PlanUtils.java   |     9 +
 .../apache/hadoop/hive/ql/plan/TableDesc.java   |     2 +
 .../hadoop/hive/ql/plan/VectorMapJoinDesc.java  |    14 +
 .../hive/ql/ppd/SyntheticJoinPredicate.java     |    17 +-
 .../hadoop/hive/ql/reexec/ReExecDriver.java     |     5 +
 .../plugin/SettableConfigUpdater.java           |     2 +-
 .../plugin/fallback/FallbackHiveAuthorizer.java |   253 +
 .../fallback/FallbackHiveAuthorizerFactory.java |    36 +
 .../hadoop/hive/ql/session/SessionState.java    |     4 +-
 .../hive/ql/txn/compactor/CompactorMR.java      |    11 +-
 .../generic/GenericUDAFApproximateDistinct.java |   237 +
 .../ql/udf/generic/GenericUDAFComputeStats.java |     1 +
 .../generic/GenericUDFCardinalityViolation.java |    19 +-
 .../ql/udf/generic/GenericUDFOPDTIMinus.java    |   110 +-
 .../ql/udf/generic/GenericUDFOPDTIPlus.java     |    94 +-
 .../ql/udf/generic/GenericUDFSurrogateKey.java  |   137 +
 .../ql/udf/generic/GenericUDFTumbledWindow.java |   139 +
 .../ql/udf/generic/GenericUDTFGetSplits.java    |    29 +-
 .../hadoop/hive/ql/util/DateTimeMath.java       |    18 +-
 .../hive/metastore/TestMetastoreExpr.java       |    10 +-
 .../apache/hadoop/hive/ql/CompileLockTest.java  |   329 +
 .../apache/hadoop/hive/ql/TestTxnCommands.java  |     9 +
 .../apache/hadoop/hive/ql/TestTxnCommands2.java |     5 +-
 .../apache/hadoop/hive/ql/TestTxnCommands3.java |   286 +
 .../hadoop/hive/ql/TestTxnConcatenate.java      |    63 -
 .../apache/hadoop/hive/ql/TestTxnLoadData.java  |     6 +
 .../apache/hadoop/hive/ql/TestTxnNoBuckets.java |     8 +
 .../hadoop/hive/ql/TxnCommandsBaseForTests.java |     5 +
 .../exec/TestMsckDropPartitionsInBatches.java   |     1 +
 .../hadoop/hive/ql/exec/TestOperators.java      |     1 +
 .../hive/ql/exec/repl/TestReplDumpTask.java     |    10 +-
 .../ql/exec/spark/TestLocalHiveSparkClient.java |   149 +
 .../exec/vector/TestVectorGroupByOperator.java  |    96 +
 .../exec/vector/TestVectorizationContext.java   |    31 +-
 .../hive/ql/hooks/TestHiveProtoLoggingHook.java |    37 +
 .../io/arrow/TestArrowColumnarBatchSerDe.java   |    25 +
 .../hive/ql/io/orc/TestInputOutputFormat.java   |    10 +-
 .../hadoop/hive/ql/io/orc/TestOrcFile.java      |    41 +
 .../TestVectorizedOrcAcidRowBatchReader.java    |   875 +-
 .../hive/ql/lockmgr/TestDbTxnManager.java       |     4 +-
 .../hadoop/hive/ql/metadata/TestHive.java       |     5 +
 .../ql/metadata/TestHiveMetaStoreChecker.java   |     5 +
 .../rules/TestHivePointLookupOptimizerRule.java |    43 +
 .../parse/TestUpdateDeleteSemanticAnalyzer.java |     2 +-
 .../dump/events/TestEventHandlerFactory.java    |     7 +-
 .../udf/generic/TestGenericUDFSurrogateKey.java |   206 +
 .../clientnegative/authorization_explain.q      |     7 +
 .../authorization_jdbc_keystore.q               |    28 +
 .../clientnegative/authorization_kill_query.q   |    15 -
 .../default_constraint_invalid_default_value2.q |     2 -
 ...ault_constraint_invalid_default_value_type.q |     2 -
 .../clientnegative/fallbackauth_addjar.q        |     4 +
 .../clientnegative/fallbackauth_compile.q       |     9 +
 .../clientnegative/fallbackauth_create_func1.q  |     5 +
 .../clientnegative/fallbackauth_create_func2.q  |     6 +
 .../queries/clientnegative/fallbackauth_dfs.q   |     4 +
 .../fallbackauth_disallow_transform.q           |     6 +
 .../queries/clientnegative/fallbackauth_load.q  |    15 +
 .../fallbackauth_set_invalidconf.q              |     8 +
 .../clientnegative/merge_column_mismatch.q      |    15 +
 .../clientpositive/acid_meta_columns_decode.q   |    24 +
 .../acid_vectorization_original.q               |    29 +-
 .../clientpositive/alter_table_location2.q      |    21 +
 .../clientpositive/alter_table_location3.q      |    16 +
 .../clientpositive/annotate_stats_groupby.q     |    17 +
 .../queries/clientpositive/approx_distinct.q    |    76 +
 .../queries/clientpositive/autoColumnStats_11.q |    28 +
 .../clientpositive/constraints_optimization.q   |   149 +
 ql/src/test/queries/clientpositive/cttl.q       |     2 +-
 .../clientpositive/date_int_operation_test.q    |     5 +
 .../test/queries/clientpositive/dp_counter_mm.q |     1 +
 .../queries/clientpositive/dp_counter_non_mm.q  |     1 +
 .../clientpositive/druidmini_test_insert.q      |    11 +
 .../dynpart_sort_opt_vectorization.q            |    25 +-
 .../clientpositive/dynpart_sort_optimization.q  |    63 +-
 .../clientpositive/dynpart_sort_optimization2.q |     9 +-
 .../dynpart_sort_optimization_acid.q            |    12 +-
 .../dynpart_sort_optimization_acid2.q           |     2 +-
 .../queries/clientpositive/exim_hidden_files.q  |    10 +-
 .../queries/clientpositive/external_jdbc_auth.q |   120 +
 .../clientpositive/external_jdbc_table.q        |   187 +
 .../clientpositive/external_jdbc_table2.q       |   142 +
 .../external_jdbc_table_partition.q             |   135 +
 .../external_jdbc_table_typeconversion.q        |   119 +
 .../test/queries/clientpositive/fold_to_null.q  |    14 +
 .../insert_into_default_keyword.q               |    10 +-
 .../test/queries/clientpositive/jdbc_handler.q  |     2 +-
 .../clientpositive/kafka_storage_handler.q      |    74 +-
 .../clientpositive/load_data_using_job.q        |    20 +-
 ql/src/test/queries/clientpositive/mm_dp.q      |    51 +
 .../test/queries/clientpositive/msck_repair_0.q |     8 +-
 .../test/queries/clientpositive/msck_repair_2.q |     6 +-
 .../test/queries/clientpositive/msck_repair_3.q |     2 +-
 .../clientpositive/msck_repair_batchsize.q      |    18 +-
 .../queries/clientpositive/msck_repair_drop.q   |   164 +-
 .../queries/clientpositive/perf/cbo_query1.q    |    27 +
 .../queries/clientpositive/perf/cbo_query10.q   |    61 +
 .../queries/clientpositive/perf/cbo_query11.q   |    77 +
 .../queries/clientpositive/perf/cbo_query12.q   |    35 +
 .../queries/clientpositive/perf/cbo_query13.q   |    54 +
 .../queries/clientpositive/perf/cbo_query14.q   |   104 +
 .../queries/clientpositive/perf/cbo_query15.q   |    22 +
 .../queries/clientpositive/perf/cbo_query16.q   |    33 +
 .../queries/clientpositive/perf/cbo_query17.q   |    47 +
 .../queries/clientpositive/perf/cbo_query18.q   |    36 +
 .../queries/clientpositive/perf/cbo_query19.q   |    27 +
 .../queries/clientpositive/perf/cbo_query2.q    |    62 +
 .../queries/clientpositive/perf/cbo_query20.q   |    31 +
 .../queries/clientpositive/perf/cbo_query21.q   |    32 +
 .../queries/clientpositive/perf/cbo_query22.q   |    24 +
 .../queries/clientpositive/perf/cbo_query23.q   |    52 +
 .../queries/clientpositive/perf/cbo_query24.q   |    52 +
 .../queries/clientpositive/perf/cbo_query25.q   |    50 +
 .../queries/clientpositive/perf/cbo_query26.q   |    23 +
 .../queries/clientpositive/perf/cbo_query27.q   |    25 +
 .../queries/clientpositive/perf/cbo_query28.q   |    59 +
 .../queries/clientpositive/perf/cbo_query29.q   |    49 +
 .../queries/clientpositive/perf/cbo_query3.q    |    23 +
 .../queries/clientpositive/perf/cbo_query30.q   |    33 +
 .../queries/clientpositive/perf/cbo_query31.q   |    54 +
 .../queries/clientpositive/perf/cbo_query32.q   |    30 +
 .../queries/clientpositive/perf/cbo_query33.q   |    77 +
 .../queries/clientpositive/perf/cbo_query34.q   |    33 +
 .../queries/clientpositive/perf/cbo_query35.q   |    59 +
 .../queries/clientpositive/perf/cbo_query36.q   |    32 +
 .../queries/clientpositive/perf/cbo_query37.q   |    19 +
 .../queries/clientpositive/perf/cbo_query38.q   |    25 +
 .../queries/clientpositive/perf/cbo_query39.q   |    56 +
 .../queries/clientpositive/perf/cbo_query4.q    |   111 +
 .../queries/clientpositive/perf/cbo_query40.q   |    30 +
 .../queries/clientpositive/perf/cbo_query42.q   |    24 +
 .../queries/clientpositive/perf/cbo_query43.q   |    21 +
 .../queries/clientpositive/perf/cbo_query44.q   |    37 +
 .../queries/clientpositive/perf/cbo_query45.q   |    22 +
 .../queries/clientpositive/perf/cbo_query46.q   |    37 +
 .../queries/clientpositive/perf/cbo_query47.q   |    53 +
 .../queries/clientpositive/perf/cbo_query48.q   |    69 +
 .../queries/clientpositive/perf/cbo_query49.q   |   129 +
 .../queries/clientpositive/perf/cbo_query5.q    |   130 +
 .../queries/clientpositive/perf/cbo_query50.q   |    61 +
 .../queries/clientpositive/perf/cbo_query51.q   |    47 +
 .../queries/clientpositive/perf/cbo_query52.q   |    24 +
 .../queries/clientpositive/perf/cbo_query53.q   |    30 +
 .../queries/clientpositive/perf/cbo_query54.q   |    58 +
 .../queries/clientpositive/perf/cbo_query55.q   |    16 +
 .../queries/clientpositive/perf/cbo_query56.q   |    70 +
 .../queries/clientpositive/perf/cbo_query57.q   |    50 +
 .../queries/clientpositive/perf/cbo_query58.q   |    67 +
 .../queries/clientpositive/perf/cbo_query59.q   |    46 +
 .../queries/clientpositive/perf/cbo_query6.q    |    30 +
 .../queries/clientpositive/perf/cbo_query60.q   |    80 +
 .../queries/clientpositive/perf/cbo_query61.q   |    46 +
 .../queries/clientpositive/perf/cbo_query63.q   |    31 +
 .../queries/clientpositive/perf/cbo_query64.q   |   121 +
 .../queries/clientpositive/perf/cbo_query65.q   |    31 +
 .../queries/clientpositive/perf/cbo_query66.q   |   224 +
 .../queries/clientpositive/perf/cbo_query67.q   |    46 +
 .../queries/clientpositive/perf/cbo_query68.q   |    44 +
 .../queries/clientpositive/perf/cbo_query69.q   |    49 +
 .../queries/clientpositive/perf/cbo_query7.q    |    23 +
 .../queries/clientpositive/perf/cbo_query70.q   |    40 +
 .../queries/clientpositive/perf/cbo_query71.q   |    42 +
 .../queries/clientpositive/perf/cbo_query72.q   |    33 +
 .../queries/clientpositive/perf/cbo_query73.q   |    30 +
 .../queries/clientpositive/perf/cbo_query74.q   |    63 +
 .../queries/clientpositive/perf/cbo_query75.q   |    72 +
 .../queries/clientpositive/perf/cbo_query76.q   |    26 +
 .../queries/clientpositive/perf/cbo_query77.q   |   109 +
 .../queries/clientpositive/perf/cbo_query78.q   |    60 +
 .../queries/clientpositive/perf/cbo_query79.q   |    25 +
 .../queries/clientpositive/perf/cbo_query8.q    |   110 +
 .../queries/clientpositive/perf/cbo_query80.q   |    98 +
 .../queries/clientpositive/perf/cbo_query81.q   |    33 +
 .../queries/clientpositive/perf/cbo_query82.q   |    19 +
 .../queries/clientpositive/perf/cbo_query83.q   |    69 +
 .../queries/clientpositive/perf/cbo_query84.q   |    23 +
 .../queries/clientpositive/perf/cbo_query85.q   |    86 +
 .../queries/clientpositive/perf/cbo_query86.q   |    28 +
 .../queries/clientpositive/perf/cbo_query87.q   |    25 +
 .../queries/clientpositive/perf/cbo_query88.q   |    96 +
 .../queries/clientpositive/perf/cbo_query89.q   |    30 +
 .../queries/clientpositive/perf/cbo_query9.q    |    53 +
 .../queries/clientpositive/perf/cbo_query90.q   |    24 +
 .../queries/clientpositive/perf/cbo_query91.q   |    33 +
 .../queries/clientpositive/perf/cbo_query92.q   |    32 +
 .../queries/clientpositive/perf/cbo_query93.q   |    20 +
 .../queries/clientpositive/perf/cbo_query94.q   |    31 +
 .../queries/clientpositive/perf/cbo_query95.q   |    34 +
 .../queries/clientpositive/perf/cbo_query96.q   |    18 +
 .../queries/clientpositive/perf/cbo_query97.q   |    27 +
 .../queries/clientpositive/perf/cbo_query98.q   |    34 +
 .../queries/clientpositive/perf/cbo_query99.q   |    37 +
 .../test/queries/clientpositive/perf/query24.q  |     3 +-
 .../test/queries/clientpositive/pointlookup5.q  |    20 +
 ql/src/test/queries/clientpositive/repair.q     |     6 +-
 .../clientpositive/show_materialized_views.q    |     6 +-
 .../clientpositive/skewjoin_union_remove_1.q    |     1 -
 .../clientpositive/skewjoin_union_remove_2.q    |     1 -
 .../queries/clientpositive/sqlmerge_stats.q     |    83 +-
 .../queries/clientpositive/tez_input_counters.q |     1 +
 .../clientpositive/tumbled_window_tests.q       |    19 +
 .../queries/clientpositive/udf_isops_simplify.q |    10 +
 .../test/queries/clientpositive/udf_to_string.q |     2 +
 .../queries/clientpositive/union_remove_1.q     |     1 -
 .../queries/clientpositive/union_remove_10.q    |     1 -
 .../queries/clientpositive/union_remove_11.q    |     1 -
 .../queries/clientpositive/union_remove_12.q    |     1 -
 .../queries/clientpositive/union_remove_13.q    |     1 -
 .../queries/clientpositive/union_remove_14.q    |     1 -
 .../queries/clientpositive/union_remove_15.q    |     1 -
 .../queries/clientpositive/union_remove_16.q    |     1 -
 .../queries/clientpositive/union_remove_17.q    |     1 -
 .../queries/clientpositive/union_remove_18.q    |     1 -
 .../queries/clientpositive/union_remove_19.q    |     1 -
 .../queries/clientpositive/union_remove_2.q     |     1 -
 .../queries/clientpositive/union_remove_20.q    |     1 -
 .../queries/clientpositive/union_remove_21.q    |     1 -
 .../queries/clientpositive/union_remove_22.q    |     1 -
 .../queries/clientpositive/union_remove_23.q    |     1 -
 .../queries/clientpositive/union_remove_24.q    |     1 -
 .../queries/clientpositive/union_remove_25.q    |     1 -
 .../queries/clientpositive/union_remove_26.q    |     2 -
 .../queries/clientpositive/union_remove_3.q     |     1 -
 .../queries/clientpositive/union_remove_4.q     |     1 -
 .../queries/clientpositive/union_remove_5.q     |     1 -
 .../queries/clientpositive/union_remove_6.q     |     1 -
 .../clientpositive/union_remove_6_subq.q        |     1 -
 .../queries/clientpositive/union_remove_7.q     |     1 -
 .../queries/clientpositive/union_remove_8.q     |     1 -
 .../queries/clientpositive/union_remove_9.q     |     1 -
 .../queries/clientpositive/union_remove_plan.q  |     1 -
 .../vector_case_when_conversion.q               |   136 +
 .../vector_mapjoin_complex_values.q             |    34 +
 .../vector_partitioned_date_time.q              |     3 +-
 ...on_alter_table_exchange_partition_fail.q.out |     4 +
 ...n_alter_table_exchange_partition_fail2.q.out |     4 +
 .../clientnegative/authorization_explain.q.out  |    37 +
 .../authorization_insertpart_noinspriv.q.out    |     8 +
 .../authorization_jdbc_keystore.q.out           |     1 +
 .../authorization_kill_query.q.out              |     2 +
 .../bucket_mapjoin_mismatch1.q.out              |    20 +
 ...ault_constraint_invalid_default_value2.q.out |     1 -
 ..._constraint_invalid_default_value_type.q.out |     1 -
 .../clientnegative/fallbackauth_addjar.q.out    |     1 +
 .../clientnegative/fallbackauth_compile.q.out   |     1 +
 .../fallbackauth_create_func1.q.out             |     1 +
 .../fallbackauth_create_func2.q.out             |     1 +
 .../clientnegative/fallbackauth_dfs.q.out       |     1 +
 .../fallbackauth_disallow_transform.q.out       |    16 +
 .../clientnegative/fallbackauth_load.q.out      |     9 +
 .../fallbackauth_set_invalidconf.q.out          |     7 +
 .../results/clientnegative/masking_mv.q.out     |     6 +
 .../clientnegative/merge_column_mismatch.q.out  |    37 +
 .../results/clientnegative/script_error.q.out   |     4 +
 .../sortmerge_mapjoin_mismatch_1.q.out          |     6 +
 .../spark/spark_job_max_tasks.q.out             |     4 +
 .../spark/spark_stage_max_tasks.q.out           |     4 +
 .../spark/spark_task_failure.q.out              |     4 +
 .../clientnegative/udf_assert_true.q.out        |     8 +
 .../clientnegative/udf_assert_true2.q.out       |     4 +
 .../results/clientpositive/acid_mapjoin.q.out   |     6 +
 .../results/clientpositive/acid_nullscan.q.out  |     4 +
 .../results/clientpositive/acid_stats.q.out     |    12 +
 .../results/clientpositive/acid_stats2.q.out    |    48 +
 .../results/clientpositive/acid_stats3.q.out    |    42 +
 .../results/clientpositive/acid_stats4.q.out    |   120 +
 .../results/clientpositive/acid_stats5.q.out    |    56 +
 .../clientpositive/acid_table_stats.q.out       |    38 +-
 .../clientpositive/add_part_multiple.q.out      |     4 +
 .../clientpositive/alias_casted_column.q.out    |     8 +
 .../clientpositive/allcolref_in_udf.q.out       |    12 +
 .../clientpositive/alterColumnStatsPart.q.out   |    32 +
 .../alter_partition_coltype.q.out               |    32 +
 .../clientpositive/alter_rename_table.q.out     |     8 +
 .../alter_table_update_status.q.out             |   358 +-
 ..._table_update_status_disable_bitvector.q.out |   288 +-
 .../results/clientpositive/ambiguitycheck.q.out |     6 +
 .../results/clientpositive/ambiguous_col.q.out  |    22 +
 .../analyze_table_null_partition.q.out          |    12 +
 .../clientpositive/analyze_tbl_date.q.out       |     4 +
 .../annotate_stats_deep_filters.q.out           |     8 +
 .../clientpositive/annotate_stats_filter.q.out  |   120 +
 .../clientpositive/annotate_stats_groupby.q.out |   282 +
 .../annotate_stats_groupby2.q.out               |    28 +
 .../clientpositive/annotate_stats_join.q.out    |    70 +
 .../annotate_stats_join_pkfk.q.out              |    68 +
 .../clientpositive/annotate_stats_limit.q.out   |    16 +
 .../clientpositive/annotate_stats_part.q.out    |   128 +
 .../clientpositive/annotate_stats_select.q.out  |   136 +
 .../clientpositive/annotate_stats_table.q.out   |    42 +
 .../clientpositive/annotate_stats_udtf.q.out    |    20 +
 .../clientpositive/annotate_stats_union.q.out   |    28 +
 .../clientpositive/ansi_sql_arithmetic.q.out    |     8 +
 .../array_map_access_nonconstant.q.out          |     8 +
 .../clientpositive/array_size_estimation.q.out  |    16 +
 ...ization_alter_table_exchange_partition.q.out |     4 +
 .../clientpositive/authorization_explain.q.out  |    31 +
 .../clientpositive/authorization_wm.q.out       |    28 +
 .../clientpositive/autoColumnStats_1.q.out      |    72 +
 .../clientpositive/autoColumnStats_11.q.out     |   372 +
 .../clientpositive/autoColumnStats_2.q.out      |    78 +
 .../clientpositive/autoColumnStats_4.q.out      |     4 +
 .../clientpositive/autoColumnStats_5.q.out      |    12 +
 .../clientpositive/autoColumnStats_5a.q.out     |    12 +
 .../clientpositive/autoColumnStats_6.q.out      |     3 +
 .../clientpositive/autoColumnStats_7.q.out      |     4 +
 .../clientpositive/autoColumnStats_8.q.out      |    12 +
 .../clientpositive/autoColumnStats_9.q.out      |     4 +
 .../results/clientpositive/auto_join0.q.out     |     4 +
 .../results/clientpositive/auto_join1.q.out     |     4 +
 .../results/clientpositive/auto_join10.q.out    |     4 +
 .../results/clientpositive/auto_join11.q.out    |     4 +
 .../results/clientpositive/auto_join12.q.out    |     4 +
 .../results/clientpositive/auto_join13.q.out    |     4 +
 .../results/clientpositive/auto_join14.q.out    |    10 +
 .../results/clientpositive/auto_join15.q.out    |     4 +
 .../results/clientpositive/auto_join16.q.out    |     4 +
 .../results/clientpositive/auto_join17.q.out    |     4 +
 .../results/clientpositive/auto_join18.q.out    |     6 +
 .../auto_join18_multi_distinct.q.out            |     6 +
 .../results/clientpositive/auto_join19.q.out    |    14 +
 .../clientpositive/auto_join19_inclause.q.out   |    14 +
 .../results/clientpositive/auto_join2.q.out     |     4 +
 .../results/clientpositive/auto_join20.q.out    |     8 +
 .../results/clientpositive/auto_join21.q.out    |     4 +
 .../results/clientpositive/auto_join22.q.out    |     4 +
 .../results/clientpositive/auto_join23.q.out    |     4 +
 .../results/clientpositive/auto_join24.q.out    |     4 +
 .../results/clientpositive/auto_join26.q.out    |     6 +
 .../results/clientpositive/auto_join27.q.out    |     4 +
 .../results/clientpositive/auto_join28.q.out    |    16 +
 .../results/clientpositive/auto_join29.q.out    |    36 +
 .../results/clientpositive/auto_join3.q.out     |     4 +
 .../results/clientpositive/auto_join31.q.out    |     4 +
 .../results/clientpositive/auto_join32.q.out    |    24 +
 .../results/clientpositive/auto_join33.q.out    |     4 +
 .../results/clientpositive/auto_join4.q.out     |     4 +
 .../results/clientpositive/auto_join5.q.out     |     4 +
 .../results/clientpositive/auto_join6.q.out     |     4 +
 .../results/clientpositive/auto_join7.q.out     |     4 +
 .../results/clientpositive/auto_join8.q.out     |     4 +
 .../results/clientpositive/auto_join9.q.out     |     8 +
 .../auto_join_reordering_values.q.out           |     6 +
 .../clientpositive/auto_join_stats.q.out        |    14 +
 .../clientpositive/auto_join_stats2.q.out       |    14 +
 .../auto_join_without_localtask.q.out           |    12 +
 .../avro_schema_evolution_native.q.out          |    16 +
 .../beeline/explain_outputs.q.out               |    12 +
 .../clientpositive/beeline/mapjoin2.q.out       |    28 +
 .../materialized_view_create_rewrite.q.out      |    24 +
 .../beeline/select_dummy_source.q.out           |    28 +
 .../clientpositive/beeline/smb_mapjoin_1.q.out  |    48 +
 .../clientpositive/beeline/smb_mapjoin_10.q.out |     8 +
 .../clientpositive/beeline/smb_mapjoin_11.q.out |    22 +
 .../clientpositive/beeline/smb_mapjoin_12.q.out |    24 +
 .../clientpositive/beeline/smb_mapjoin_13.q.out |    12 +
 .../clientpositive/beeline/smb_mapjoin_16.q.out |     6 +
 .../clientpositive/beeline/smb_mapjoin_2.q.out  |    48 +
 .../clientpositive/beeline/smb_mapjoin_3.q.out  |    48 +
 .../clientpositive/beeline/smb_mapjoin_7.q.out  |     6 +
 .../clientpositive/binary_output_format.q.out   |     4 +
 .../clientpositive/binarysortable_1.q.out       |   Bin 4384 -> 4527 bytes
 .../test/results/clientpositive/bucket1.q.out   |     4 +
 .../test/results/clientpositive/bucket2.q.out   |     8 +
 .../test/results/clientpositive/bucket3.q.out   |    10 +
 .../clientpositive/bucket_map_join_1.q.out      |     6 +
 .../clientpositive/bucket_map_join_2.q.out      |     6 +
 .../clientpositive/bucket_map_join_spark1.q.out |    20 +
 .../clientpositive/bucket_map_join_spark2.q.out |    20 +
 .../clientpositive/bucket_map_join_spark3.q.out |    20 +
 .../clientpositive/bucket_map_join_spark4.q.out |    16 +
 .../clientpositive/bucketcontext_1.q.out        |    24 +
 .../clientpositive/bucketcontext_2.q.out        |    24 +
 .../clientpositive/bucketcontext_3.q.out        |    24 +
 .../clientpositive/bucketcontext_4.q.out        |    24 +
 .../clientpositive/bucketcontext_5.q.out        |    12 +
 .../clientpositive/bucketcontext_6.q.out        |    20 +
 .../clientpositive/bucketcontext_7.q.out        |    28 +
 .../clientpositive/bucketcontext_8.q.out        |    28 +
 .../clientpositive/bucketmapjoin10.q.out        |    14 +
 .../clientpositive/bucketmapjoin11.q.out        |    28 +
 .../clientpositive/bucketmapjoin12.q.out        |    20 +
 .../clientpositive/bucketmapjoin13.q.out        |    42 +
 .../results/clientpositive/bucketmapjoin5.q.out |    20 +
 .../results/clientpositive/bucketmapjoin8.q.out |    20 +
 .../results/clientpositive/bucketmapjoin9.q.out |    20 +
 .../clientpositive/bucketmapjoin_negative.q.out |     8 +
 .../bucketmapjoin_negative2.q.out               |    10 +
 .../bucketmapjoin_negative3.q.out               |    48 +
 .../bucketsortoptimize_insert_1.q.out           |    30 +
 .../bucketsortoptimize_insert_3.q.out           |    12 +
 .../bucketsortoptimize_insert_4.q.out           |    20 +
 .../bucketsortoptimize_insert_5.q.out           |    20 +
 .../bucketsortoptimize_insert_8.q.out           |    20 +
 .../clientpositive/case_sensitivity.q.out       |     4 +
 ql/src/test/results/clientpositive/cast1.q.out  |     4 +
 .../clientpositive/cast_on_constant.q.out       |    20 +
 .../cbo_SortUnionTransposeRule.q.out            |    48 +
 .../test/results/clientpositive/cbo_const.q.out |    16 +
 .../results/clientpositive/cbo_input26.q.out    |    24 +
 .../cbo_ppd_non_deterministic.q.out             |    12 +
 .../cbo_rp_annotate_stats_groupby.q.out         |    92 +
 .../clientpositive/cbo_rp_auto_join0.q.out      |     8 +
 .../clientpositive/cbo_rp_auto_join1.q.out      |    76 +
 .../clientpositive/cbo_rp_auto_join17.q.out     |     4 +
 .../cbo_rp_cross_product_check_2.q.out          |    30 +
 .../cbo_rp_gby2_map_multi_distinct.q.out        |     8 +
 .../cbo_rp_groupby3_noskew_multi_distinct.q.out |     4 +
 .../results/clientpositive/cbo_rp_join0.q.out   |    24 +
 .../results/clientpositive/cbo_rp_join1.q.out   |    16 +
 .../clientpositive/cbo_rp_outer_join_ppr.q.out  |    20 +
 .../clientpositive/cbo_rp_simple_select.q.out   |    36 +
 .../cbo_rp_udaf_percentile_approx_23.q.out      |     8 +
 .../clientpositive/cbo_simple_select.q.out      |    36 +
 .../results/clientpositive/cbo_union_view.q.out |    20 +
 .../columnStatsUpdateForStatsOptimizer_2.q.out  |    24 +
 .../column_pruner_multiple_children.q.out       |     4 +
 .../column_pruning_partitioned_view.q.out       |     6 +
 .../columnarserde_create_shortcut.q.out         |     4 +
 .../clientpositive/columnstats_partlvl.q.out    |    78 +
 .../clientpositive/columnstats_partlvl_dp.q.out |    84 +
 .../clientpositive/columnstats_quoting.q.out    |    12 +
 .../clientpositive/columnstats_tbllvl.q.out     |    42 +
 .../test/results/clientpositive/combine2.q.out  |    36 +
 .../test/results/clientpositive/comments.q.out  |     4 +
 .../results/clientpositive/complex_alias.q.out  |     4 +
 .../clientpositive/compute_stats_date.q.out     |     6 +
 .../test/results/clientpositive/concat_op.q.out |    12 +
 .../test/results/clientpositive/constGby.q.out  |     8 +
 .../clientpositive/constantPropWhen.q.out       |    32 +
 .../constantPropagateForSubQuery.q.out          |     6 +
 .../results/clientpositive/constant_prop.q.out  |     4 +
 .../clientpositive/constant_prop_1.q.out        |    28 +
 .../clientpositive/constant_prop_2.q.out        |    14 +
 .../clientpositive/constant_prop_3.q.out        |     8 +
 .../clientpositive/constantfolding.q.out        |    12 +
 .../results/clientpositive/constprog1.q.out     |     4 +
 .../results/clientpositive/constprog2.q.out     |     8 +
 .../results/clientpositive/constprog3.q.out     |     6 +
 .../results/clientpositive/constprog_dp.q.out   |     7 +
 .../clientpositive/constprog_partitioner.q.out  |     8 +
 .../results/clientpositive/constprog_type.q.out |    35 +-
 .../clientpositive/constprog_when_case.q.out    |     4 +
 .../convert_decimal64_to_decimal.q.out          |    12 +
 .../clientpositive/correlated_join_keys.q.out   |     8 +
 .../clientpositive/correlationoptimizer10.q.out |    32 +
 .../clientpositive/correlationoptimizer11.q.out |    28 +
 .../clientpositive/correlationoptimizer12.q.out |     6 +
 .../clientpositive/correlationoptimizer13.q.out |     4 +
 .../clientpositive/correlationoptimizer14.q.out |    60 +
 .../clientpositive/correlationoptimizer15.q.out |    12 +
 .../clientpositive/correlationoptimizer5.q.out  |    30 +
 .../clientpositive/correlationoptimizer7.q.out  |    24 +
 .../clientpositive/correlationoptimizer8.q.out  |    36 +
 .../clientpositive/correlationoptimizer9.q.out  |    16 +
 .../clientpositive/count_dist_rewrite.q.out     |    36 +
 ql/src/test/results/clientpositive/cp_sel.q.out |    15 +
 .../clientpositive/create_genericudaf.q.out     |     6 +
 .../clientpositive/create_genericudf.q.out      |     2 +
 .../results/clientpositive/create_udaf.q.out    |     2 +
 .../clientpositive/create_union_table.q.out     |     4 +
 .../results/clientpositive/create_view.q.out    |    12 +
 .../clientpositive/create_view_translate.q.out  |     6 +
 .../results/clientpositive/cross_join.q.out     |    24 +
 .../clientpositive/cross_join_merge.q.out       |    24 +
 .../clientpositive/cross_product_check_1.q.out  |    30 +
 .../clientpositive/cross_product_check_2.q.out  |    30 +
 ql/src/test/results/clientpositive/ctas.q.out   |    30 +
 .../results/clientpositive/ctas_colname.q.out   |    42 +
 .../ctas_uses_database_location.q.out           |     6 +
 ql/src/test/results/clientpositive/cte_1.q.out  |    12 +
 ql/src/test/results/clientpositive/cte_3.q.out  |    12 +
 ql/src/test/results/clientpositive/cte_5.q.out  |     6 +
 ql/src/test/results/clientpositive/cte_6.q.out  |     8 +
 .../test/results/clientpositive/cte_mat_1.q.out |     4 +
 .../test/results/clientpositive/cte_mat_2.q.out |     4 +
 .../test/results/clientpositive/cte_mat_3.q.out |     4 +
 .../test/results/clientpositive/cte_mat_4.q.out |     8 +
 .../test/results/clientpositive/cte_mat_5.q.out |     6 +
 .../date_int_operation_test.q.out               |    18 +
 .../results/clientpositive/decimal_join2.q.out  |     8 +
 .../clientpositive/decimal_precision.q.out      |     4 +
 .../clientpositive/decimal_precision2.q.out     |    28 +
 .../results/clientpositive/decimal_stats.q.out  |     4 +
 .../results/clientpositive/decimal_udf.q.out    |   136 +
 .../results/clientpositive/decimal_udf2.q.out   |     8 +
 .../results/clientpositive/deleteAnalyze.q.out  |     6 +-
 .../display_colstats_tbllvl.q.out               |    18 +
 .../results/clientpositive/distinct_stats.q.out |    12 +
 .../clientpositive/distinct_windowing.q.out     |    12 +
 .../distinct_windowing_no_cbo.q.out             |    20 +
 .../drop_deleted_partitions.q.out               |     4 +
 .../clientpositive/drop_multi_partitions.q.out  |     6 +
 .../test/results/clientpositive/drop_udf.q.out  |     2 +
 .../druid/druidkafkamini_basic.q.out            |    34 +
 .../druid/druidmini_dynamic_partition.q.out     |    14 +
 .../druid/druidmini_expressions.q.out           |   266 +-
 .../druid/druidmini_extractTime.q.out           |    76 +
 .../druid/druidmini_floorTime.q.out             |    64 +
 .../clientpositive/druid/druidmini_mv.q.out     |    34 +-
 .../clientpositive/druid/druidmini_test1.q.out  |    60 +
 .../druid/druidmini_test_insert.q.out           |    83 +
 .../druid/druidmini_test_ts.q.out               |    40 +
 .../druid/kafka_storage_handler.q.out           |   414 +-
 .../clientpositive/druid_timeseries.q.out       |    76 +
 .../results/clientpositive/druid_topn.q.out     |    32 +
 .../dynamic_partition_skip_default.q.out        |    20 +
 .../dynpart_sort_optimization_acid2.q.out       |    99 +-
 .../results/clientpositive/empty_join.q.out     |     8 +
 .../encryption_join_unencrypted_tbl.q.out       |     6 +
 ...on_join_with_different_encryption_keys.q.out |     6 +
 .../erasurecoding/erasure_explain.q.out         |    32 +
 .../clientpositive/escape_clusterby1.q.out      |     8 +
 .../clientpositive/escape_distributeby1.q.out   |     8 +
 .../clientpositive/escape_orderby1.q.out        |     8 +
 .../results/clientpositive/escape_sortby1.q.out |     8 +
 .../results/clientpositive/except_all.q.out     |    14 +
 .../exec_parallel_column_stats.q.out            |     6 +
 .../clientpositive/exim_hidden_files.q.out      |     8 +-
 .../results/clientpositive/explain_ast.q.out    |     4 +
 .../results/clientpositive/explain_ddl.q.out    |    50 +
 .../clientpositive/explain_dependency.q.out     |   108 +
 .../clientpositive/explain_dependency2.q.out    |    40 +
 .../results/clientpositive/explain_locks.q.out  |    61 +
 .../clientpositive/explain_logical.q.out        |    72 +
 .../clientpositive/explain_outputs.q.out        |    18 +
 .../clientpositive/explain_rearrange.q.out      |    24 +
 .../explaindenpendencydiffengs.q.out            |     8 +
 .../test/results/clientpositive/extract.q.out   |     8 +
 .../extrapolate_part_stats_date.q.out           |    20 +-
 .../extrapolate_part_stats_full.q.out           |    40 +
 .../extrapolate_part_stats_partial.q.out        |   100 +
 .../clientpositive/fetch_aggregation.q.out      |     4 +
 .../fileformat_sequencefile.q.out               |     4 +
 .../clientpositive/fileformat_text.q.out        |     4 +
 .../results/clientpositive/filter_aggr.q.out    |     4 +
 .../clientpositive/filter_cond_pushdown.q.out   |    58 +-
 .../clientpositive/filter_cond_pushdown2.q.out  |     4 +
 .../filter_cond_pushdown_HIVE_15647.q.out       |    24 +
 .../clientpositive/filter_in_or_dup.q.out       |    18 +
 .../clientpositive/filter_join_breaktask.q.out  |     6 +
 .../results/clientpositive/filter_numeric.q.out |    32 +
 .../results/clientpositive/filter_union.q.out   |    16 +
 .../results/clientpositive/flatten_and_or.q.out |     4 +
 .../results/clientpositive/floor_time.q.out     |     8 +
 .../test/results/clientpositive/fm-sketch.q.out |    12 +
 .../test/results/clientpositive/fold_case.q.out |    52 +
 .../clientpositive/fold_eq_with_case_when.q.out |    20 +
 .../results/clientpositive/fold_to_null.q.out   |   209 +
 .../test/results/clientpositive/fold_when.q.out |    60 +
 .../clientpositive/folder_predicate.q.out       |    28 +
 ql/src/test/results/clientpositive/foldts.q.out |    12 +
 .../clientpositive/fp_literal_arithmetic.q.out  |    16 +
 .../test/results/clientpositive/gby_star.q.out  |    16 +
 .../clientpositive/gen_udf_example_add10.q.out  |     4 +
 .../test/results/clientpositive/groupby1.q.out  |     4 +
 .../test/results/clientpositive/groupby10.q.out |    18 +
 .../test/results/clientpositive/groupby11.q.out |     6 +
 .../test/results/clientpositive/groupby12.q.out |     4 +
 .../test/results/clientpositive/groupby13.q.out |     6 +-
 .../results/clientpositive/groupby1_limit.q.out |     4 +
 .../results/clientpositive/groupby1_map.q.out   |     4 +
 .../clientpositive/groupby1_map_nomap.q.out     |     4 +
 .../clientpositive/groupby1_map_skew.q.out      |     4 +
 .../clientpositive/groupby1_noskew.q.out        |     4 +
 .../results/clientpositive/groupby2_limit.q.out |     4 +
 .../results/clientpositive/groupby2_map.q.out   |     4 +
 .../groupby2_map_multi_distinct.q.out           |     8 +
 .../clientpositive/groupby2_map_skew.q.out      |     4 +
 .../clientpositive/groupby2_noskew.q.out        |     4 +
 .../groupby2_noskew_multi_distinct.q.out        |     4 +
 .../test/results/clientpositive/groupby3.q.out  |     4 +
 .../results/clientpositive/groupby3_map.q.out   |     4 +
 .../groupby3_map_multi_distinct.q.out           |     4 +
 .../clientpositive/groupby3_map_skew.q.out      |     4 +
 .../clientpositive/groupby3_noskew.q.out        |     4 +
 .../groupby3_noskew_multi_distinct.q.out        |     4 +
 .../test/results/clientpositive/groupby4.q.out  |     4 +
 .../results/clientpositive/groupby4_map.q.out   |     4 +
 .../clientpositive/groupby4_map_skew.q.out      |     4 +
 .../clientpositive/groupby4_noskew.q.out        |     4 +
 .../test/results/clientpositive/groupby5.q.out  |     4 +
 .../results/clientpositive/groupby5_map.q.out   |     4 +
 .../clientpositive/groupby5_map_skew.q.out      |     4 +
 .../clientpositive/groupby5_noskew.q.out        |     4 +
 .../test/results/clientpositive/groupby6.q.out  |     4 +
 .../results/clientpositive/groupby6_map.q.out   |     4 +
 .../clientpositive/groupby6_map_skew.q.out      |     4 +
 .../clientpositive/groupby6_noskew.q.out        |     4 +
 .../results/clientpositive/groupby7_map.q.out   |     6 +
 .../groupby7_map_multi_single_reducer.q.out     |     6 +
 .../clientpositive/groupby7_map_skew.q.out      |     6 +
 .../clientpositive/groupby7_noskew.q.out        |     6 +
 .../groupby7_noskew_multi_single_reducer.q.out  |     6 +
 .../test/results/clientpositive/groupby8.q.out  |    12 +
 .../results/clientpositive/groupby8_map.q.out   |     6 +
 .../clientpositive/groupby8_map_skew.q.out      |     6 +
 .../clientpositive/groupby8_noskew.q.out        |     6 +
 .../test/results/clientpositive/groupby9.q.out  |    30 +
 .../clientpositive/groupby_complex_types.q.out  |     8 +
 ...pby_complex_types_multi_single_reducer.q.out |     6 +
 .../results/clientpositive/groupby_cube1.q.out  |    30 +
 .../clientpositive/groupby_cube_multi_gby.q.out |     6 +
 .../groupby_distinct_samekey.q.out              |     8 +
 .../clientpositive/groupby_duplicate_key.q.out  |    14 +
 .../results/clientpositive/groupby_empty.q.out  |     4 +
 .../clientpositive/groupby_grouping_id3.q.out   |     8 +
 .../clientpositive/groupby_grouping_sets1.q.out |    28 +
 .../clientpositive/groupby_grouping_sets2.q.out |    16 +
 .../clientpositive/groupby_grouping_sets3.q.out |    12 +
 .../clientpositive/groupby_grouping_sets4.q.out |    12 +
 .../clientpositive/groupby_grouping_sets5.q.out |    12 +
 .../clientpositive/groupby_grouping_sets6.q.out |     8 +
 .../groupby_grouping_sets_grouping.q.out        |    60 +
 .../groupby_grouping_sets_limit.q.out           |    24 +
 .../groupby_grouping_window.q.out               |     4 +
 .../clientpositive/groupby_join_pushdown.q.out  |    52 +
 .../clientpositive/groupby_map_ppr.q.out        |     8 +
 .../groupby_map_ppr_multi_distinct.q.out        |     8 +
 .../groupby_multi_insert_common_distinct.q.out  |     6 +
 .../groupby_multi_single_reducer.q.out          |    20 +
 .../groupby_multi_single_reducer2.q.out         |     6 +
 .../groupby_multi_single_reducer3.q.out         |    24 +
 .../clientpositive/groupby_multialias.q.out     |     4 +
 .../clientpositive/groupby_position.q.out       |    28 +
 .../results/clientpositive/groupby_ppd.q.out    |     4 +
 .../results/clientpositive/groupby_ppr.q.out    |     8 +
 .../groupby_ppr_multi_distinct.q.out            |    16 +
 .../clientpositive/groupby_rollup1.q.out        |    22 +
 .../clientpositive/groupby_rollup_empty.q.out   |     4 +
 .../clientpositive/groupby_sort_10.q.out        |    14 +
 .../clientpositive/groupby_sort_11.q.out        |    42 +
 .../clientpositive/groupby_sort_1_23.q.out      |    80 +
 .../results/clientpositive/groupby_sort_2.q.out |     4 +
 .../results/clientpositive/groupby_sort_3.q.out |     8 +
 .../results/clientpositive/groupby_sort_4.q.out |     8 +
 .../results/clientpositive/groupby_sort_5.q.out |    12 +
 .../results/clientpositive/groupby_sort_6.q.out |    14 +
 .../results/clientpositive/groupby_sort_7.q.out |     6 +
 .../results/clientpositive/groupby_sort_8.q.out |     6 +
 .../results/clientpositive/groupby_sort_9.q.out |     8 +
 .../clientpositive/groupby_sort_skew_1_23.q.out |    80 +
 .../clientpositive/groupby_sort_test_1.q.out    |     4 +
 ql/src/test/results/clientpositive/having.q.out |    24 +
 .../test/results/clientpositive/having2.q.out   |    26 +
 ql/src/test/results/clientpositive/hll.q.out    |    12 +
 .../identity_project_remove_skip.q.out          |     4 +
 .../results/clientpositive/implicit_cast1.q.out |     4 +
 .../implicit_cast_during_insert.q.out           |     3 +
 .../clientpositive/implicit_decimal.q.out       |     4 +
 .../infer_bucket_sort_dyn_part.q.out            |     7 +
 .../infer_bucket_sort_grouping_operators.q.out  |    12 +
 .../infer_bucket_sort_map_operators.q.out       |    22 +
 .../infer_bucket_sort_num_buckets.q.out         |     7 +
 .../clientpositive/infer_const_type.q.out       |    16 +
 .../clientpositive/infer_join_preds.q.out       |    48 +
 .../test/results/clientpositive/innerjoin.q.out |     8 +
 .../results/clientpositive/innerjoin1.q.out     |    84 +-
 ql/src/test/results/clientpositive/input.q.out  |     4 +
 ql/src/test/results/clientpositive/input0.q.out |     4 +
 ql/src/test/results/clientpositive/input1.q.out |     2 +
 .../test/results/clientpositive/input10.q.out   |     2 +
 .../test/results/clientpositive/input11.q.out   |     4 +
 .../results/clientpositive/input11_limit.q.out  |     4 +
 .../test/results/clientpositive/input12.q.out   |     8 +
 .../test/results/clientpositive/input13.q.out   |    10 +
 .../test/results/clientpositive/input14.q.out   |     4 +
 .../results/clientpositive/input14_limit.q.out  |     4 +
 .../test/results/clientpositive/input15.q.out   |     4 +
 .../test/results/clientpositive/input17.q.out   |     4 +
 .../test/results/clientpositive/input18.q.out   |     4 +
 .../results/clientpositive/input1_limit.q.out   |     6 +
 ql/src/test/results/clientpositive/input2.q.out |     2 +
 .../test/results/clientpositive/input20.q.out   |     4 +
 .../test/results/clientpositive/input21.q.out   |     4 +
 .../test/results/clientpositive/input22.q.out   |     4 +
 .../test/results/clientpositive/input23.q.out   |     6 +
 .../test/results/clientpositive/input24.q.out   |     4 +
 .../test/results/clientpositive/input25.q.out   |     8 +
 .../test/results/clientpositive/input26.q.out   |     6 +
 .../results/clientpositive/input2_limit.q.out   |     4 +
 ql/src/test/results/clientpositive/input3.q.out |    12 +
 .../test/results/clientpositive/input30.q.out   |     8 +
 .../test/results/clientpositive/input32.q.out   |     4 +
 .../test/results/clientpositive/input33.q.out   |     4 +
 .../test/results/clientpositive/input34.q.out   |     4 +
 .../test/results/clientpositive/input35.q.out   |     4 +
 .../test/results/clientpositive/input36.q.out   |     4 +
 .../test/results/clientpositive/input38.q.out   |     4 +
 .../test/results/clientpositive/input39.q.out   |    10 +
 .../results/clientpositive/input3_limit.q.out   |     4 +
 ql/src/test/results/clientpositive/input4.q.out |     8 +
 .../test/results/clientpositive/input42.q.out   |    24 +
 .../results/clientpositive/input4_limit.q.out   |     4 +
 ql/src/test/results/clientpositive/input5.q.out |     4 +
 ql/src/test/results/clientpositive/input6.q.out |     4 +
 ql/src/test/results/clientpositive/input7.q.out |     4 +
 ql/src/test/results/clientpositive/input8.q.out |     4 +
 ql/src/test/results/clientpositive/input9.q.out |     4 +
 .../clientpositive/input_columnarserde.q.out    |     4 +
 .../clientpositive/input_dynamicserde.q.out     |     4 +
 .../clientpositive/input_lazyserde.q.out        |     4 +
 .../clientpositive/input_lazyserde2.q.out       |     4 +
 .../results/clientpositive/input_limit.q.out    |     4 +
 .../results/clientpositive/input_part0.q.out    |     8 +
 .../results/clientpositive/input_part1.q.out    |     6 +
 .../results/clientpositive/input_part10.q.out   |     4 +
 .../results/clientpositive/input_part2.q.out    |    10 +
 .../results/clientpositive/input_part3.q.out    |     6 +
 .../results/clientpositive/input_part4.q.out    |     4 +
 .../results/clientpositive/input_part5.q.out    |     8 +
 .../results/clientpositive/input_part6.q.out    |     8 +
 .../results/clientpositive/input_part7.q.out    |     8 +
 .../results/clientpositive/input_part8.q.out    |     8 +
 .../results/clientpositive/input_part9.q.out    |     8 +
 .../clientpositive/input_testsequencefile.q.out |     4 +
 .../clientpositive/input_testxpath.q.out        |     4 +
 .../clientpositive/input_testxpath2.q.out       |     4 +
 .../clientpositive/input_testxpath3.q.out       |     4 +
 .../clientpositive/input_testxpath4.q.out       |     8 +
 .../test/results/clientpositive/inputddl1.q.out |     4 +
 .../test/results/clientpositive/inputddl2.q.out |     4 +
 .../test/results/clientpositive/inputddl3.q.out |     4 +
 .../test/results/clientpositive/inputddl6.q.out |     2 +
 .../clientpositive/inputwherefalse.q.out        |     4 +
 .../test/results/clientpositive/insert1.q.out   |    22 +
 .../insert2_overwrite_partitions.q.out          |    12 +
 .../results/clientpositive/insert_into1.q.out   |    40 +
 .../results/clientpositive/insert_into2.q.out   |    34 +
 .../results/clientpositive/insert_into3.q.out   |    12 +
 .../results/clientpositive/insert_into4.q.out   |    12 +
 .../results/clientpositive/insert_into5.q.out   |    18 +
 .../results/clientpositive/insert_into6.q.out   |    11 +
 .../clientpositive/insertoverwrite_bucket.q.out |     8 +
 .../results/clientpositive/interval_3.q.out     |     4 +
 .../results/clientpositive/interval_alt.q.out   |     4 +
 .../clientpositive/interval_arithmetic.q.out    |    36 +
 .../results/clientpositive/ivyDownload.q.out    |     4 +
 ql/src/test/results/clientpositive/join0.q.out  |     8 +
 ql/src/test/results/clientpositive/join10.q.out |     4 +
 ql/src/test/results/clientpositive/join11.q.out |     4 +
 ql/src/test/results/clientpositive/join12.q.out |     4 +
 ql/src/test/results/clientpositive/join13.q.out |     4 +
 ql/src/test/results/clientpositive/join14.q.out |    10 +
 ql/src/test/results/clientpositive/join15.q.out |     4 +
 ql/src/test/results/clientpositive/join16.q.out |     4 +
 ql/src/test/results/clientpositive/join17.q.out |     4 +
 ql/src/test/results/clientpositive/join18.q.out |     6 +
 .../clientpositive/join18_multi_distinct.q.out  |     6 +
 ql/src/test/results/clientpositive/join19.q.out |     4 +
 ql/src/test/results/clientpositive/join2.q.out  |     4 +
 ql/src/test/results/clientpositive/join20.q.out |     8 +
 ql/src/test/results/clientpositive/join21.q.out |     4 +
 ql/src/test/results/clientpositive/join22.q.out |     4 +
 ql/src/test/results/clientpositive/join23.q.out |     4 +
 ql/src/test/results/clientpositive/join25.q.out |     6 +
 ql/src/test/results/clientpositive/join26.q.out |    10 +
 ql/src/test/results/clientpositive/join27.q.out |     6 +
 ql/src/test/results/clientpositive/join28.q.out |    10 +
 ql/src/test/results/clientpositive/join29.q.out |     6 +
 ql/src/test/results/clientpositive/join3.q.out  |     4 +
 ql/src/test/results/clientpositive/join30.q.out |     6 +
 ql/src/test/results/clientpositive/join31.q.out |     6 +
 ql/src/test/results/clientpositive/join32.q.out |    10 +
 ql/src/test/results/clientpositive/join33.q.out |    10 +
 ql/src/test/results/clientpositive/join34.q.out |     6 +
 ql/src/test/results/clientpositive/join35.q.out |     6 +
 ql/src/test/results/clientpositive/join36.q.out |     6 +
 ql/src/test/results/clientpositive/join37.q.out |     6 +
 ql/src/test/results/clientpositive/join38.q.out |     6 +
 ql/src/test/results/clientpositive/join39.q.out |     4 +
 ql/src/test/results/clientpositive/join4.q.out  |     4 +
 ql/src/test/results/clientpositive/join40.q.out |    24 +
 ql/src/test/results/clientpositive/join41.q.out |     8 +
 ql/src/test/results/clientpositive/join42.q.out |    14 +
 ql/src/test/results/clientpositive/join43.q.out |    16 +
 ql/src/test/results/clientpositive/join44.q.out |     4 +
 ql/src/test/results/clientpositive/join45.q.out |    84 +
 ql/src/test/results/clientpositive/join46.q.out |   114 +
 ql/src/test/results/clientpositive/join47.q.out |    84 +
 ql/src/test/results/clientpositive/join5.q.out  |     4 +
 ql/src/test/results/clientpositive/join6.q.out  |     4 +
 ql/src/test/results/clientpositive/join7.q.out  |     4 +
 ql/src/test/results/clientpositive/join8.q.out  |     4 +
 ql/src/test/results/clientpositive/join9.q.out  |     8 +
 .../clientpositive/join_alt_syntax.q.out        |    24 +
 .../clientpositive/join_cond_pushdown_1.q.out   |    16 +
 .../clientpositive/join_cond_pushdown_2.q.out   |     8 +
 .../clientpositive/join_cond_pushdown_3.q.out   |    16 +
 .../clientpositive/join_cond_pushdown_4.q.out   |     8 +
 .../join_cond_pushdown_unqual1.q.out            |    32 +
 .../join_cond_pushdown_unqual2.q.out            |    16 +
 .../join_cond_pushdown_unqual3.q.out            |    32 +
 .../join_cond_pushdown_unqual4.q.out            |    16 +
 .../join_cond_pushdown_unqual5.q.out            |    16 +-
 .../clientpositive/join_emit_interval.q.out     |    12 +
 .../clientpositive/join_filters_overlap.q.out   |    20 +
 .../clientpositive/join_grp_diff_keys.q.out     |    10 +
 .../results/clientpositive/join_hive_626.q.out  |     8 +
 .../results/clientpositive/join_map_ppr.q.out   |    20 +
 .../join_merge_multi_expressions.q.out          |    12 +
 .../results/clientpositive/join_merging.q.out   |     8 +
 .../clientpositive/join_on_varchar.q.out        |     6 +
 .../results/clientpositive/join_parse.q.out     |    56 +
 .../test/results/clientpositive/join_rc.q.out   |     6 +
 .../results/clientpositive/join_reorder.q.out   |    44 +
 .../results/clientpositive/join_reorder2.q.out  |    20 +
 .../results/clientpositive/join_reorder3.q.out  |    20 +
 .../results/clientpositive/join_reorder4.q.out  |    24 +
 .../test/results/clientpositive/join_star.q.out |    48 +
 .../results/clientpositive/join_thrift.q.out    |     4 +
 .../test/results/clientpositive/join_vc.q.out   |     8 +
 .../test/results/clientpositive/join_view.q.out |     8 +
 .../test/results/clientpositive/keyword_1.q.out |     8 +
 .../results/clientpositive/kill_query.q.out     |     2 +
 .../clientpositive/lateral_view_cp.q.out        |     6 +
 .../clientpositive/lateral_view_explode2.q.out  |     4 +
 .../clientpositive/lateral_view_noalias.q.out   |    14 +
 .../clientpositive/lateral_view_onview.q.out    |    36 +
 .../clientpositive/lateral_view_onview2.q.out   |     6 +
 .../clientpositive/lateral_view_outer.q.out     |    12 +
 .../clientpositive/lateral_view_ppd.q.out       |    22 +
 .../results/clientpositive/leftsemijoin.q.out   |     8 +
 ql/src/test/results/clientpositive/limit0.q.out |    20 +
 .../clientpositive/limit_pushdown2.q.out        |    44 +
 .../limit_pushdown_negative.q.out               |    18 +
 .../test/results/clientpositive/lineage1.q.out  |     6 +
 .../clientpositive/list_bucket_dml_1.q.out      |    13 +
 .../clientpositive/list_bucket_dml_11.q.out     |    10 +
 .../clientpositive/list_bucket_dml_12.q.out     |    16 +
 .../clientpositive/list_bucket_dml_13.q.out     |    10 +
 .../clientpositive/list_bucket_dml_14.q.out     |     8 +
 .../clientpositive/list_bucket_dml_2.q.out      |    14 +
 .../clientpositive/list_bucket_dml_3.q.out      |    14 +
 .../clientpositive/list_bucket_dml_4.q.out      |    22 +
 .../clientpositive/list_bucket_dml_5.q.out      |    15 +
 .../clientpositive/list_bucket_dml_6.q.out      |    22 +
 .../clientpositive/list_bucket_dml_7.q.out      |    22 +
 .../clientpositive/list_bucket_dml_8.q.out      |    15 +
 .../clientpositive/list_bucket_dml_9.q.out      |    22 +
 .../list_bucket_query_multiskew_1.q.out         |    24 +
 .../list_bucket_query_multiskew_2.q.out         |    18 +
 .../list_bucket_query_multiskew_3.q.out         |    22 +
 .../list_bucket_query_oneskew_1.q.out           |    18 +
 .../list_bucket_query_oneskew_2.q.out           |    24 +
 .../list_bucket_query_oneskew_3.q.out           |     6 +
 .../clientpositive/literal_decimal.q.out        |    10 +-
 .../results/clientpositive/literal_double.q.out |     4 +
 .../results/clientpositive/literal_ints.q.out   |     4 +
 .../results/clientpositive/literal_string.q.out |     4 +
 .../llap/acid_bucket_pruning.q.out              |     4 +
 .../llap/acid_meta_columns_decode.q.out         |   128 +
 .../clientpositive/llap/acid_no_buckets.q.out   |   170 +
 .../llap/acid_vectorization_original.q.out      |   162 +
 .../llap/alter_table_location2.q.out            |    97 +
 .../llap/alter_table_location3.q.out            |    95 +
 .../clientpositive/llap/approx_distinct.q.out   |   490 +
 .../clientpositive/llap/autoColumnStats_1.q.out |    72 +
 .../clientpositive/llap/autoColumnStats_2.q.out |    78 +
 .../clientpositive/llap/auto_join0.q.out        |     4 +
 .../clientpositive/llap/auto_join1.q.out        |     4 +
 .../clientpositive/llap/auto_join21.q.out       |     4 +
 .../clientpositive/llap/auto_join29.q.out       |    36 +
 .../clientpositive/llap/auto_join30.q.out       |    32 +
 .../clientpositive/llap/auto_join_filters.q.out |    12 +
 .../clientpositive/llap/auto_join_nulls.q.out   |     4 +
 .../llap/auto_smb_mapjoin_14.q.out              |    80 +
 .../llap/auto_sortmerge_join_1.q.out            |    36 +
 .../llap/auto_sortmerge_join_10.q.out           |    12 +
 .../llap/auto_sortmerge_join_11.q.out           |    48 +
 .../llap/auto_sortmerge_join_12.q.out           |    16 +
 .../llap/auto_sortmerge_join_13.q.out           |   141 +-
 .../llap/auto_sortmerge_join_14.q.out           |    16 +-
 .../llap/auto_sortmerge_join_15.q.out           |    16 +-
 .../llap/auto_sortmerge_join_16.q.out           |    68 +-
 .../llap/auto_sortmerge_join_2.q.out            |    24 +
 .../llap/auto_sortmerge_join_3.q.out            |    36 +
 .../llap/auto_sortmerge_join_4.q.out            |    36 +
 .../llap/auto_sortmerge_join_5.q.out            |    18 +
 .../llap/auto_sortmerge_join_6.q.out            |    80 +
 .../llap/auto_sortmerge_join_7.q.out            |    42 +
 .../llap/auto_sortmerge_join_8.q.out            |    42 +
 .../llap/auto_sortmerge_join_9.q.out            |   146 +
 .../results/clientpositive/llap/bucket2.q.out   |     8 +
 .../results/clientpositive/llap/bucket3.q.out   |    10 +
 .../results/clientpositive/llap/bucket4.q.out   |     8 +
 .../results/clientpositive/llap/bucket5.q.out   |     6 +
 .../results/clientpositive/llap/bucket6.q.out   |    12 +
 .../clientpositive/llap/bucket_groupby.q.out    |   330 +-
 .../clientpositive/llap/bucket_many.q.out       |     8 +
 .../llap/bucket_map_join_tez2.q.out             |   303 +-
 .../llap/bucket_map_join_tez_empty.q.out        |     6 +
 .../llap/bucket_num_reducers.q.out              |     4 +
 .../llap/bucket_num_reducers2.q.out             |     4 +
 .../clientpositive/llap/bucketmapjoin1.q.out    |    28 +
 .../clientpositive/llap/bucketmapjoin2.q.out    |    32 +
 .../clientpositive/llap/bucketmapjoin3.q.out    |    20 +
 .../clientpositive/llap/bucketmapjoin4.q.out    |     8 +
 .../clientpositive/llap/bucketmapjoin7.q.out    |    10 +
 .../clientpositive/llap/bucketpruning1.q.out    |   108 +
 .../llap/bucketsortoptimize_insert_2.q.out      |    64 +
 .../llap/bucketsortoptimize_insert_6.q.out      |    70 +
 .../llap/bucketsortoptimize_insert_7.q.out      |    30 +
 .../results/clientpositive/llap/cbo_limit.q.out |     4 +-
 .../clientpositive/llap/cbo_rp_limit.q.out      |     4 +-
 .../clientpositive/llap/cbo_rp_views.q.out      |     2 +-
 .../clientpositive/llap/cbo_simple_select.q.out |    36 +
 .../results/clientpositive/llap/cbo_views.q.out |     2 +-
 .../clientpositive/llap/check_constraint.q.out  |   126 +-
 .../results/clientpositive/llap/cluster.q.out   |   430 +-
 .../llap/colstats_date_min_max.q.out            |    12 +
 .../columnStatsUpdateForStatsOptimizer_1.q.out  |    48 +
 .../llap/column_access_stats.q.out              |    21 +
 .../llap/column_table_stats.q.out               |    44 +
 .../llap/column_table_stats_orc.q.out           |    30 +
 .../clientpositive/llap/constprog_dpp.q.out     |     6 +
 .../llap/constprog_semijoin.q.out               |    52 +
 .../llap/constraints_optimization.q.out         |  2010 ++
 .../llap/convert_decimal64_to_decimal.q.out     |    12 +
 .../llap/correlationoptimizer1.q.out            |   222 +-
 .../llap/correlationoptimizer2.q.out            |   148 +-
 .../llap/correlationoptimizer3.q.out            |    36 +
 .../llap/correlationoptimizer4.q.out            |   104 +
 .../llap/correlationoptimizer6.q.out            |   108 +
 .../results/clientpositive/llap/count.q.out     |    48 +
 .../llap/count_dist_rewrite.q.out               |    36 +
 .../clientpositive/llap/cross_join.q.out        |    24 +
 .../clientpositive/llap/cross_prod_1.q.out      |    44 +
 .../clientpositive/llap/cross_prod_3.q.out      |     6 +
 .../clientpositive/llap/cross_prod_4.q.out      |     4 +
 .../llap/cross_product_check_1.q.out            |    30 +
 .../llap/cross_product_check_2.q.out            |    30 +
 .../test/results/clientpositive/llap/ctas.q.out |    30 +
 .../results/clientpositive/llap/cte_1.q.out     | 24946 +++++++++--------
 .../results/clientpositive/llap/cte_3.q.out     |    12 +
 .../results/clientpositive/llap/cte_5.q.out     |     6 +
 .../results/clientpositive/llap/cte_mat_1.q.out |     4 +
 .../results/clientpositive/llap/cte_mat_2.q.out |     4 +
 .../results/clientpositive/llap/cte_mat_3.q.out |     4 +
 .../results/clientpositive/llap/cte_mat_4.q.out |     8 +
 .../results/clientpositive/llap/cte_mat_5.q.out |     6 +
 .../test/results/clientpositive/llap/cttl.q.out |     4 +-
 .../llap/current_date_timestamp.q.out           |     4 +
 .../results/clientpositive/llap/dec_str.q.out   |    20 +
 .../llap/default_constraint.q.out               |    72 +
 .../clientpositive/llap/deleteAnalyze.q.out     |     4 +
 .../llap/disable_merge_for_bucketing.q.out      |     8 +
 .../clientpositive/llap/dp_counter_mm.q.out     |    16 +-
 .../clientpositive/llap/dp_counter_non_mm.q.out |    16 +-
 .../test/results/clientpositive/llap/dpp.q.out  |    20 +
 .../llap/dynamic_partition_pruning.q.out        |   558 +
 .../llap/dynamic_partition_pruning_2.q.out      |    80 +
 .../llap/dynamic_semijoin_reduction.q.out       |   350 +
 .../llap/dynamic_semijoin_reduction_2.q.out     |    12 +
 .../llap/dynamic_semijoin_reduction_3.q.out     |    30 +
 .../llap/dynamic_semijoin_reduction_4.q.out     |    78 +
 .../llap/dynamic_semijoin_reduction_sw.q.out    |    14 +
 .../llap/dynamic_semijoin_reduction_sw2.q.out   |    14 +
 .../llap/dynamic_semijoin_user_level.q.out      |   210 +
 .../llap/dynpart_sort_opt_vectorization.q.out   |   124 +-
 .../llap/dynpart_sort_optimization.q.out        |   555 +-
 .../llap/dynpart_sort_optimization2.q.out       |    32 +-
 .../llap/dynpart_sort_optimization_acid.q.out   |   134 +-
 .../clientpositive/llap/empty_join.q.out        |     8 +
 .../llap/enforce_constraint_notnull.q.out       |   152 +
 .../clientpositive/llap/except_distinct.q.out   |    16 +-
 .../clientpositive/llap/explainanalyze_2.q.out  |   118 +
 .../clientpositive/llap/explainuser_1.q.out     |   756 +-
 .../clientpositive/llap/explainuser_2.q.out     |   212 +
 .../clientpositive/llap/explainuser_4.q.out     |    28 +
 .../llap/external_jdbc_auth.q.out               |   283 +
 .../llap/external_jdbc_table.q.out              |   536 +
 .../llap/external_jdbc_table2.q.out             |   604 +
 .../llap/external_jdbc_table_partition.q.out    |   319 +
 .../external_jdbc_table_typeconversion.q.out    |   280 +
 .../extrapolate_part_stats_partial_ndv.q.out    |    58 +-
 .../llap/filter_join_breaktask.q.out            |     6 +
 .../clientpositive/llap/filter_union.q.out      |    16 +
 .../llap/fullouter_mapjoin_1_optimized.q.out    |    48 +
 .../results/clientpositive/llap/groupby1.q.out  |     4 +
 .../results/clientpositive/llap/groupby2.q.out  |     4 +
 .../results/clientpositive/llap/groupby3.q.out  |     4 +
 .../llap/groupby_groupingset_bug.q.out          |    12 +
 .../llap/groupby_resolution.q.out               |    40 +
 .../llap/groupby_rollup_empty.q.out             |     4 +
 .../results/clientpositive/llap/having.q.out    |    24 +
 .../llap/hybridgrace_hashjoin_1.q.out           |    64 +
 .../llap/hybridgrace_hashjoin_2.q.out           |   132 +-
 .../llap/identity_project_remove_skip.q.out     |     4 +
 .../results/clientpositive/llap/insert1.q.out   |    22 +
 .../llap/insert1_overwrite_partitions.q.out     |    18 +
 .../clientpositive/llap/insert_into1.q.out      |    40 +
 .../clientpositive/llap/insert_into2.q.out      |    34 +
 .../llap/insert_into_default_keyword.q.out      |   243 +-
 .../insert_values_orig_table_use_metadata.q.out |    30 +
 .../clientpositive/llap/intersect_all.q.out     |  1036 +-
 .../llap/intersect_distinct.q.out               |   546 +-
 .../clientpositive/llap/intersect_merge.q.out   |    48 +
 .../clientpositive/llap/is_distinct_from.q.out  |    24 +
 .../clientpositive/llap/jdbc_handler.q.out      |    24 +-
 .../results/clientpositive/llap/join0.q.out     |     7 +
 .../results/clientpositive/llap/join1.q.out     |     4 +
 .../clientpositive/llap/join32_lessSize.q.out   |   923 +-
 .../results/clientpositive/llap/join46.q.out    |   150 +-
 .../llap/join_constraints_optimization.q.out    |    76 +
 .../llap/join_emit_interval.q.out               |    16 +-
 .../llap/join_is_not_distinct_from.q.out        |    24 +
 .../llap/join_max_hashtable.q.out               |   129 +-
 .../clientpositive/llap/join_nullsafe.q.out     |    24 +
 .../llap/join_reordering_no_stats.q.out         |    56 +
 .../clientpositive/llap/kill_query.q.out        |     2 +
 .../test/results/clientpositive/llap/kryo.q.out |     4 +
 .../clientpositive/llap/lateral_view.q.out      |    30 +-
 .../clientpositive/llap/leftsemijoin.q.out      |     8 +
 .../llap/limit_join_transpose.q.out             |   108 +-
 .../clientpositive/llap/limit_pushdown.q.out    |    56 +
 .../clientpositive/llap/limit_pushdown3.q.out   |    52 +
 .../results/clientpositive/llap/lineage2.q.out  |    28 +-
 .../results/clientpositive/llap/lineage3.q.out  |     2 +-
 .../llap/list_bucket_dml_10.q.out               |     4 +
 .../results/clientpositive/llap/llap_acid.q.out |    34 +
 .../clientpositive/llap/llap_acid_fast.q.out    |    34 +
 .../llap/llap_decimal64_reader.q.out            |    12 +-
 .../clientpositive/llap/llap_nullscan.q.out     |    16 +
 .../clientpositive/llap/llap_partitioned.q.out  |   294 +-
 .../results/clientpositive/llap/llap_smb.q.out  |    88 +-
 .../clientpositive/llap/llap_smb_ptf.q.out      |    20 +-
 .../clientpositive/llap/llap_stats.q.out        |    50 +-
 .../results/clientpositive/llap/llap_udf.q.out  |    24 +
 .../clientpositive/llap/llap_uncompressed.q.out |     8 +
 .../llap/llap_vector_nohybridgrace.q.out        |     8 +
 .../clientpositive/llap/llapdecider.q.out       |    68 +
 .../llap/load_data_using_job.q.out              |  3596 +--
 .../clientpositive/llap/load_dyn_part1.q.out    |    12 +
 .../clientpositive/llap/load_dyn_part2.q.out    |    11 +
 .../clientpositive/llap/load_dyn_part3.q.out    |    11 +
 .../clientpositive/llap/load_dyn_part5.q.out    |    63 +-
 .../clientpositive/llap/lvj_mapjoin.q.out       |     6 +
 .../results/clientpositive/llap/mapjoin2.q.out  |    28 +
 .../results/clientpositive/llap/mapjoin3.q.out  |     6 +
 .../results/clientpositive/llap/mapjoin46.q.out |   190 +-
 .../clientpositive/llap/mapjoin_decimal.q.out   |     6 +
 .../llap/mapjoin_emit_interval.q.out            |    16 +-
 .../clientpositive/llap/mapjoin_hint.q.out      |    40 +
 .../clientpositive/llap/mapjoin_mapjoin.q.out   |    46 +
 .../clientpositive/llap/mapreduce1.q.out        |     4 +
 .../clientpositive/llap/mapreduce2.q.out        |     4 +
 .../llap/materialized_view_create.q.out         |     2 +-
 .../llap/materialized_view_create_rewrite.q.out |    24 +
 .../materialized_view_create_rewrite_2.q.out    |    46 +-
 .../materialized_view_create_rewrite_3.q.out    |    66 +
 .../materialized_view_create_rewrite_4.q.out    |    88 +
 .../materialized_view_create_rewrite_5.q.out    |    62 +
 ...materialized_view_create_rewrite_dummy.q.out |    24 +
 ...erialized_view_create_rewrite_multi_db.q.out |     6 +
 ...ized_view_create_rewrite_rebuild_dummy.q.out |    66 +
 ...alized_view_create_rewrite_time_window.q.out |    42 +
 .../llap/materialized_view_describe.q.out       |     2 +-
 .../llap/materialized_view_partitioned.q.out    |    95 +
 .../llap/materialized_view_partitioned_2.q.out  |    58 +
 .../llap/materialized_view_partitioned_3.q.out  |     9 +-
 .../llap/materialized_view_rewrite_1.q.out      |    74 +-
 .../llap/materialized_view_rewrite_10.q.out     |    24 +
 .../llap/materialized_view_rewrite_2.q.out      |    50 +
 .../llap/materialized_view_rewrite_3.q.out      |    34 +
 .../llap/materialized_view_rewrite_4.q.out      |    52 +
 .../llap/materialized_view_rewrite_5.q.out      |   102 +
 .../llap/materialized_view_rewrite_6.q.out      |    44 +
 .../llap/materialized_view_rewrite_7.q.out      |   254 +-
 .../llap/materialized_view_rewrite_8.q.out      |    66 +
 .../llap/materialized_view_rewrite_9.q.out      |    22 +
 .../llap/materialized_view_rewrite_empty.q.out  |     6 +
 .../materialized_view_rewrite_no_join_opt.q.out |    36 +
 ...aterialized_view_rewrite_no_join_opt_2.q.out |    84 +
 .../llap/materialized_view_rewrite_part_1.q.out |    84 +
 .../llap/materialized_view_rewrite_part_2.q.out |    68 +
 .../llap/materialized_view_rewrite_ssb.q.out    |   150 +
 .../llap/materialized_view_rewrite_ssb_2.q.out  |   150 +
 .../results/clientpositive/llap/merge1.q.out    |    20 +
 .../results/clientpositive/llap/merge2.q.out    |    20 +
 .../results/clientpositive/llap/mergejoin.q.out |   120 +
 .../llap/metadata_only_queries.q.out            |    70 +
 .../metadata_only_queries_with_filters.q.out    |     8 +
 .../clientpositive/llap/metadataonly1.q.out     |    72 +
 .../results/clientpositive/llap/mm_all.q.out    |    10 +
 .../results/clientpositive/llap/mm_bhif.q.out   |     6 +
 .../results/clientpositive/llap/mm_dp.q.out     |  4695 ++++
 .../test/results/clientpositive/llap/mrr.q.out  |    20 +
 .../clientpositive/llap/multiMapJoin1.q.out     |   420 +-
 .../clientpositive/llap/multiMapJoin2.q.out     |    56 +
 .../clientpositive/llap/multi_column_in.q.out   |    12 +
 .../llap/multi_column_in_single.q.out           |    12 +
 .../llap/multi_count_distinct_null.q.out        |    20 +-
 .../clientpositive/llap/multi_insert.q.out      |    88 +
 .../llap/multi_insert_lateral_view.q.out        |    38 +
 .../llap/murmur_hash_migration.q.out            |    32 +
 .../llap/nonmr_fetch_threshold.q.out            |    58 +
 .../clientpositive/llap/offset_limit.q.out      |     4 +
 .../llap/offset_limit_ppd_optimizer.q.out       |    56 +
 .../clientpositive/llap/optimize_join_ptp.q.out |     6 +
 .../clientpositive/llap/optimize_nullscan.q.out |    64 +
 .../clientpositive/llap/orc_analyze.q.out       |     6 +-
 .../results/clientpositive/llap/orc_llap.q.out  |    44 +
 .../clientpositive/llap/orc_llap_counters.q.out |     2 +-
 .../llap/orc_llap_counters1.q.out               |     2 +-
 .../llap/orc_llap_nonvector.q.out               |    12 +
 .../clientpositive/llap/orc_merge1.q.out        |   196 +-
 .../clientpositive/llap/orc_merge10.q.out       |   351 +-
 .../clientpositive/llap/orc_merge2.q.out        |    63 +-
 .../clientpositive/llap/orc_merge3.q.out        |     8 +
 .../clientpositive/llap/orc_merge4.q.out        |     8 +
 .../clientpositive/llap/orc_merge5.q.out        |    12 +
 .../clientpositive/llap/orc_merge6.q.out        |    12 +
 .../clientpositive/llap/orc_merge7.q.out        |   118 +-
 .../clientpositive/llap/orc_merge_diff_fs.q.out |   185 +-
 .../llap/orc_merge_incompat1.q.out              |     4 +
 .../llap/orc_merge_incompat2.q.out              |    61 +-
 .../clientpositive/llap/orc_ppd_date.q.out      |    40 +-
 .../llap/orc_predicate_pushdown.q.out           |    48 +
 .../llap/orc_struct_type_vectorization.q.out    |     8 +
 .../results/clientpositive/llap/parallel.q.out  |     6 +
 .../clientpositive/llap/parallel_colstats.q.out |     6 +
 .../parquet_complex_types_vectorization.q.out   |    24 +
 .../llap/parquet_map_type_vectorization.q.out   |     8 +
 .../llap/parquet_predicate_pushdown.q.out       |    52 +
 .../parquet_struct_type_vectorization.q.out     |     8 +
 .../clientpositive/llap/parquet_types.q.out     |     2 +-
 .../llap/parquet_types_vectorization.q.out      |    30 +-
 .../clientpositive/llap/partialdhj.q.out        |    12 +
 .../clientpositive/llap/partition_ctas.q.out    |   159 +
 .../llap/partition_multilevels.q.out            |   244 +-
 .../clientpositive/llap/partition_pruning.q.out |    22 +
 .../llap/partition_shared_scan.q.out            |    18 +
 .../clientpositive/llap/ppd_union_view.q.out    |    26 +
 .../test/results/clientpositive/llap/ptf.q.out  |    96 +
 .../clientpositive/llap/ptf_matchpath.q.out     |    12 +
 .../clientpositive/llap/ptf_streaming.q.out     |    48 +
 .../llap/q93_with_constraints.q.out             |     8 +
 .../clientpositive/llap/quotedid_smb.q.out      |     6 +
 .../clientpositive/llap/rcfile_createas1.q.out  |    10 +
 .../clientpositive/llap/rcfile_merge2.q.out     |     3 +
 .../clientpositive/llap/rcfile_merge3.q.out     |     8 +
 .../clientpositive/llap/rcfile_merge4.q.out     |     8 +
 .../llap/reduce_deduplicate.q.out               |     8 +
 .../llap/reduce_deduplicate_distinct.q.out      |    20 +
 .../llap/reduce_deduplicate_extended.q.out      |   100 +-
 .../results/clientpositive/llap/reopt_dpp.q.out |    20 +
 .../clientpositive/llap/reopt_semijoin.q.out    |    12 +
 .../clientpositive/llap/resourceplan.q.out      |    96 +-
 .../clientpositive/llap/results_cache_1.q.out   |    38 +-
 .../clientpositive/llap/results_cache_2.q.out   |    18 +
 .../llap/results_cache_capacity.q.out           |    18 +
 .../llap/results_cache_diff_fs.q.out            |     6 +
 .../llap/results_cache_empty_result.q.out       |     6 +
 .../llap/results_cache_invalidation.q.out       |    46 +
 .../llap/results_cache_invalidation2.q.out      |    20 +
 .../llap/results_cache_lifetime.q.out           |     4 +
 .../llap/results_cache_quoted_identifiers.q.out |     6 +
 .../llap/results_cache_temptable.q.out          |    18 +
 .../llap/results_cache_transactional.q.out      |    36 +
 .../llap/results_cache_truncate.q.out           |    28 +
 .../llap/results_cache_with_masking.q.out       |    12 +-
 .../llap/retry_failure_stat_changes.q.out       |    24 +
 .../clientpositive/llap/runtime_stats_hs2.q.out |    12 +
 .../llap/runtime_stats_merge.q.out              |     8 +
 .../results/clientpositive/llap/sample1.q.out   |     6 +
 .../results/clientpositive/llap/sample10.q.out  |    12 +
 .../clientpositive/llap/sample10_mm.q.out       |    24 +
 .../llap/schema_evol_orc_acid_part.q.out        |     6 +
 .../schema_evol_orc_acid_part_llap_io.q.out     |     6 +
 .../llap/schema_evol_orc_acid_table.q.out       |     4 +
 .../schema_evol_orc_acid_table_llap_io.q.out    |     4 +
 .../schema_evol_orc_acidvec_part_llap_io.q.out  |    84 +
 .../llap/schema_evol_orc_acidvec_table.q.out    |    56 +
 .../schema_evol_orc_acidvec_table_llap_io.q.out |    56 +
 .../llap/schema_evol_orc_nonvec_part.q.out      |    60 +-
 ...chema_evol_orc_nonvec_part_all_complex.q.out |    24 +
 ...ol_orc_nonvec_part_all_complex_llap_io.q.out |    24 +
 ...ema_evol_orc_nonvec_part_all_primitive.q.out |    38 +-
 ..._orc_nonvec_part_all_primitive_llap_io.q.out |    38 +-
 .../schema_evol_orc_nonvec_part_llap_io.q.out   |    60 +-
 .../llap/schema_evol_orc_nonvec_table.q.out     |    20 +
 .../schema_evol_orc_nonvec_table_llap_io.q.out  |    20 +
 .../llap/schema_evol_orc_vec_part.q.out         |    60 +-
 .../schema_evol_orc_vec_part_all_complex.q.out  |    24 +
 ..._evol_orc_vec_part_all_complex_llap_io.q.out |    24 +
 ...schema_evol_orc_vec_part_all_primitive.q.out |    38 +-
 ...vol_orc_vec_part_all_primitive_llap_io.q.out |    38 +-
 .../llap/schema_evol_orc_vec_table.q.out        |    20 +
 .../schema_evol_orc_vec_table_llap_io.q.out     |    20 +
 .../clientpositive/llap/schema_evol_stats.q.out |     8 +
 .../llap/schema_evol_text_nonvec_part.q.out     |    60 +-
 ...hema_evol_text_nonvec_part_all_complex.q.out |    24 +
 ...l_text_nonvec_part_all_complex_llap_io.q.out |    24 +
 ...ma_evol_text_nonvec_part_all_primitive.q.out |    38 +-
 ...text_nonvec_part_all_primitive_llap_io.q.out |    74 +-
 .../schema_evol_text_nonvec_part_llap_io.q.out  |    60 +-
 .../llap/schema_evol_text_nonvec_table.q.out    |    20 +
 .../schema_evol_text_nonvec_table_llap_io.q.out |    20 +
 .../llap/schema_evol_text_vec_part.q.out        |    60 +-
 .../schema_evol_text_vec_part_all_complex.q.out |    24 +
 ...evol_text_vec_part_all_complex_llap_io.q.out |    50 +
 ...chema_evol_text_vec_part_all_primitive.q.out |    38 +-
 ...ol_text_vec_part_all_primitive_llap_io.q.out |    74 +-
 .../schema_evol_text_vec_part_llap_io.q.out     |    60 +-
 .../llap/schema_evol_text_vec_table.q.out       |    20 +
 .../schema_evol_text_vec_table_llap_io.q.out    |    62 +-
 .../llap/schema_evol_text_vecrow_part.q.out     |    60 +-
 ...hema_evol_text_vecrow_part_all_complex.q.out |    24 +
 ...l_text_vecrow_part_all_complex_llap_io.q.out |    42 +
 ...ma_evol_text_vecrow_part_all_primitive.q.out |    38 +-
 ...text_vecrow_part_all_primitive_llap_io.q.out |    74 +-
 .../schema_evol_text_vecrow_part_llap_io.q.out  |   120 +-
 .../llap/schema_evol_text_vecrow_table.q.out    |    20 +
 .../schema_evol_text_vecrow_table_llap_io.q.out |    72 +-
 .../llap/selectDistinctStar.q.out               |    40 +
 .../llap/select_dummy_source.q.out              |    28 +
 .../results/clientpositive/llap/semijoin.q.out  |   148 +
 .../results/clientpositive/llap/semijoin6.q.out |    40 +
 .../results/clientpositive/llap/semijoin7.q.out |    40 +
 .../clientpositive/llap/semijoin_hint.q.out     |   316 +
 .../clientpositive/llap/sharedworkext.q.out     |     8 +
 .../results/clientpositive/llap/skewjoin.q.out  |    46 +
 .../clientpositive/llap/skewjoinopt15.q.out     |    24 +
 .../clientpositive/llap/skiphf_aggr.q.out       |     6 +-
 .../results/clientpositive/llap/smb_cache.q.out |    12 +
 .../clientpositive/llap/smb_mapjoin_14.q.out    |    70 +
 .../clientpositive/llap/smb_mapjoin_15.q.out    |    24 +
 .../clientpositive/llap/smb_mapjoin_17.q.out    |    68 +
 .../clientpositive/llap/smb_mapjoin_18.q.out    |    18 +
 .../clientpositive/llap/smb_mapjoin_19.q.out    |     6 +
 .../clientpositive/llap/smb_mapjoin_4.q.out     |   104 +
 .../clientpositive/llap/smb_mapjoin_5.q.out     |   104 +
 .../clientpositive/llap/smb_mapjoin_6.q.out     |    30 +
 .../results/clientpositive/llap/sqlmerge.q.out  |    18 +
 .../clientpositive/llap/sqlmerge_stats.q.out    |  2075 +-
 .../results/clientpositive/llap/stats11.q.out   |    20 +
 .../llap/stats_based_fetch_decision.q.out       |    32 +
 .../clientpositive/llap/stats_date.q.out        |    12 +
 .../clientpositive/llap/stats_noscan_1.q.out    |    20 +
 .../llap/stats_only_external.q.out              |    16 +
 .../clientpositive/llap/stats_only_null.q.out   |    20 +
 .../clientpositive/llap/subquery_corr.q.out     |    12 +
 .../clientpositive/llap/subquery_exists.q.out   |    28 +
 .../clientpositive/llap/subquery_in.q.out       |   204 +-
 .../llap/subquery_in_having.q.out               |    32 +
 .../clientpositive/llap/subquery_multi.q.out    |   110 +-
 .../clientpositive/llap/subquery_notin.q.out    |   532 +-
 .../clientpositive/llap/subquery_null_agg.q.out |     4 +
 .../clientpositive/llap/subquery_scalar.q.out   |   280 +-
 .../clientpositive/llap/subquery_select.q.out   |   244 +-
 .../clientpositive/llap/subquery_views.q.out    |     6 +
 .../results/clientpositive/llap/sysdb.q.out     |    18 +-
 .../clientpositive/llap/temp_table.q.out        |    22 +
 .../llap/tez_bmj_schema_evolution.q.out         |    10 +
 .../results/clientpositive/llap/tez_dml.q.out   |    75 +-
 .../llap/tez_dynpart_hashjoin_1.q.out           |    28 +
 .../llap/tez_dynpart_hashjoin_2.q.out           |    18 +
 .../llap/tez_dynpart_hashjoin_3.q.out           |    24 +-
 .../llap/tez_fixed_bucket_pruning.q.out         |    56 +-
 .../llap/tez_input_counters.q.out               |   388 +-
 .../results/clientpositive/llap/tez_join.q.out  |     6 +
 .../clientpositive/llap/tez_join_hash.q.out     |    20 +
 .../llap/tez_join_result_complex.q.out          |    16 +
 .../clientpositive/llap/tez_join_tests.q.out    |    18 +-
 .../clientpositive/llap/tez_joins_explain.q.out |    18 +-
 .../clientpositive/llap/tez_nway_join.q.out     |    24 +
 .../clientpositive/llap/tez_self_join.q.out     |     6 +
 .../clientpositive/llap/tez_smb_empty.q.out     |    48 +-
 .../clientpositive/llap/tez_smb_main.q.out      |   154 +
 .../llap/tez_smb_reduce_side.q.out              |    32 +-
 .../results/clientpositive/llap/tez_union.q.out |    40 +
 .../clientpositive/llap/tez_union2.q.out        |   632 +-
 .../llap/tez_union_dynamic_partition.q.out      |     3 +
 .../llap/tez_union_dynamic_partition_2.q.out    |     3 +
 .../llap/tez_union_group_by.q.out               |    10 +
 .../llap/tez_union_multiinsert.q.out            |    30 +
 .../llap/tez_vector_dynpart_hashjoin_1.q.out    |    24 +
 .../llap/tez_vector_dynpart_hashjoin_2.q.out    |    18 +
 .../results/clientpositive/llap/topnkey.q.out   |    12 +
 .../llap/udaf_collect_set_2.q.out               |    60 +-
 .../clientpositive/llap/udf_coalesce.q.out      |     8 +
 .../results/clientpositive/llap/union2.q.out    |     4 +
 .../results/clientpositive/llap/union3.q.out    |     4 +
 .../results/clientpositive/llap/union4.q.out    |     4 +
 .../results/clientpositive/llap/union5.q.out    |     4 +
 .../results/clientpositive/llap/union6.q.out    |     6 +
 .../results/clientpositive/llap/union7.q.out    |     6 +
 .../results/clientpositive/llap/union8.q.out    |     4 +
 .../results/clientpositive/llap/union9.q.out    |     4 +
 .../clientpositive/llap/unionDistinct_1.q.out   |   296 +-
 .../clientpositive/llap/unionDistinct_3.q.out   |   784 +-
 .../llap/union_assertion_type.q.out             |    20 +
 .../clientpositive/llap/union_remove_26.q.out   |    40 +
 .../clientpositive/llap/union_top_level.q.out   |    28 +
 .../clientpositive/llap/vector_acid4.q.out      |     4 +
 .../llap/vector_adaptor_usage_mode.q.out        |    48 +
 .../llap/vector_aggregate_9.q.out               |    54 +-
 .../llap/vector_aggregate_without_gby.q.out     |     4 +
 .../llap/vector_annotate_stats_select.q.out     |   136 +
 .../llap/vector_auto_smb_mapjoin_14.q.out       |    80 +
 .../llap/vector_between_columns.q.out           |    12 +
 .../clientpositive/llap/vector_between_in.q.out |    48 +
 .../llap/vector_binary_join_groupby.q.out       |    12 +
 .../clientpositive/llap/vector_bround.q.out     |     4 +
 .../clientpositive/llap/vector_bucket.q.out     |     4 +
 .../llap/vector_case_when_1.q.out               |    48 +-
 .../llap/vector_case_when_2.q.out               |    87 +-
 .../llap/vector_case_when_conversion.q.out      |   616 +
 .../llap/vector_cast_constant.q.out             |     4 +
 .../clientpositive/llap/vector_char_2.q.out     |     8 +
 .../clientpositive/llap/vector_char_4.q.out     |     4 +
 .../llap/vector_char_mapjoin1.q.out             |    16 +
 .../llap/vector_char_simple.q.out               |    12 +
 .../llap/vector_char_varchar_1.q.out            |    12 +
 .../clientpositive/llap/vector_coalesce.q.out   |    40 +-
 .../clientpositive/llap/vector_coalesce_2.q.out |    44 +-
 .../clientpositive/llap/vector_coalesce_3.q.out |    16 +-
 .../clientpositive/llap/vector_coalesce_4.q.out |    14 +-
 .../llap/vector_complex_all.q.out               |    58 +-
 .../llap/vector_complex_join.q.out              |    18 +
 .../clientpositive/llap/vector_count.q.out      |    16 +
 .../llap/vector_count_distinct.q.out            |    82 +-
 .../llap/vector_create_struct_table.q.out       |    12 +
 .../clientpositive/llap/vector_data_types.q.out |    12 +
 .../clientpositive/llap/vector_date_1.q.out     |    96 +-
 .../clientpositive/llap/vector_decimal_1.q.out  |    36 +
 .../llap/vector_decimal_10_0.q.out              |     8 +
 .../clientpositive/llap/vector_decimal_2.q.out  |   108 +
 .../clientpositive/llap/vector_decimal_5.q.out  |     4 +
 .../clientpositive/llap/vector_decimal_6.q.out  |    20 +
 .../llap/vector_decimal_aggregate.q.out         |    16 +
 .../llap/vector_decimal_cast.q.out              |     8 +
 .../llap/vector_decimal_expressions.q.out       |    10 +-
 .../llap/vector_decimal_mapjoin.q.out           |    36 +
 .../llap/vector_decimal_math_funcs.q.out        |     8 +
 .../llap/vector_decimal_precision.q.out         |     8 +
 .../llap/vector_decimal_round.q.out             |    24 +
 .../llap/vector_decimal_round_2.q.out           |    16 +
 .../llap/vector_decimal_trailing.q.out          |     4 +
 .../llap/vector_decimal_udf.q.out               |   264 +
 .../llap/vector_decimal_udf2.q.out              |    16 +
 .../clientpositive/llap/vector_distinct_2.q.out |    18 +-
 .../clientpositive/llap/vector_elt.q.out        |     8 +
 .../llap/vector_full_outer_join.q.out           |    48 +
 .../llap/vector_fullouter_mapjoin_1_fast.q.out  |    48 +
 .../vector_fullouter_mapjoin_1_optimized.q.out  |    48 +
 ...fullouter_mapjoin_1_optimized_passthru.q.out |    48 +
 .../clientpositive/llap/vector_groupby4.q.out   |     4 +
 .../clientpositive/llap/vector_groupby6.q.out   |     4 +
 .../clientpositive/llap/vector_groupby_3.q.out  |    18 +-
 .../llap/vector_groupby_cube1.q.out             |    30 +
 .../llap/vector_groupby_grouping_id1.q.out      |    24 +
 .../llap/vector_groupby_grouping_id2.q.out      |    36 +
 .../llap/vector_groupby_grouping_id3.q.out      |     8 +
 .../llap/vector_groupby_grouping_sets1.q.out    |    28 +
 .../llap/vector_groupby_grouping_sets2.q.out    |    16 +
 .../llap/vector_groupby_grouping_sets3.q.out    |    12 +
 .../vector_groupby_grouping_sets3_dec.q.out     |    12 +
 .../llap/vector_groupby_grouping_sets4.q.out    |    12 +
 .../llap/vector_groupby_grouping_sets5.q.out    |    12 +
 .../llap/vector_groupby_grouping_sets6.q.out    |     8 +
 .../vector_groupby_grouping_sets_grouping.q.out |    60 +
 .../vector_groupby_grouping_sets_limit.q.out    |    24 +
 .../llap/vector_groupby_grouping_window.q.out   |     4 +
 .../llap/vector_groupby_mapjoin.q.out           |    16 +-
 .../llap/vector_groupby_reduce.q.out            |    16 +
 .../llap/vector_groupby_rollup1.q.out           |    22 +
 .../llap/vector_groupby_sort_11.q.out           |    42 +
 .../llap/vector_groupby_sort_8.q.out            |     6 +
 .../llap/vector_grouping_sets.q.out             |    16 +-
 .../clientpositive/llap/vector_if_expr.q.out    |     4 +
 .../clientpositive/llap/vector_if_expr_2.q.out  |     4 +
 .../llap/vector_include_no_sel.q.out            |     6 +
 .../clientpositive/llap/vector_inner_join.q.out |    54 +
 .../clientpositive/llap/vector_interval_1.q.out |   112 +-
 .../clientpositive/llap/vector_interval_2.q.out |   152 +-
 .../llap/vector_interval_arithmetic.q.out       |    92 +-
 .../llap/vector_interval_mapjoin.q.out          |     6 +
 .../clientpositive/llap/vector_join30.q.out     |    60 +
 .../llap/vector_join_filters.q.out              |    20 +
 .../clientpositive/llap/vector_join_nulls.q.out |    20 +
 .../llap/vector_left_outer_join.q.out           |     4 +
 .../llap/vector_left_outer_join2.q.out          |    36 +
 .../llap/vector_leftsemi_mapjoin.q.out          |   872 +
 .../clientpositive/llap/vector_like_2.q.out     |     4 +
 .../llap/vector_llap_io_data_conversion.q.out   |     4 +
 .../llap/vector_llap_text_1.q.out               |    10 +
 .../clientpositive/llap/vector_map_order.q.out  |     4 +
 .../llap/vector_mapjoin_complex_values.q.out    |   355 +
 .../llap/vector_mapjoin_reduce.q.out            |     8 +
 .../llap/vector_mr_diff_schema_alias.q.out      |     8 +
 .../llap/vector_multi_insert.q.out              |     8 +
 .../clientpositive/llap/vector_null_map.q.out   |     8 +
 .../llap/vector_null_projection.q.out           |    10 +
 .../llap/vector_nullsafe_join.q.out             |    48 +
 .../llap/vector_number_compare_projection.q.out |     8 +
 .../clientpositive/llap/vector_nvl.q.out        |    16 +
 .../llap/vector_orc_merge_incompat_schema.q.out |     8 +
 .../llap/vector_orc_nested_column_pruning.q.out |   102 +
 .../llap/vector_orc_null_check.q.out            |     4 +
 .../clientpositive/llap/vector_order_null.q.out |    44 +
 .../clientpositive/llap/vector_orderby_5.q.out  |    20 +-
 .../llap/vector_outer_join0.q.out               |    20 +-
 .../llap/vector_outer_join1.q.out               |    12 +
 .../llap/vector_outer_join2.q.out               |     4 +
 .../llap/vector_outer_join3.q.out               |     9 +
 .../llap/vector_outer_join4.q.out               |     9 +
 .../llap/vector_outer_join5.q.out               |    50 +
 .../llap/vector_outer_join6.q.out               |    14 +
 .../llap/vector_outer_reference_windowed.q.out  |    52 +
 ...ector_parquet_nested_two_level_complex.q.out |    36 +
 .../llap/vector_partition_diff_num_cols.q.out   |    40 +
 .../llap/vector_partitioned_date_time.q.out     |  3130 ++-
 .../clientpositive/llap/vector_ptf_1.q.out      |     4 +
 .../llap/vector_ptf_part_simple.q.out           |   570 +-
 .../clientpositive/llap/vector_reduce1.q.out    |    14 +-
 .../clientpositive/llap/vector_reduce2.q.out    |    14 +-
 .../clientpositive/llap/vector_reduce3.q.out    |    14 +-
 .../llap/vector_reduce_groupby_decimal.q.out    |     4 +
 .../vector_reduce_groupby_duplicate_cols.q.out  |     6 +
 .../llap/vector_retry_failure.q.out             |     4 +
 .../llap/vector_reuse_scratchcols.q.out         |     8 +
 .../llap/vector_string_concat.q.out             |    28 +-
 .../llap/vector_string_decimal.q.out            |     4 +
 .../clientpositive/llap/vector_struct_in.q.out  |    32 +
 .../clientpositive/llap/vector_topnkey.q.out    |    12 +
 .../clientpositive/llap/vector_udf1.q.out       |   116 +
 .../clientpositive/llap/vector_udf2.q.out       |    12 +
 .../llap/vector_udf_adaptor_1.q.out             |    76 +-
 .../llap/vector_udf_character_length.q.out      |    12 +
 .../clientpositive/llap/vector_udf_inline.q.out |     4 +
 .../llap/vector_udf_octet_length.q.out          |     8 +
 .../llap/vector_udf_string_to_boolean.q.out     |     4 +
 .../clientpositive/llap/vector_varchar_4.q.out  |     4 +
 .../llap/vector_varchar_mapjoin1.q.out          |    16 +
 .../llap/vector_varchar_simple.q.out            |    12 +
 .../llap/vector_when_case_null.q.out            |     4 +
 .../clientpositive/llap/vector_windowing.q.out  |   208 +
 .../llap/vector_windowing_expressions.q.out     |    82 +-
 .../llap/vector_windowing_gby.q.out             |     6 +
 .../llap/vector_windowing_gby2.q.out            |    18 +
 .../vector_windowing_multipartitioning.q.out    |    48 +-
 .../llap/vector_windowing_navfn.q.out           |    44 +
 .../llap/vector_windowing_order_null.q.out      |    32 +
 .../vector_windowing_range_multiorder.q.out     | 16386 +++++------
 .../llap/vector_windowing_rank.q.out            |    28 +
 .../llap/vector_windowing_streaming.q.out       |    22 +
 .../llap/vector_windowing_windowspec.q.out      |    44 +
 .../llap/vector_windowing_windowspec4.q.out     |     4 +
 .../clientpositive/llap/vectorization_0.q.out   |    60 +
 .../clientpositive/llap/vectorization_1.q.out   |     4 +
 .../clientpositive/llap/vectorization_10.q.out  |     4 +
 .../clientpositive/llap/vectorization_11.q.out  |     4 +
 .../clientpositive/llap/vectorization_12.q.out  |     4 +
 .../clientpositive/llap/vectorization_13.q.out  |     8 +
 .../clientpositive/llap/vectorization_14.q.out  |     4 +
 .../clientpositive/llap/vectorization_15.q.out  |     4 +
 .../clientpositive/llap/vectorization_16.q.out  |     4 +
 .../clientpositive/llap/vectorization_17.q.out  |     4 +
 .../clientpositive/llap/vectorization_2.q.out   |     4 +
 .../clientpositive/llap/vectorization_3.q.out   |     4 +
 .../clientpositive/llap/vectorization_4.q.out   |     4 +
 .../clientpositive/llap/vectorization_5.q.out   |     4 +
 .../clientpositive/llap/vectorization_6.q.out   |     4 +
 .../clientpositive/llap/vectorization_7.q.out   |     8 +
 .../clientpositive/llap/vectorization_8.q.out   |     8 +
 .../clientpositive/llap/vectorization_9.q.out   |     4 +
 .../llap/vectorization_decimal_date.q.out       |     4 +
 .../llap/vectorization_div0.q.out               |    16 +
 .../vectorization_input_format_excludes.q.out   |    40 +
 .../llap/vectorization_limit.q.out              |    28 +
 .../llap/vectorization_nested_udf.q.out         |     4 +
 .../llap/vectorization_part_project.q.out       |     8 +
 .../llap/vectorization_pushdown.q.out           |     4 +
 .../llap/vectorization_short_regress.q.out      |    80 +
 .../llap/vectorized_bucketmapjoin1.q.out        |    18 +
 .../clientpositive/llap/vectorized_case.q.out   |    52 +-
 .../clientpositive/llap/vectorized_casts.q.out  |     4 +
 .../llap/vectorized_context.q.out               |     8 +
 .../llap/vectorized_date_funcs.q.out            |    62 +-
 .../llap/vectorized_distinct_gby.q.out          |    10 +-
 .../vectorized_dynamic_partition_pruning.q.out  |   516 +
 .../vectorized_dynamic_semijoin_reduction.q.out |    42 +
 ...vectorized_dynamic_semijoin_reduction2.q.out |    48 +
 .../vectorized_insert_into_bucketed_table.q.out |     4 +
 .../clientpositive/llap/vectorized_join46.q.out |   126 +-
 .../llap/vectorized_mapjoin.q.out               |     4 +
 .../llap/vectorized_mapjoin3.q.out              |    18 +
 .../llap/vectorized_math_funcs.q.out            |     4 +
 .../llap/vectorized_multi_output_select.q.out   |     6 +
 .../llap/vectorized_nested_mapjoin.q.out        |     4 +
 .../llap/vectorized_parquet.q.out               |   124 +-
 .../llap/vectorized_parquet_types.q.out         |    24 +
 .../clientpositive/llap/vectorized_ptf.q.out    |    96 +
 .../llap/vectorized_shufflejoin.q.out           |     4 +
 .../llap/vectorized_string_funcs.q.out          |     4 +
 .../llap/vectorized_timestamp.q.out             |    20 +
 .../llap/vectorized_timestamp_funcs.q.out       |    28 +
 .../llap/vectorized_timestamp_ints_casts.q.out  |     8 +
 .../results/clientpositive/llap/windowing.q.out |     4 +
 .../clientpositive/llap/windowing_gby.q.out     |     6 +
 .../results/clientpositive/load_dyn_part1.q.out |    12 +
 .../clientpositive/load_dyn_part10.q.out        |     7 +
 .../clientpositive/load_dyn_part13.q.out        |     3 +
 .../clientpositive/load_dyn_part14.q.out        |     3 +
 .../results/clientpositive/load_dyn_part2.q.out |    11 +
 .../results/clientpositive/load_dyn_part3.q.out |    11 +
 .../results/clientpositive/load_dyn_part4.q.out |    11 +
 .../results/clientpositive/load_dyn_part8.q.out |    12 +
 .../results/clientpositive/load_dyn_part9.q.out |     7 +
 .../clientpositive/louter_join_ppr.q.out        |    40 +
 ql/src/test/results/clientpositive/macro.q.out  |    24 +
 .../results/clientpositive/manyViewJoin.q.out   |   412 +
 .../test/results/clientpositive/mapjoin1.q.out  |    24 +
 .../test/results/clientpositive/mapjoin2.q.out  |    28 +
 .../test/results/clientpositive/mapjoin3.q.out  |     6 +
 .../test/results/clientpositive/mapjoin46.q.out |   138 +
 .../test/results/clientpositive/mapjoin47.q.out |    84 +
 .../clientpositive/mapjoin_distinct.q.out       |    32 +
 .../mapjoin_filter_on_outerjoin.q.out           |    12 +
 .../clientpositive/mapjoin_mapjoin.q.out        |    46 +
 .../clientpositive/mapjoin_memcheck.q.out       |     4 +
 .../clientpositive/mapjoin_subquery.q.out       |    20 +
 .../clientpositive/mapjoin_subquery2.q.out      |     8 +
 .../clientpositive/mapjoin_test_outer.q.out     |    16 +
 .../results/clientpositive/mapreduce1.q.out     |     4 +
 .../results/clientpositive/mapreduce2.q.out     |     4 +
 .../results/clientpositive/mapreduce3.q.out     |     4 +
 .../results/clientpositive/mapreduce4.q.out     |     4 +
 .../results/clientpositive/mapreduce5.q.out     |     4 +
 .../results/clientpositive/mapreduce6.q.out     |     4 +
 .../results/clientpositive/mapreduce7.q.out     |     4 +
 .../results/clientpositive/mapreduce8.q.out     |     4 +
 .../test/results/clientpositive/masking_1.q.out |    42 +
 .../results/clientpositive/masking_10.q.out     |     8 +
 .../results/clientpositive/masking_12.q.out     |    30 +
 .../results/clientpositive/masking_13.q.out     |    10 +
 .../clientpositive/masking_1_newdb.q.out        |     8 +
 .../test/results/clientpositive/masking_2.q.out |    30 +
 .../test/results/clientpositive/masking_3.q.out |    56 +
 .../test/results/clientpositive/masking_4.q.out |    18 +
 .../test/results/clientpositive/masking_5.q.out |    12 +
 .../test/results/clientpositive/masking_6.q.out |    24 +
 .../test/results/clientpositive/masking_7.q.out |    24 +
 .../test/results/clientpositive/masking_8.q.out |    16 +
 .../test/results/clientpositive/masking_9.q.out |     4 +
 .../clientpositive/masking_disablecbo_1.q.out   |    42 +
 .../clientpositive/masking_disablecbo_2.q.out   |    30 +
 .../clientpositive/masking_disablecbo_3.q.out   |    56 +
 .../clientpositive/masking_disablecbo_4.q.out   |    18 +
 .../results/clientpositive/masking_mv.q.out     |    56 +
 ql/src/test/results/clientpositive/merge1.q.out |    20 +
 ql/src/test/results/clientpositive/merge2.q.out |    20 +
 ql/src/test/results/clientpositive/merge3.q.out |    20 +
 ql/src/test/results/clientpositive/merge4.q.out |    24 +
 .../merge_dynamic_partition.q.out               |    16 +
 .../merge_dynamic_partition2.q.out              |     7 +
 .../merge_dynamic_partition3.q.out              |    11 +
 .../merge_dynamic_partition4.q.out              |     7 +
 .../merge_dynamic_partition5.q.out              |     7 +
 .../results/clientpositive/merge_join_1.q.out   |     6 +
 .../test/results/clientpositive/mergejoin.q.out |   120 +
 .../results/clientpositive/mergejoins.q.out     |    16 +
 .../clientpositive/mergejoins_mixed.q.out       |    48 +
 .../clientpositive/metadata_only_queries.q.out  |    70 +
 .../metadata_only_queries_with_filters.q.out    |     8 +
 ql/src/test/results/clientpositive/mm_all.q.out |    10 +
 .../results/clientpositive/msck_repair_0.q.out  |     9 +
 .../results/clientpositive/msck_repair_2.q.out  |     5 +
 .../results/clientpositive/msck_repair_3.q.out  |     5 +
 .../clientpositive/msck_repair_batchsize.q.out  |     9 +
 .../clientpositive/msck_repair_drop.q.out       |   126 +
 .../clientpositive/multi_insert_distinct.q.out  |    18 +
 .../clientpositive/multi_insert_gby.q.out       |    12 +
 .../clientpositive/multi_insert_gby2.q.out      |     6 +
 .../clientpositive/multi_insert_gby3.q.out      |    26 +
 .../clientpositive/multi_insert_gby4.q.out      |     8 +
 .../clientpositive/multi_insert_mixed.q.out     |     8 +
 ...i_insert_move_tasks_share_dependencies.q.out |   136 +
 .../clientpositive/multi_insert_union_src.q.out |     8 +
 .../multi_insert_with_join2.q.out               |    60 +
 .../clientpositive/multi_join_union.q.out       |    10 +
 .../clientpositive/multigroupby_singlemr.q.out  |    32 +
 .../clientpositive/named_column_join.q.out      |     4 +
 .../clientpositive/nested_column_pruning.q.out  |   102 +
 .../test/results/clientpositive/no_hooks.q.out  |     2 +
 .../results/clientpositive/noalias_subq1.q.out  |     4 +
 .../clientpositive/nonReservedKeyWords.q.out    |    12 +
 .../nonblock_op_deduplicate.q.out               |    12 +
 .../results/clientpositive/nonmr_fetch.q.out    |   150 +
 .../clientpositive/nonmr_fetch_threshold.q.out  |    58 +
 .../nonreserved_keywords_insert_into1.q.out     |    12 +
 .../results/clientpositive/notable_alias1.q.out |     4 +
 .../results/clientpositive/notable_alias2.q.out |     4 +
 .../test/results/clientpositive/null_cast.q.out |     4 +
 .../nullability_transitive_inference.q.out      |     6 +
 .../results/clientpositive/nullformat.q.out     |     4 +
 .../results/clientpositive/nullformatCTAS.q.out |     6 +
 .../test/results/clientpositive/nullgroup.q.out |    16 +
 .../results/clientpositive/nullgroup2.q.out     |    16 +
 .../results/clientpositive/nullgroup3.q.out     |    32 +
 .../results/clientpositive/nullgroup4.q.out     |    16 +
 .../nullgroup4_multi_distinct.q.out             |     8 +
 .../results/clientpositive/nullgroup5.q.out     |     8 +
 .../results/clientpositive/nullscript.q.out     |     4 +
 .../clientpositive/num_op_type_conv.q.out       |     4 +
 .../offset_limit_global_optimizer.q.out         |    96 +
 .../results/clientpositive/optional_outer.q.out |    24 +
 .../results/clientpositive/orc_createas1.q.out  |    20 +
 .../clientpositive/orc_int_type_promotion.q.out |     4 +
 .../results/clientpositive/orc_merge1.q.out     |     9 +
 .../results/clientpositive/orc_merge10.q.out    |    13 +
 .../results/clientpositive/orc_merge2.q.out     |     3 +
 .../results/clientpositive/orc_merge3.q.out     |     8 +
 .../results/clientpositive/orc_merge4.q.out     |     8 +
 .../results/clientpositive/orc_merge5.q.out     |    12 +
 .../results/clientpositive/orc_merge6.q.out     |    12 +
 .../clientpositive/orc_merge_diff_fs.q.out      |     9 +
 .../clientpositive/orc_merge_incompat1.q.out    |     4 +
 .../clientpositive/orc_merge_incompat2.q.out    |     7 +
 .../orc_nested_column_pruning.q.out             |   102 +
 .../clientpositive/orc_ppd_str_conversion.q.out |     4 +
 .../orc_struct_type_vectorization.q.out         |     8 +
 ql/src/test/results/clientpositive/order.q.out  |     8 +
 ql/src/test/results/clientpositive/order3.q.out |    24 +
 .../clientpositive/order_by_expr_1.q.out        |    12 +
 .../results/clientpositive/outer_join_ppr.q.out |    20 +
 .../outer_reference_windowed.q.out              |    26 +
 .../test/results/clientpositive/parallel.q.out  |     6 +
 .../clientpositive/parallel_colstats.q.out      |     6 +
 .../results/clientpositive/parallel_join0.q.out |     8 +
 .../results/clientpositive/parallel_join1.q.out |     4 +
 .../clientpositive/parallel_orderby.q.out       |     6 +
 .../parquet_complex_types_vectorization.q.out   |    24 +
 .../results/clientpositive/parquet_join.q.out   |    18 +
 .../parquet_map_type_vectorization.q.out        |     8 +
 .../clientpositive/parquet_no_row_serde.q.out   |     8 +
 .../parquet_struct_type_vectorization.q.out     |     8 +
 ..._non_dictionary_encoding_vectorization.q.out |    24 +
 .../parquet_types_vectorization.q.out           |    28 +
 .../parquet_vectorization_0.q.out               |    60 +
 .../parquet_vectorization_1.q.out               |     4 +
 .../parquet_vectorization_10.q.out              |     4 +
 .../parquet_vectorization_11.q.out              |     4 +
 .../parquet_vectorization_12.q.out              |     4 +
 .../parquet_vectorization_13.q.out              |     8 +
 .../parquet_vectorization_14.q.out              |     4 +
 .../parquet_vectorization_15.q.out              |     4 +
 .../parquet_vectorization_16.q.out              |     4 +
 .../parquet_vectorization_17.q.out              |     4 +
 .../parquet_vectorization_2.q.out               |     4 +
 .../parquet_vectorization_3.q.out               |     4 +
 .../parquet_vectorization_4.q.out               |     4 +
 .../parquet_vectorization_5.q.out               |     4 +
 .../parquet_vectorization_6.q.out               |     4 +
 .../parquet_vectorization_7.q.out               |     8 +
 .../parquet_vectorization_8.q.out               |     8 +
 .../parquet_vectorization_9.q.out               |     4 +
 .../parquet_vectorization_decimal_date.q.out    |     4 +
 .../parquet_vectorization_div0.q.out            |    12 +
 .../parquet_vectorization_limit.q.out           |    28 +
 .../parquet_vectorization_offset_limit.q.out    |     8 +
 .../parquet_vectorization_part_project.q.out    |     8 +
 .../parquet_vectorization_pushdown.q.out        |     4 +
 .../clientpositive/partial_column_stats.q.out   |     6 +
 .../clientpositive/partition_boolexpr.q.out     |    52 +
 .../partition_condition_remover.q.out           |     6 +
 .../partition_wise_fileformat2.q.out            |    20 +
 ql/src/test/results/clientpositive/pcr.q.out    |   186 +
 ql/src/test/results/clientpositive/pcs.q.out    |    86 +
 .../clientpositive/perf/spark/query1.q.out      |    10 +
 .../clientpositive/perf/spark/query10.q.out     |    16 +
 .../clientpositive/perf/spark/query11.q.out     |    10 +
 .../clientpositive/perf/spark/query12.q.out     |     8 +
 .../clientpositive/perf/spark/query13.q.out     |   234 +-
 .../clientpositive/perf/spark/query15.q.out     |    10 +
 .../clientpositive/perf/spark/query16.q.out     |    12 +
 .../clientpositive/perf/spark/query17.q.out     |    14 +
 .../clientpositive/perf/spark/query18.q.out     |    14 +
 .../clientpositive/perf/spark/query19.q.out     |    14 +
 .../clientpositive/perf/spark/query2.q.out      |     8 +
 .../clientpositive/perf/spark/query20.q.out     |     8 +
 .../clientpositive/perf/spark/query21.q.out     |    10 +
 .../clientpositive/perf/spark/query22.q.out     |    10 +
 .../clientpositive/perf/spark/query23.q.out     |    14 +
 .../clientpositive/perf/spark/query24.q.out     |   414 +-
 .../clientpositive/perf/spark/query25.q.out     |    14 +
 .../clientpositive/perf/spark/query26.q.out     |    12 +
 .../clientpositive/perf/spark/query27.q.out     |    12 +
 .../clientpositive/perf/spark/query28.q.out     |     4 +
 .../clientpositive/perf/spark/query29.q.out     |    14 +
 .../clientpositive/perf/spark/query3.q.out      |     8 +
 .../clientpositive/perf/spark/query30.q.out     |    10 +
 .../clientpositive/perf/spark/query31.q.out     |    10 +
 .../clientpositive/perf/spark/query32.q.out     |     8 +
 .../clientpositive/perf/spark/query33.q.out     |    14 +
 .../clientpositive/perf/spark/query34.q.out     |    12 +
 .../clientpositive/perf/spark/query35.q.out     |    16 +
 .../clientpositive/perf/spark/query36.q.out     |    10 +
 .../clientpositive/perf/spark/query37.q.out     |    10 +
 .../clientpositive/perf/spark/query38.q.out     |    12 +
 .../clientpositive/perf/spark/query39.q.out     |    10 +
 .../clientpositive/perf/spark/query4.q.out      |    12 +
 .../clientpositive/perf/spark/query40.q.out     |    14 +-
 .../clientpositive/perf/spark/query42.q.out     |     8 +
 .../clientpositive/perf/spark/query43.q.out     |     8 +
 .../clientpositive/perf/spark/query44.q.out     |     6 +
 .../clientpositive/perf/spark/query45.q.out     |    12 +
 .../clientpositive/perf/spark/query46.q.out     |    14 +
 .../clientpositive/perf/spark/query47.q.out     |   114 +-
 .../clientpositive/perf/spark/query48.q.out     |   134 +-
 .../clientpositive/perf/spark/query49.q.out     |    22 +-
 .../clientpositive/perf/spark/query5.q.out      |    22 +
 .../clientpositive/perf/spark/query50.q.out     |    10 +
 .../clientpositive/perf/spark/query51.q.out     |     8 +
 .../clientpositive/perf/spark/query52.q.out     |     8 +
 .../clientpositive/perf/spark/query53.q.out     |    14 +-
 .../clientpositive/perf/spark/query54.q.out     |   494 +-
 .../clientpositive/perf/spark/query55.q.out     |     8 +
 .../clientpositive/perf/spark/query56.q.out     |    14 +
 .../clientpositive/perf/spark/query57.q.out     |   114 +-
 .../clientpositive/perf/spark/query58.q.out     |    12 +
 .../clientpositive/perf/spark/query59.q.out     |     8 +
 .../clientpositive/perf/spark/query6.q.out      |    12 +
 .../clientpositive/perf/spark/query60.q.out     |    14 +
 .../clientpositive/perf/spark/query61.q.out     |    16 +
 .../clientpositive/perf/spark/query63.q.out     |    14 +-
 .../clientpositive/perf/spark/query65.q.out     |    10 +
 .../clientpositive/perf/spark/query66.q.out     |    14 +
 .../clientpositive/perf/spark/query67.q.out     |    12 +-
 .../clientpositive/perf/spark/query68.q.out     |    14 +
 .../clientpositive/perf/spark/query69.q.out     |    16 +
 .../clientpositive/perf/spark/query7.q.out      |    12 +
 .../clientpositive/perf/spark/query70.q.out     |     8 +
 .../clientpositive/perf/spark/query71.q.out     |    14 +
 .../clientpositive/perf/spark/query72.q.out     |    20 +
 .../clientpositive/perf/spark/query73.q.out     |    12 +
 .../clientpositive/perf/spark/query74.q.out     |    10 +
 .../clientpositive/perf/spark/query75.q.out     |    30 +-
 .../clientpositive/perf/spark/query76.q.out     |    12 +
 .../clientpositive/perf/spark/query77.q.out     |    24 +-
 .../clientpositive/perf/spark/query78.q.out     |    38 +-
 .../clientpositive/perf/spark/query79.q.out     |    12 +
 .../clientpositive/perf/spark/query8.q.out      |    12 +
 .../clientpositive/perf/spark/query80.q.out     |    32 +-
 .../clientpositive/perf/spark/query81.q.out     |    10 +
 .../clientpositive/perf/spark/query82.q.out     |    10 +
 .../clientpositive/perf/spark/query83.q.out     |    12 +
 .../clientpositive/perf/spark/query84.q.out     |    14 +
 .../clientpositive/perf/spark/query85.q.out     |   360 +-
 .../clientpositive/perf/spark/query86.q.out     |     8 +
 .../clientpositive/perf/spark/query87.q.out     |    12 +
 .../clientpositive/perf/spark/query88.q.out     |   314 +-
 .../clientpositive/perf/spark/query89.q.out     |   102 +-
 .../clientpositive/perf/spark/query9.q.out      |     6 +
 .../clientpositive/perf/spark/query90.q.out     |    10 +
 .../clientpositive/perf/spark/query91.q.out     |    16 +
 .../clientpositive/perf/spark/query92.q.out     |     8 +
 .../clientpositive/perf/spark/query93.q.out     |     8 +
 .../clientpositive/perf/spark/query94.q.out     |    12 +
 .../clientpositive/perf/spark/query95.q.out     |    12 +
 .../clientpositive/perf/spark/query96.q.out     |    10 +
 .../clientpositive/perf/spark/query97.q.out     |     8 +
 .../clientpositive/perf/spark/query98.q.out     |     8 +
 .../clientpositive/perf/spark/query99.q.out     |    12 +
 .../clientpositive/perf/tez/cbo_query1.q.out    |    91 +
 .../clientpositive/perf/tez/cbo_query10.q.out   |   178 +
 .../clientpositive/perf/tez/cbo_query11.q.out   |   223 +
 .../clientpositive/perf/tez/cbo_query12.q.out   |    89 +
 .../clientpositive/perf/tez/cbo_query13.q.out   |   141 +
 .../clientpositive/perf/tez/cbo_query14.q.out   |   618 +
 .../clientpositive/perf/tez/cbo_query15.q.out   |    69 +
 .../clientpositive/perf/tez/cbo_query16.q.out   |   104 +
 .../clientpositive/perf/tez/cbo_query17.q.out   |   141 +
 .../clientpositive/perf/tez/cbo_query18.q.out   |   114 +
 .../clientpositive/perf/tez/cbo_query19.q.out   |    92 +
 .../clientpositive/perf/tez/cbo_query2.q.out    |   170 +
 .../clientpositive/perf/tez/cbo_query20.q.out   |    81 +
 .../clientpositive/perf/tez/cbo_query21.q.out   |    90 +
 .../clientpositive/perf/tez/cbo_query22.q.out   |    72 +
 .../clientpositive/perf/tez/cbo_query23.q.out   |   281 +
 .../clientpositive/perf/tez/cbo_query24.q.out   |   174 +
 .../clientpositive/perf/tez/cbo_query25.q.out   |   146 +
 .../clientpositive/perf/tez/cbo_query26.q.out   |    76 +
 .../clientpositive/perf/tez/cbo_query27.q.out   |    81 +
 .../clientpositive/perf/tez/cbo_query28.q.out   |   146 +
 .../clientpositive/perf/tez/cbo_query29.q.out   |   144 +
 .../clientpositive/perf/tez/cbo_query3.q.out    |    64 +
 .../clientpositive/perf/tez/cbo_query30.q.out   |   112 +
 .../clientpositive/perf/tez/cbo_query31.q.out   |   199 +
 .../clientpositive/perf/tez/cbo_query32.q.out   |    89 +
 .../clientpositive/perf/tez/cbo_query33.q.out   |   238 +
 .../clientpositive/perf/tez/cbo_query34.q.out   |    99 +
 .../clientpositive/perf/tez/cbo_query35.q.out   |   175 +
 .../clientpositive/perf/tez/cbo_query36.q.out   |    91 +
 .../clientpositive/perf/tez/cbo_query37.q.out   |    63 +
 .../clientpositive/perf/tez/cbo_query38.q.out   |   111 +
 .../clientpositive/perf/tez/cbo_query39.q.out   |   168 +
 .../clientpositive/perf/tez/cbo_query4.q.out    |   324 +
 .../clientpositive/perf/tez/cbo_query40.q.out   |    91 +
 .../clientpositive/perf/tez/cbo_query42.q.out   |    68 +
 .../clientpositive/perf/tez/cbo_query43.q.out   |    61 +
 .../clientpositive/perf/tez/cbo_query44.q.out   |   115 +
 .../clientpositive/perf/tez/cbo_query45.q.out   |    89 +
 .../clientpositive/perf/tez/cbo_query46.q.out   |   115 +
 .../clientpositive/perf/tez/cbo_query47.q.out   |   177 +
 .../clientpositive/perf/tez/cbo_query48.q.out   |   164 +
 .../clientpositive/perf/tez/cbo_query49.q.out   |   330 +
 .../clientpositive/perf/tez/cbo_query5.q.out    |   342 +
 .../clientpositive/perf/tez/cbo_query50.q.out   |   151 +
 .../clientpositive/perf/tez/cbo_query51.q.out   |   125 +
 .../clientpositive/perf/tez/cbo_query52.q.out   |    67 +
 .../clientpositive/perf/tez/cbo_query53.q.out   |    87 +
 .../clientpositive/perf/tez/cbo_query54.q.out   |   213 +
 .../clientpositive/perf/tez/cbo_query55.q.out   |    51 +
 .../clientpositive/perf/tez/cbo_query56.q.out   |   224 +
 .../clientpositive/perf/tez/cbo_query57.q.out   |   171 +
 .../clientpositive/perf/tez/cbo_query58.q.out   |   240 +
 .../clientpositive/perf/tez/cbo_query59.q.out   |   136 +
 .../clientpositive/perf/tez/cbo_query6.q.out    |   109 +
 .../clientpositive/perf/tez/cbo_query60.q.out   |   244 +
 .../clientpositive/perf/tez/cbo_query61.q.out   |   164 +
 .../clientpositive/perf/tez/cbo_query63.q.out   |    89 +
 .../clientpositive/perf/tez/cbo_query64.q.out   |   438 +
 .../clientpositive/perf/tez/cbo_query65.q.out   |    99 +
 .../clientpositive/perf/tez/cbo_query66.q.out   |   508 +
 .../clientpositive/perf/tez/cbo_query67.q.out   |   120 +
 .../clientpositive/perf/tez/cbo_query68.q.out   |   129 +
 .../clientpositive/perf/tez/cbo_query69.q.out   |   156 +
 .../clientpositive/perf/tez/cbo_query7.q.out    |    76 +
 .../clientpositive/perf/tez/cbo_query70.q.out   |   119 +
 .../clientpositive/perf/tez/cbo_query71.q.out   |   130 +
 .../clientpositive/perf/tez/cbo_query72.q.out   |   130 +
 .../clientpositive/perf/tez/cbo_query73.q.out   |    93 +
 .../clientpositive/perf/tez/cbo_query74.q.out   |   191 +
 .../clientpositive/perf/tez/cbo_query75.q.out   |   278 +
 .../clientpositive/perf/tez/cbo_query76.q.out   |   101 +
 .../clientpositive/perf/tez/cbo_query77.q.out   |   316 +
 .../clientpositive/perf/tez/cbo_query78.q.out   |   183 +
 .../clientpositive/perf/tez/cbo_query79.q.out   |    82 +
 .../clientpositive/perf/tez/cbo_query8.q.out    |   266 +
 .../clientpositive/perf/tez/cbo_query80.q.out   |   301 +
 .../clientpositive/perf/tez/cbo_query81.q.out   |   113 +
 .../clientpositive/perf/tez/cbo_query82.q.out   |    63 +
 .../clientpositive/perf/tez/cbo_query83.q.out   |   222 +
 .../clientpositive/perf/tez/cbo_query84.q.out   |    84 +
 .../clientpositive/perf/tez/cbo_query85.q.out   |   219 +
 .../clientpositive/perf/tez/cbo_query86.q.out   |    77 +
 .../clientpositive/perf/tez/cbo_query87.q.out   |   114 +
 .../clientpositive/perf/tez/cbo_query88.q.out   |   347 +
 .../clientpositive/perf/tez/cbo_query89.q.out   |    88 +
 .../clientpositive/perf/tez/cbo_query9.q.out    |   200 +
 .../clientpositive/perf/tez/cbo_query90.q.out   |    92 +
 .../clientpositive/perf/tez/cbo_query91.q.out   |   110 +
 .../clientpositive/perf/tez/cbo_query92.q.out   |    94 +
 .../clientpositive/perf/tez/cbo_query93.q.out   |    59 +
 .../clientpositive/perf/tez/cbo_query94.q.out   |   100 +
 .../clientpositive/perf/tez/cbo_query95.q.out   |   120 +
 .../clientpositive/perf/tez/cbo_query96.q.out   |    61 +
 .../clientpositive/perf/tez/cbo_query97.q.out   |    81 +
 .../clientpositive/perf/tez/cbo_query98.q.out   |    87 +
 .../clientpositive/perf/tez/cbo_query99.q.out   |   106 +
 .../perf/tez/constraints/cbo_query1.q.out       |    90 +
 .../perf/tez/constraints/cbo_query10.q.out      |   177 +
 .../perf/tez/constraints/cbo_query11.q.out      |   215 +
 .../perf/tez/constraints/cbo_query12.q.out      |    89 +
 .../perf/tez/constraints/cbo_query13.q.out      |   137 +
 .../perf/tez/constraints/cbo_query14.q.out      |   612 +
 .../perf/tez/constraints/cbo_query15.q.out      |    68 +
 .../perf/tez/constraints/cbo_query16.q.out      |   102 +
 .../perf/tez/constraints/cbo_query17.q.out      |   139 +
 .../perf/tez/constraints/cbo_query18.q.out      |   111 +
 .../perf/tez/constraints/cbo_query19.q.out      |    90 +
 .../perf/tez/constraints/cbo_query2.q.out       |   170 +
 .../perf/tez/constraints/cbo_query20.q.out      |    81 +
 .../perf/tez/constraints/cbo_query21.q.out      |    88 +
 .../perf/tez/constraints/cbo_query22.q.out      |    66 +
 .../perf/tez/constraints/cbo_query23.q.out      |   245 +
 .../perf/tez/constraints/cbo_query24.q.out      |   171 +
 .../perf/tez/constraints/cbo_query25.q.out      |   144 +
 .../perf/tez/constraints/cbo_query26.q.out      |    75 +
 .../perf/tez/constraints/cbo_query27.q.out      |    80 +
 .../perf/tez/constraints/cbo_query28.q.out      |   146 +
 .../perf/tez/constraints/cbo_query29.q.out      |   142 +
 .../perf/tez/constraints/cbo_query3.q.out       |    64 +
 .../perf/tez/constraints/cbo_query30.q.out      |   112 +
 .../perf/tez/constraints/cbo_query31.q.out      |   199 +
 .../perf/tez/constraints/cbo_query32.q.out      |    89 +
 .../perf/tez/constraints/cbo_query33.q.out      |   238 +
 .../perf/tez/constraints/cbo_query34.q.out      |    98 +
 .../perf/tez/constraints/cbo_query35.q.out      |   173 +
 .../perf/tez/constraints/cbo_query36.q.out      |    90 +
 .../perf/tez/constraints/cbo_query37.q.out      |    62 +
 .../perf/tez/constraints/cbo_query38.q.out      |   108 +
 .../perf/tez/constraints/cbo_query39.q.out      |   156 +
 .../perf/tez/constraints/cbo_query4.q.out       |   312 +
 .../perf/tez/constraints/cbo_query40.q.out      |    89 +
 .../perf/tez/constraints/cbo_query42.q.out      |    68 +
 .../perf/tez/constraints/cbo_query43.q.out      |    61 +
 .../perf/tez/constraints/cbo_query44.q.out      |   113 +
 .../perf/tez/constraints/cbo_query45.q.out      |    81 +
 .../perf/tez/constraints/cbo_query46.q.out      |   113 +
 .../perf/tez/constraints/cbo_query47.q.out      |   177 +
 .../perf/tez/constraints/cbo_query48.q.out      |   160 +
 .../perf/tez/constraints/cbo_query49.q.out      |   330 +
 .../perf/tez/constraints/cbo_query5.q.out       |   339 +
 .../perf/tez/constraints/cbo_query50.q.out      |   146 +
 .../perf/tez/constraints/cbo_query51.q.out      |   125 +
 .../perf/tez/constraints/cbo_query52.q.out      |    67 +
 .../perf/tez/constraints/cbo_query53.q.out      |    83 +
 .../perf/tez/constraints/cbo_query54.q.out      |   212 +
 .../perf/tez/constraints/cbo_query55.q.out      |    51 +
 .../perf/tez/constraints/cbo_query56.q.out      |   221 +
 .../perf/tez/constraints/cbo_query57.q.out      |   171 +
 .../perf/tez/constraints/cbo_query58.q.out      |   237 +
 .../perf/tez/constraints/cbo_query59.q.out      |   134 +
 .../perf/tez/constraints/cbo_query6.q.out       |   108 +
 .../perf/tez/constraints/cbo_query60.q.out      |   241 +
 .../perf/tez/constraints/cbo_query61.q.out      |   164 +
 .../perf/tez/constraints/cbo_query63.q.out      |    85 +
 .../perf/tez/constraints/cbo_query64.q.out      |   390 +
 .../perf/tez/constraints/cbo_query65.q.out      |    97 +
 .../perf/tez/constraints/cbo_query66.q.out      |   506 +
 .../perf/tez/constraints/cbo_query67.q.out      |   118 +
 .../perf/tez/constraints/cbo_query68.q.out      |   127 +
 .../perf/tez/constraints/cbo_query69.q.out      |   155 +
 .../perf/tez/constraints/cbo_query7.q.out       |    75 +
 .../perf/tez/constraints/cbo_query70.q.out      |   119 +
 .../perf/tez/constraints/cbo_query71.q.out      |   130 +
 .../perf/tez/constraints/cbo_query72.q.out      |   125 +
 .../perf/tez/constraints/cbo_query73.q.out      |    92 +
 .../perf/tez/constraints/cbo_query74.q.out      |   187 +
 .../perf/tez/constraints/cbo_query75.q.out      |   272 +
 .../perf/tez/constraints/cbo_query76.q.out      |    95 +
 .../perf/tez/constraints/cbo_query77.q.out      |   304 +
 .../perf/tez/constraints/cbo_query78.q.out      |   183 +
 .../perf/tez/constraints/cbo_query79.q.out      |    81 +
 .../perf/tez/constraints/cbo_query8.q.out       |   266 +
 .../perf/tez/constraints/cbo_query80.q.out      |   295 +
 .../perf/tez/constraints/cbo_query81.q.out      |   113 +
 .../perf/tez/constraints/cbo_query82.q.out      |    62 +
 .../perf/tez/constraints/cbo_query83.q.out      |   219 +
 .../perf/tez/constraints/cbo_query84.q.out      |    83 +
 .../perf/tez/constraints/cbo_query85.q.out      |   214 +
 .../perf/tez/constraints/cbo_query86.q.out      |    76 +
 .../perf/tez/constraints/cbo_query87.q.out      |   111 +
 .../perf/tez/constraints/cbo_query88.q.out      |   347 +
 .../perf/tez/constraints/cbo_query89.q.out      |    87 +
 .../perf/tez/constraints/cbo_query9.q.out       |   200 +
 .../perf/tez/constraints/cbo_query90.q.out      |    92 +
 .../perf/tez/constraints/cbo_query91.q.out      |   109 +
 .../perf/tez/constraints/cbo_query92.q.out      |    94 +
 .../perf/tez/constraints/cbo_query93.q.out      |    58 +
 .../perf/tez/constraints/cbo_query94.q.out      |    98 +
 .../perf/tez/constraints/cbo_query95.q.out      |   112 +
 .../perf/tez/constraints/cbo_query96.q.out      |    61 +
 .../perf/tez/constraints/cbo_query97.q.out      |    81 +
 .../perf/tez/constraints/cbo_query98.q.out      |    87 +
 .../perf/tez/constraints/cbo_query99.q.out      |   102 +
 .../perf/tez/constraints/query1.q.out           |   177 +
 .../perf/tez/constraints/query10.q.out          |   379 +
 .../perf/tez/constraints/query11.q.out          |   427 +
 .../perf/tez/constraints/query12.q.out          |   169 +
 .../perf/tez/constraints/query13.q.out          |   255 +
 .../perf/tez/constraints/query14.q.out          |  1400 +
 .../perf/tez/constraints/query15.q.out          |   142 +
 .../perf/tez/constraints/query16.q.out          |   244 +
 .../perf/tez/constraints/query17.q.out          |   319 +
 .../perf/tez/constraints/query18.q.out          |   239 +
 .../perf/tez/constraints/query19.q.out          |   196 +
 .../perf/tez/constraints/query2.q.out           |   228 +
 .../perf/tez/constraints/query20.q.out          |   161 +
 .../perf/tez/constraints/query21.q.out          |   145 +
 .../perf/tez/constraints/query22.q.out          |   112 +
 .../perf/tez/constraints/query23.q.out          |   540 +
 .../perf/tez/constraints/query24.q.out          |   363 +
 .../perf/tez/constraints/query25.q.out          |   321 +
 .../perf/tez/constraints/query26.q.out          |   171 +
 .../perf/tez/constraints/query27.q.out          |   189 +
 .../perf/tez/constraints/query28.q.out          |   296 +
 .../perf/tez/constraints/query29.q.out          |   328 +
 .../perf/tez/constraints/query3.q.out           |   135 +
 .../perf/tez/constraints/query30.q.out          |   221 +
 .../perf/tez/constraints/query31.q.out          |   492 +
 .../perf/tez/constraints/query32.q.out          |   210 +
 .../perf/tez/constraints/query33.q.out          |   450 +
 .../perf/tez/constraints/query34.q.out          |   203 +
 .../perf/tez/constraints/query35.q.out          |   361 +
 .../perf/tez/constraints/query36.q.out          |   182 +
 .../perf/tez/constraints/query37.q.out          |   146 +
 .../perf/tez/constraints/query38.q.out          |   261 +
 .../perf/tez/constraints/query39.q.out          |   236 +
 .../perf/tez/constraints/query4.q.out           |   623 +
 .../perf/tez/constraints/query40.q.out          |   183 +
 .../perf/tez/constraints/query42.q.out          |   139 +
 .../perf/tez/constraints/query43.q.out          |   135 +
 .../perf/tez/constraints/query44.q.out          |   193 +
 .../perf/tez/constraints/query45.q.out          |   183 +
 .../perf/tez/constraints/query46.q.out          |   240 +
 .../perf/tez/constraints/query47.q.out          |   266 +
 .../perf/tez/constraints/query48.q.out          |   252 +
 .../perf/tez/constraints/query49.q.out          |   555 +
 .../perf/tez/constraints/query5.q.out           |   531 +
 .../perf/tez/constraints/query50.q.out          |   242 +
 .../perf/tez/constraints/query51.q.out          |   222 +
 .../perf/tez/constraints/query52.q.out          |   139 +
 .../perf/tez/constraints/query53.q.out          |   161 +
 .../perf/tez/constraints/query54.q.out          |   439 +
 .../perf/tez/constraints/query55.q.out          |   123 +
 .../perf/tez/constraints/query56.q.out          |   470 +
 .../perf/tez/constraints/query57.q.out          |   260 +
 .../perf/tez/constraints/query58.q.out          |   397 +
 .../perf/tez/constraints/query59.q.out          |   234 +
 .../perf/tez/constraints/query6.q.out           |   236 +
 .../perf/tez/constraints/query60.q.out          |   496 +
 .../perf/tez/constraints/query61.q.out          |   388 +
 .../perf/tez/constraints/query63.q.out          |   163 +
 .../perf/tez/constraints/query64.q.out          |   758 +
 .../perf/tez/constraints/query65.q.out          |   220 +
 .../perf/tez/constraints/query66.q.out          |   702 +
 .../perf/tez/constraints/query67.q.out          |   196 +
 .../perf/tez/constraints/query68.q.out          |   254 +
 .../perf/tez/constraints/query69.q.out          |   359 +
 .../perf/tez/constraints/query7.q.out           |   171 +
 .../perf/tez/constraints/query70.q.out          |   216 +
 .../perf/tez/constraints/query71.q.out          |   297 +
 .../perf/tez/constraints/query72.q.out          |   297 +
 .../perf/tez/constraints/query73.q.out          |   197 +
 .../perf/tez/constraints/query74.q.out          |   397 +
 .../perf/tez/constraints/query75.q.out          |   662 +
 .../perf/tez/constraints/query76.q.out          |   197 +
 .../perf/tez/constraints/query77.q.out          |   504 +
 .../perf/tez/constraints/query78.q.out          |   345 +
 .../perf/tez/constraints/query79.q.out          |   175 +
 .../perf/tez/constraints/query8.q.out           |   397 +
 .../perf/tez/constraints/query80.q.out          |   609 +
 .../perf/tez/constraints/query81.q.out          |   220 +
 .../perf/tez/constraints/query82.q.out          |   146 +
 .../perf/tez/constraints/query83.q.out          |   338 +
 .../perf/tez/constraints/query84.q.out          |   153 +
 .../perf/tez/constraints/query85.q.out          |   320 +
 .../perf/tez/constraints/query86.q.out          |   145 +
 .../perf/tez/constraints/query87.q.out          |   288 +
 .../perf/tez/constraints/query88.q.out          |   946 +
 .../perf/tez/constraints/query89.q.out          |   178 +
 .../perf/tez/constraints/query9.q.out           |   450 +
 .../perf/tez/constraints/query90.q.out          |   263 +
 .../perf/tez/constraints/query91.q.out          |   196 +
 .../perf/tez/constraints/query92.q.out          |   221 +
 .../perf/tez/constraints/query93.q.out          |   131 +
 .../perf/tez/constraints/query94.q.out          |   240 +
 .../perf/tez/constraints/query95.q.out          |   271 +
 .../perf/tez/constraints/query96.q.out          |   155 +
 .../perf/tez/constraints/query97.q.out          |   166 +
 .../perf/tez/constraints/query98.q.out          |   165 +
 .../perf/tez/constraints/query99.q.out          |   195 +
 .../clientpositive/perf/tez/query1.q.out        |    80 +-
 .../clientpositive/perf/tez/query10.q.out       |   406 +-
 .../clientpositive/perf/tez/query11.q.out       |   512 +-
 .../clientpositive/perf/tez/query12.q.out       |    54 +-
 .../clientpositive/perf/tez/query13.q.out       |   302 +-
 .../clientpositive/perf/tez/query14.q.out       |  2074 +-
 .../clientpositive/perf/tez/query15.q.out       |    64 +-
 .../clientpositive/perf/tez/query16.q.out       |   187 +-
 .../clientpositive/perf/tez/query17.q.out       |   277 +-
 .../clientpositive/perf/tez/query18.q.out       |   248 +-
 .../clientpositive/perf/tez/query19.q.out       |   196 +-
 .../clientpositive/perf/tez/query2.q.out        |   209 +-
 .../clientpositive/perf/tez/query20.q.out       |    54 +-
 .../clientpositive/perf/tez/query21.q.out       |    54 +-
 .../clientpositive/perf/tez/query22.q.out       |    52 +-
 .../clientpositive/perf/tez/query23.q.out       |   749 +-
 .../clientpositive/perf/tez/query24.q.out       |   538 +-
 .../clientpositive/perf/tez/query25.q.out       |   265 +-
 .../clientpositive/perf/tez/query26.q.out       |   124 +-
 .../clientpositive/perf/tez/query27.q.out       |   108 +-
 .../clientpositive/perf/tez/query28.q.out       |   300 +-
 .../clientpositive/perf/tez/query29.q.out       |   290 +-
 .../clientpositive/perf/tez/query3.q.out        |    48 +-
 .../clientpositive/perf/tez/query30.q.out       |    94 +-
 .../clientpositive/perf/tez/query31.q.out       |   712 +-
 .../clientpositive/perf/tez/query32.q.out       |   167 +-
 .../clientpositive/perf/tez/query33.q.out       |   414 +-
 .../clientpositive/perf/tez/query34.q.out       |   190 +-
 .../clientpositive/perf/tez/query35.q.out       |   392 +-
 .../clientpositive/perf/tez/query36.q.out       |   100 +-
 .../clientpositive/perf/tez/query37.q.out       |   166 +-
 .../clientpositive/perf/tez/query38.q.out       |   202 +-
 .../clientpositive/perf/tez/query39.q.out       |    80 +-
 .../clientpositive/perf/tez/query4.q.out        |   774 +-
 .../clientpositive/perf/tez/query40.q.out       |   106 +-
 .../clientpositive/perf/tez/query42.q.out       |    50 +-
 .../clientpositive/perf/tez/query43.q.out       |    52 +-
 .../clientpositive/perf/tez/query44.q.out       |    74 +-
 .../clientpositive/perf/tez/query45.q.out       |   186 +-
 .../clientpositive/perf/tez/query46.q.out       |   226 +-
 .../clientpositive/perf/tez/query47.q.out       |   290 +-
 .../clientpositive/perf/tez/query48.q.out       |   240 +-
 .../clientpositive/perf/tez/query49.q.out       |   174 +-
 .../clientpositive/perf/tez/query5.q.out        |   324 +-
 .../clientpositive/perf/tez/query50.q.out       |   136 +-
 .../clientpositive/perf/tez/query51.q.out       |    70 +-
 .../clientpositive/perf/tez/query52.q.out       |    50 +-
 .../clientpositive/perf/tez/query53.q.out       |    98 +-
 .../clientpositive/perf/tez/query54.q.out       |   580 +-
 .../clientpositive/perf/tez/query55.q.out       |    50 +-
 .../clientpositive/perf/tez/query56.q.out       |   154 +-
 .../clientpositive/perf/tez/query57.q.out       |   290 +-
 .../clientpositive/perf/tez/query58.q.out       |   442 +-
 .../clientpositive/perf/tez/query59.q.out       |   213 +-
 .../clientpositive/perf/tez/query6.q.out        |   300 +-
 .../clientpositive/perf/tez/query60.q.out       |   160 +-
 .../clientpositive/perf/tez/query61.q.out       |   196 +-
 .../clientpositive/perf/tez/query63.q.out       |    98 +-
 .../clientpositive/perf/tez/query64.q.out       |   989 +-
 .../clientpositive/perf/tez/query65.q.out       |   301 +-
 .../clientpositive/perf/tez/query66.q.out       |   196 +-
 .../clientpositive/perf/tez/query67.q.out       |   120 +-
 .../clientpositive/perf/tez/query68.q.out       |   226 +-
 .../clientpositive/perf/tez/query69.q.out       |   412 +-
 .../clientpositive/perf/tez/query7.q.out        |   124 +-
 .../clientpositive/perf/tez/query70.q.out       |   218 +-
 .../clientpositive/perf/tez/query71.q.out       |   112 +-
 .../clientpositive/perf/tez/query72.q.out       |   310 +-
 .../clientpositive/perf/tez/query73.q.out       |   190 +-
 .../clientpositive/perf/tez/query74.q.out       |   498 +-
 .../clientpositive/perf/tez/query75.q.out       |   230 +-
 .../clientpositive/perf/tez/query76.q.out       |   249 +-
 .../clientpositive/perf/tez/query77.q.out       |   306 +-
 .../clientpositive/perf/tez/query78.q.out       |   132 +-
 .../clientpositive/perf/tez/query79.q.out       |   176 +-
 .../clientpositive/perf/tez/query8.q.out        |   108 +-
 .../clientpositive/perf/tez/query80.q.out       |   354 +-
 .../clientpositive/perf/tez/query81.q.out       |    96 +-
 .../clientpositive/perf/tez/query82.q.out       |   166 +-
 .../clientpositive/perf/tez/query83.q.out       |   298 +-
 .../clientpositive/perf/tez/query84.q.out       |   154 +-
 .../clientpositive/perf/tez/query85.q.out       |   254 +-
 .../clientpositive/perf/tez/query86.q.out       |    86 +-
 .../clientpositive/perf/tez/query87.q.out       |   228 +-
 .../clientpositive/perf/tez/query88.q.out       |  1400 +-
 .../clientpositive/perf/tez/query89.q.out       |   120 +-
 .../clientpositive/perf/tez/query9.q.out        |   138 +-
 .../clientpositive/perf/tez/query90.q.out       |    86 +-
 .../clientpositive/perf/tez/query91.q.out       |    92 +-
 .../clientpositive/perf/tez/query92.q.out       |   173 +-
 .../clientpositive/perf/tez/query93.q.out       |    58 +-
 .../clientpositive/perf/tez/query94.q.out       |   187 +-
 .../clientpositive/perf/tez/query95.q.out       |   424 +-
 .../clientpositive/perf/tez/query96.q.out       |    60 +-
 .../clientpositive/perf/tez/query97.q.out       |    52 +-
 .../clientpositive/perf/tez/query98.q.out       |    52 +-
 .../clientpositive/perf/tez/query99.q.out       |   138 +-
 .../test/results/clientpositive/plan_json.q.out |     4 +
 .../results/clientpositive/pointlookup.q.out    |    12 +
 .../results/clientpositive/pointlookup2.q.out   |    88 +
 .../results/clientpositive/pointlookup3.q.out   |    76 +
 .../results/clientpositive/pointlookup4.q.out   |    16 +
 .../results/clientpositive/pointlookup5.q.out   |   134 +
 .../clientpositive/position_alias_test_1.q.out  |     8 +
 ql/src/test/results/clientpositive/ppd1.q.out   |     8 +
 ql/src/test/results/clientpositive/ppd2.q.out   |    28 +
 .../results/clientpositive/ppd_clusterby.q.out  |    16 +
 .../clientpositive/ppd_constant_expr.q.out      |     8 +
 .../clientpositive/ppd_constant_where.q.out     |     4 +
 .../clientpositive/ppd_deterministic_expr.q.out |    28 +
 .../test/results/clientpositive/ppd_gby.q.out   |     8 +
 .../test/results/clientpositive/ppd_gby2.q.out  |     8 +
 .../results/clientpositive/ppd_gby_join.q.out   |     8 +
 .../test/results/clientpositive/ppd_join.q.out  |     8 +
 .../test/results/clientpositive/ppd_join2.q.out |     8 +
 .../test/results/clientpositive/ppd_join3.q.out |     8 +
 .../test/results/clientpositive/ppd_join4.q.out |     4 +
 .../test/results/clientpositive/ppd_join5.q.out |    12 +
 .../clientpositive/ppd_join_filter.q.out        |    16 +
 .../clientpositive/ppd_multi_insert.q.out       |    20 +
 .../clientpositive/ppd_outer_join1.q.out        |     8 +
 .../clientpositive/ppd_outer_join2.q.out        |     8 +
 .../clientpositive/ppd_outer_join3.q.out        |     8 +
 .../clientpositive/ppd_outer_join4.q.out        |     8 +
 .../clientpositive/ppd_outer_join5.q.out        |    24 +
 .../results/clientpositive/ppd_random.q.out     |     8 +
 .../clientpositive/ppd_repeated_alias.q.out     |    22 +
 .../results/clientpositive/ppd_transform.q.out  |    18 +
 .../results/clientpositive/ppd_udf_case.q.out   |    16 +
 .../results/clientpositive/ppd_udf_col.q.out    |    64 +
 .../test/results/clientpositive/ppd_udtf.q.out  |     4 +
 .../test/results/clientpositive/ppd_union.q.out |     8 +
 ql/src/test/results/clientpositive/ppd_vc.q.out |    26 +
 .../results/clientpositive/ppd_windowing1.q.out |    96 +
 .../clientpositive/ppr_allchildsarenull.q.out   |    20 +
 .../results/clientpositive/ppr_pushdown3.q.out  |    36 +
 .../results/clientpositive/ptf_matchpath.q.out  |    12 +
 .../results/clientpositive/ptfgroupbyjoin.q.out |    18 +
 .../test/results/clientpositive/push_or.q.out   |     8 +
 .../query_result_fileformat.q.out               |     8 +
 ql/src/test/results/clientpositive/quote1.q.out |     8 +
 ql/src/test/results/clientpositive/quote2.q.out |     4 +
 .../results/clientpositive/quotedid_basic.q.out |    20 +
 .../clientpositive/quotedid_partition.q.out     |     6 +
 .../results/clientpositive/quotedid_skew.q.out  |     6 +
 .../clientpositive/rand_partitionpruner1.q.out  |     4 +
 .../clientpositive/rand_partitionpruner2.q.out  |     8 +
 .../clientpositive/rand_partitionpruner3.q.out  |    12 +
 .../clientpositive/rcfile_null_value.q.out      |     4 +
 .../reduceSinkDeDuplication_pRS_key_empty.q.out |   Bin 10695 -> 10953 bytes
 .../reduce_deduplicate_exclude_join.q.out       |     4 +
 .../reduce_deduplicate_extended2.q.out          |    24 +
 .../test/results/clientpositive/regex_col.q.out |   108 +
 .../results/clientpositive/regexp_extract.q.out |     8 +
 .../test/results/clientpositive/reloadJar.q.out |     4 +
 .../clientpositive/remove_exprs_stats.q.out     |    88 +
 ql/src/test/results/clientpositive/repair.q.out |     3 +
 .../clientpositive/router_join_ppr.q.out        |    40 +
 .../test/results/clientpositive/row__id.q.out   |    20 +
 .../runtime_skewjoin_mapjoin_spark.q.out        |     6 +
 .../test/results/clientpositive/sample1.q.out   |     6 +
 .../test/results/clientpositive/sample3.q.out   |     4 +
 .../test/results/clientpositive/sample5.q.out   |     4 +
 .../test/results/clientpositive/sample6.q.out   |    32 +
 .../test/results/clientpositive/sample7.q.out   |     4 +
 .../test/results/clientpositive/sample8.q.out   |    24 +
 .../test/results/clientpositive/sample9.q.out   |     4 +
 .../sample_islocalmode_hook_use_metadata.q.out  |     6 +
 .../results/clientpositive/script_pipe.q.out    |     8 +
 .../clientpositive/select_as_omitted.q.out      |     4 +
 .../clientpositive/select_column_pruning.q.out  |     4 +
 .../clientpositive/select_dummy_source.q.out    |    28 +
 .../clientpositive/select_transform_hint.q.out  |    12 +
 .../clientpositive/select_unquote_and.q.out     |     8 +
 .../clientpositive/select_unquote_not.q.out     |     8 +
 .../clientpositive/select_unquote_or.q.out      |     8 +
 .../test/results/clientpositive/semijoin2.q.out |     6 +
 .../test/results/clientpositive/semijoin3.q.out |     6 +
 .../test/results/clientpositive/semijoin4.q.out |    95 +-
 .../test/results/clientpositive/semijoin5.q.out |    70 +-
 .../results/clientpositive/serde_opencsv.q.out  |     4 +
 .../results/clientpositive/serde_regex.q.out    |     8 +
 .../clientpositive/serde_user_properties.q.out  |    28 +
 .../set_processor_namespaces.q.out              |     4 +
 .../clientpositive/set_variable_sub.q.out       |    12 +
 .../results/clientpositive/setop_subq.q.out     |    20 +
 .../results/clientpositive/show_columns.q.out   |     2 +
 .../results/clientpositive/show_functions.q.out |     3 +
 .../show_materialized_views.q.out               |    20 +-
 .../results/clientpositive/show_tables.q.out    |     4 +
 .../clientpositive/show_tblproperties.q.out     |    10 +-
 .../test/results/clientpositive/showparts.q.out |     2 +
 .../test/results/clientpositive/skewjoin.q.out  |    46 +
 .../clientpositive/skewjoin_mapjoin1.q.out      |    24 +
 .../clientpositive/skewjoin_mapjoin10.q.out     |    24 +
 .../clientpositive/skewjoin_mapjoin11.q.out     |     6 +
 .../clientpositive/skewjoin_mapjoin2.q.out      |    12 +
 .../clientpositive/skewjoin_mapjoin3.q.out      |     6 +
 .../clientpositive/skewjoin_mapjoin4.q.out      |     8 +
 .../clientpositive/skewjoin_mapjoin5.q.out      |    12 +
 .../clientpositive/skewjoin_mapjoin6.q.out      |     6 +
 .../clientpositive/skewjoin_mapjoin7.q.out      |     6 +
 .../clientpositive/skewjoin_mapjoin8.q.out      |     8 +
 .../clientpositive/skewjoin_mapjoin9.q.out      |     8 +
 .../clientpositive/skewjoin_noskew.q.out        |     6 +
 .../clientpositive/skewjoin_onesideskew.q.out   |     8 +
 .../skewjoin_union_remove_1.q.out               |    24 +
 .../skewjoin_union_remove_2.q.out               |     8 +
 .../results/clientpositive/skewjoinopt1.q.out   |    24 +
 .../results/clientpositive/skewjoinopt10.q.out  |     6 +
 .../results/clientpositive/skewjoinopt11.q.out  |     6 +
 .../results/clientpositive/skewjoinopt12.q.out  |     6 +
 .../results/clientpositive/skewjoinopt13.q.out  |     8 +
 .../results/clientpositive/skewjoinopt14.q.out  |     8 +
 .../results/clientpositive/skewjoinopt16.q.out  |     6 +
 .../results/clientpositive/skewjoinopt17.q.out  |    12 +
 .../results/clientpositive/skewjoinopt18.q.out  |     6 +
 .../results/clientpositive/skewjoinopt19.q.out  |     6 +
 .../results/clientpositive/skewjoinopt2.q.out   |    24 +
 .../results/clientpositive/skewjoinopt20.q.out  |     6 +
 .../results/clientpositive/skewjoinopt21.q.out  |     6 +
 .../results/clientpositive/skewjoinopt3.q.out   |    12 +
 .../results/clientpositive/skewjoinopt4.q.out   |    12 +
 .../results/clientpositive/skewjoinopt5.q.out   |     6 +
 .../results/clientpositive/skewjoinopt6.q.out   |     6 +
 .../results/clientpositive/skewjoinopt7.q.out   |     8 +
 .../results/clientpositive/skewjoinopt8.q.out   |     8 +
 .../results/clientpositive/skewjoinopt9.q.out   |    12 +
 .../results/clientpositive/smb_mapjoin9.q.out   |    24 +
 .../results/clientpositive/smb_mapjoin_1.q.out  |    48 +
 .../results/clientpositive/smb_mapjoin_10.q.out |     8 +
 .../results/clientpositive/smb_mapjoin_11.q.out |    22 +
 .../results/clientpositive/smb_mapjoin_12.q.out |    24 +
 .../results/clientpositive/smb_mapjoin_13.q.out |    12 +
 .../results/clientpositive/smb_mapjoin_16.q.out |     6 +
 .../results/clientpositive/smb_mapjoin_2.q.out  |    48 +
 .../results/clientpositive/smb_mapjoin_20.q.out |    18 +
 .../results/clientpositive/smb_mapjoin_21.q.out |    36 +
 .../results/clientpositive/smb_mapjoin_22.q.out |     8 +
 .../results/clientpositive/smb_mapjoin_25.q.out |    16 +
 .../results/clientpositive/smb_mapjoin_3.q.out  |    48 +
 .../results/clientpositive/smb_mapjoin_46.q.out |   102 +
 .../results/clientpositive/smb_mapjoin_47.q.out |    78 +
 .../results/clientpositive/smb_mapjoin_7.q.out  |     6 +
 ql/src/test/results/clientpositive/sort.q.out   |     4 +
 .../clientpositive/sort_merge_join_desc_1.q.out |     6 +
 .../clientpositive/sort_merge_join_desc_2.q.out |     6 +
 .../clientpositive/sort_merge_join_desc_3.q.out |     6 +
 .../clientpositive/sort_merge_join_desc_4.q.out |     6 +
 .../clientpositive/sort_merge_join_desc_5.q.out |    10 +
 .../clientpositive/sort_merge_join_desc_6.q.out |    10 +
 .../clientpositive/sort_merge_join_desc_7.q.out |    14 +
 .../clientpositive/sort_merge_join_desc_8.q.out |    12 +
 ql/src/test/results/clientpositive/source.q.out |     8 +
 .../spark/add_part_multiple.q.out               |     4 +
 .../spark/annotate_stats_join.q.out             |    70 +
 .../clientpositive/spark/auto_join0.q.out       |     4 +
 .../clientpositive/spark/auto_join1.q.out       |     4 +
 .../clientpositive/spark/auto_join10.q.out      |     4 +
 .../clientpositive/spark/auto_join11.q.out      |     4 +
 .../clientpositive/spark/auto_join12.q.out      |     4 +
 .../clientpositive/spark/auto_join13.q.out      |     4 +
 .../clientpositive/spark/auto_join14.q.out      |    10 +
 .../clientpositive/spark/auto_join15.q.out      |     4 +
 .../clientpositive/spark/auto_join16.q.out      |     4 +
 .../clientpositive/spark/auto_join17.q.out      |     4 +
 .../clientpositive/spark/auto_join18.q.out      |     6 +
 .../spark/auto_join18_multi_distinct.q.out      |     6 +
 .../clientpositive/spark/auto_join19.q.out      |    14 +
 .../clientpositive/spark/auto_join2.q.out       |     4 +
 .../clientpositive/spark/auto_join20.q.out      |     8 +
 .../clientpositive/spark/auto_join21.q.out      |     4 +
 .../clientpositive/spark/auto_join22.q.out      |     4 +
 .../clientpositive/spark/auto_join23.q.out      |     4 +
 .../clientpositive/spark/auto_join24.q.out      |     4 +
 .../clientpositive/spark/auto_join26.q.out      |     6 +
 .../clientpositive/spark/auto_join27.q.out      |     4 +
 .../clientpositive/spark/auto_join28.q.out      |    16 +
 .../clientpositive/spark/auto_join29.q.out      |    36 +
 .../clientpositive/spark/auto_join3.q.out       |     4 +
 .../clientpositive/spark/auto_join30.q.out      |    32 +
 .../clientpositive/spark/auto_join31.q.out      |     4 +
 .../clientpositive/spark/auto_join32.q.out      |    24 +
 .../clientpositive/spark/auto_join4.q.out       |     4 +
 .../clientpositive/spark/auto_join5.q.out       |     4 +
 .../clientpositive/spark/auto_join6.q.out       |     4 +
 .../clientpositive/spark/auto_join7.q.out       |     4 +
 .../clientpositive/spark/auto_join8.q.out       |     4 +
 .../clientpositive/spark/auto_join9.q.out       |     8 +
 .../spark/auto_join_filters.q.out               |    12 +
 .../clientpositive/spark/auto_join_nulls.q.out  |     4 +
 .../spark/auto_join_reordering_values.q.out     |     6 +
 .../clientpositive/spark/auto_join_stats.q.out  |    14 +
 .../clientpositive/spark/auto_join_stats2.q.out |    14 +
 .../spark/auto_join_without_localtask.q.out     |    12 +
 .../spark/auto_smb_mapjoin_14.q.out             |    80 +
 .../spark/auto_sortmerge_join_1.q.out           |    36 +
 .../spark/auto_sortmerge_join_12.q.out          |    16 +
 .../spark/auto_sortmerge_join_13.q.out          |    24 +
 .../spark/auto_sortmerge_join_14.q.out          |    12 +
 .../spark/auto_sortmerge_join_15.q.out          |    12 +
 .../spark/auto_sortmerge_join_16.q.out          |    36 +
 .../spark/auto_sortmerge_join_16.q.out_spark    |    36 +
 .../spark/auto_sortmerge_join_2.q.out           |    24 +
 .../spark/auto_sortmerge_join_3.q.out           |    36 +
 .../spark/auto_sortmerge_join_4.q.out           |    36 +
 .../spark/auto_sortmerge_join_5.q.out           |    18 +
 .../spark/auto_sortmerge_join_6.q.out           |    80 +
 .../spark/auto_sortmerge_join_7.q.out           |    42 +
 .../spark/auto_sortmerge_join_8.q.out           |    42 +
 .../spark/auto_sortmerge_join_9.q.out           |   146 +
 .../results/clientpositive/spark/bucket2.q.out  |     8 +
 .../results/clientpositive/spark/bucket3.q.out  |    10 +
 .../results/clientpositive/spark/bucket4.q.out  |     8 +
 .../clientpositive/spark/bucket4.q.out_spark    |     8 +
 .../results/clientpositive/spark/bucket5.q.out  |     6 +
 .../results/clientpositive/spark/bucket6.q.out  |    12 +
 .../spark/bucket_map_join_1.q.out               |     6 +
 .../spark/bucket_map_join_2.q.out               |     6 +
 .../spark/bucket_map_join_spark1.q.out          |    20 +
 .../spark/bucket_map_join_spark2.q.out          |    20 +
 .../spark/bucket_map_join_spark3.q.out          |    20 +
 .../spark/bucket_map_join_spark4.q.out          |    16 +
 .../spark/bucket_map_join_tez1.q.out            |   328 +
 .../spark/bucket_map_join_tez2.q.out            |   132 +
 .../clientpositive/spark/bucketmapjoin1.q.out   |    28 +
 .../clientpositive/spark/bucketmapjoin10.q.out  |    14 +
 .../clientpositive/spark/bucketmapjoin11.q.out  |    28 +
 .../clientpositive/spark/bucketmapjoin12.q.out  |    20 +
 .../clientpositive/spark/bucketmapjoin13.q.out  |    42 +
 .../clientpositive/spark/bucketmapjoin2.q.out   |    32 +
 .../clientpositive/spark/bucketmapjoin3.q.out   |    20 +
 .../clientpositive/spark/bucketmapjoin4.q.out   |     8 +
 .../clientpositive/spark/bucketmapjoin5.q.out   |    20 +
 .../clientpositive/spark/bucketmapjoin7.q.out   |    10 +
 .../spark/bucketmapjoin7.q.out_spark            |    10 +
 .../clientpositive/spark/bucketmapjoin8.q.out   |    20 +
 .../clientpositive/spark/bucketmapjoin9.q.out   |    20 +
 .../spark/bucketmapjoin_negative.q.out          |     8 +
 .../spark/bucketmapjoin_negative2.q.out         |    10 +
 .../spark/bucketmapjoin_negative3.q.out         |    48 +
 .../spark/bucketsortoptimize_insert_2.q.out     |    64 +
 .../spark/bucketsortoptimize_insert_4.q.out     |    20 +
 .../spark/bucketsortoptimize_insert_6.q.out     |    70 +
 .../spark/bucketsortoptimize_insert_7.q.out     |    30 +
 .../spark/bucketsortoptimize_insert_8.q.out     |    20 +
 .../spark/cbo_simple_select.q.out               |    36 +
 .../spark/column_access_stats.q.out             |    21 +
 .../spark/constprog_partitioner.q.out           |     8 +
 .../spark/constprog_semijoin.q.out              |    52 +
 .../results/clientpositive/spark/count.q.out    |    48 +
 .../clientpositive/spark/cross_join.q.out       |    24 +
 .../spark/cross_product_check_1.q.out           |    30 +
 .../spark/cross_product_check_2.q.out           |    30 +
 .../results/clientpositive/spark/ctas.q.out     |    30 +
 .../spark/disable_merge_for_bucketing.q.out     |     8 +
 .../disable_merge_for_bucketing.q.out_spark     |     8 +
 .../spark/dynamic_rdd_cache.q.out               |    32 +
 .../spark/escape_clusterby1.q.out               |     8 +
 .../spark/escape_distributeby1.q.out            |     8 +
 .../clientpositive/spark/escape_orderby1.q.out  |     8 +
 .../clientpositive/spark/escape_sortby1.q.out   |     8 +
 .../spark/explaindenpendencydiffengs.q.out      |     8 +
 .../spark/filter_join_breaktask.q.out           |     6 +
 .../spark/gen_udf_example_add10.q.out           |     4 +
 .../results/clientpositive/spark/groupby1.q.out |     4 +
 .../clientpositive/spark/groupby10.q.out        |    18 +
 .../clientpositive/spark/groupby11.q.out        |     6 +
 .../clientpositive/spark/groupby1_map.q.out     |     4 +
 .../spark/groupby1_map_nomap.q.out              |     4 +
 .../spark/groupby1_map_skew.q.out               |     4 +
 .../clientpositive/spark/groupby1_noskew.q.out  |     4 +
 .../results/clientpositive/spark/groupby2.q.out |     4 +
 .../clientpositive/spark/groupby2_map.q.out     |     4 +
 .../spark/groupby2_map_multi_distinct.q.out     |     8 +
 .../spark/groupby2_map_skew.q.out               |     4 +
 .../clientpositive/spark/groupby2_noskew.q.out  |     4 +
 .../spark/groupby2_noskew_multi_distinct.q.out  |     4 +
 .../results/clientpositive/spark/groupby3.q.out |     4 +
 .../clientpositive/spark/groupby3_map.q.out     |     4 +
 .../spark/groupby3_map_multi_distinct.q.out     |     4 +
 .../spark/groupby3_map_skew.q.out               |     4 +
 .../clientpositive/spark/groupby3_noskew.q.out  |     4 +
 .../spark/groupby3_noskew_multi_distinct.q.out  |     4 +
 .../results/clientpositive/spark/groupby4.q.out |     4 +
 .../clientpositive/spark/groupby4_map.q.out     |     4 +
 .../spark/groupby4_map_skew.q.out               |     4 +
 .../clientpositive/spark/groupby4_noskew.q.out  |     4 +
 .../results/clientpositive/spark/groupby5.q.out |     4 +
 .../clientpositive/spark/groupby5_map.q.out     |     4 +
 .../spark/groupby5_map_skew.q.out               |     4 +
 .../clientpositive/spark/groupby5_noskew.q.out  |     4 +
 .../results/clientpositive/spark/groupby6.q.out |     4 +
 .../clientpositive/spark/groupby6_map.q.out     |     4 +
 .../spark/groupby6_map_skew.q.out               |     4 +
 .../clientpositive/spark/groupby6_noskew.q.out  |     4 +
 .../clientpositive/spark/groupby7_map.q.out     |     6 +
 .../groupby7_map_multi_single_reducer.q.out     |     6 +
 .../spark/groupby7_map_skew.q.out               |     6 +
 .../clientpositive/spark/groupby7_noskew.q.out  |     6 +
 .../groupby7_noskew_multi_single_reducer.q.out  |     6 +
 .../results/clientpositive/spark/groupby8.q.out |    12 +
 .../clientpositive/spark/groupby8_map.q.out     |     6 +
 .../spark/groupby8_map_skew.q.out               |     6 +
 .../clientpositive/spark/groupby8_noskew.q.out  |     6 +
 .../results/clientpositive/spark/groupby9.q.out |    30 +
 .../spark/groupby_complex_types.q.out           |     8 +
 ...pby_complex_types_multi_single_reducer.q.out |     6 +
 .../clientpositive/spark/groupby_cube1.q.out    |    30 +
 .../clientpositive/spark/groupby_map_ppr.q.out  |     8 +
 .../spark/groupby_map_ppr_multi_distinct.q.out  |     8 +
 .../groupby_multi_insert_common_distinct.q.out  |     6 +
 .../spark/groupby_multi_single_reducer.q.out    |    20 +
 .../spark/groupby_multi_single_reducer2.q.out   |     6 +
 .../spark/groupby_multi_single_reducer3.q.out   |    24 +
 .../clientpositive/spark/groupby_position.q.out |    28 +
 .../clientpositive/spark/groupby_ppr.q.out      |     8 +
 .../spark/groupby_ppr_multi_distinct.q.out      |    16 +
 .../spark/groupby_resolution.q.out              |    40 +
 .../clientpositive/spark/groupby_rollup1.q.out  |    22 +
 .../spark/groupby_sort_1_23.q.out               |    80 +
 .../spark/groupby_sort_skew_1_23.q.out          |    80 +
 .../results/clientpositive/spark/having.q.out   |    24 +
 .../spark/identity_project_remove_skip.q.out    |     4 +
 .../spark/infer_bucket_sort_map_operators.q.out |    22 +
 .../spark/infer_bucket_sort_num_buckets.q.out   |     7 +
 .../clientpositive/spark/innerjoin.q.out        |     8 +
 .../results/clientpositive/spark/input12.q.out  |     8 +
 .../results/clientpositive/spark/input13.q.out  |    10 +
 .../results/clientpositive/spark/input14.q.out  |     4 +
 .../results/clientpositive/spark/input17.q.out  |     4 +
 .../results/clientpositive/spark/input18.q.out  |     4 +
 .../clientpositive/spark/input1_limit.q.out     |     6 +
 .../clientpositive/spark/input_part2.q.out      |    10 +
 .../results/clientpositive/spark/insert1.q.out  |    22 +
 .../clientpositive/spark/insert_into1.q.out     |    40 +
 .../clientpositive/spark/insert_into2.q.out     |    34 +
 .../clientpositive/spark/insert_into3.q.out     |    12 +
 .../results/clientpositive/spark/join0.q.out    |     7 +
 .../results/clientpositive/spark/join1.q.out    |     4 +
 .../results/clientpositive/spark/join10.q.out   |     4 +
 .../results/clientpositive/spark/join11.q.out   |     4 +
 .../results/clientpositive/spark/join12.q.out   |     4 +
 .../results/clientpositive/spark/join13.q.out   |     4 +
 .../results/clientpositive/spark/join14.q.out   |    10 +
 .../results/clientpositive/spark/join15.q.out   |     4 +
 .../results/clientpositive/spark/join16.q.out   |     4 +
 .../results/clientpositive/spark/join17.q.out   |     4 +
 .../results/clientpositive/spark/join18.q.out   |     6 +
 .../spark/join18_multi_distinct.q.out           |     6 +
 .../results/clientpositive/spark/join19.q.out   |     4 +
 .../results/clientpositive/spark/join2.q.out    |     4 +
 .../results/clientpositive/spark/join20.q.out   |     8 +
 .../results/clientpositive/spark/join21.q.out   |     4 +
 .../results/clientpositive/spark/join22.q.out   |     4 +
 .../results/clientpositive/spark/join23.q.out   |     4 +
 .../results/clientpositive/spark/join25.q.out   |     6 +
 .../results/clientpositive/spark/join26.q.out   |    10 +
 .../results/clientpositive/spark/join27.q.out   |     6 +
 .../results/clientpositive/spark/join28.q.out   |    10 +
 .../results/clientpositive/spark/join29.q.out   |     6 +
 .../results/clientpositive/spark/join3.q.out    |     4 +
 .../results/clientpositive/spark/join30.q.out   |     6 +
 .../results/clientpositive/spark/join31.q.out   |     6 +
 .../results/clientpositive/spark/join32.q.out   |    10 +
 .../clientpositive/spark/join32_lessSize.q.out  |    56 +
 .../results/clientpositive/spark/join33.q.out   |    10 +
 .../results/clientpositive/spark/join34.q.out   |     6 +
 .../results/clientpositive/spark/join35.q.out   |     6 +
 .../results/clientpositive/spark/join36.q.out   |     6 +
 .../results/clientpositive/spark/join37.q.out   |     6 +
 .../results/clientpositive/spark/join38.q.out   |     6 +
 .../results/clientpositive/spark/join39.q.out   |     4 +
 .../results/clientpositive/spark/join4.q.out    |     4 +
 .../results/clientpositive/spark/join40.q.out   |    24 +
 .../results/clientpositive/spark/join41.q.out   |     8 +
 .../results/clientpositive/spark/join5.q.out    |     4 +
 .../results/clientpositive/spark/join6.q.out    |     4 +
 .../results/clientpositive/spark/join7.q.out    |     4 +
 .../results/clientpositive/spark/join8.q.out    |     4 +
 .../results/clientpositive/spark/join9.q.out    |     8 +
 .../clientpositive/spark/join_alt_syntax.q.out  |    24 +
 .../spark/join_cond_pushdown_1.q.out            |    16 +
 .../spark/join_cond_pushdown_2.q.out            |     8 +
 .../spark/join_cond_pushdown_3.q.out            |    16 +
 .../spark/join_cond_pushdown_4.q.out            |     8 +
 .../spark/join_cond_pushdown_unqual1.q.out      |    32 +
 .../spark/join_cond_pushdown_unqual2.q.out      |    16 +
 .../spark/join_cond_pushdown_unqual3.q.out      |    32 +
 .../spark/join_cond_pushdown_unqual4.q.out      |    16 +
 .../spark/join_filters_overlap.q.out            |    20 +
 .../clientpositive/spark/join_hive_626.q.out    |     8 +
 .../clientpositive/spark/join_map_ppr.q.out     |    20 +
 .../spark/join_merge_multi_expressions.q.out    |    12 +
 .../clientpositive/spark/join_merging.q.out     |     8 +
 .../clientpositive/spark/join_nullsafe.q.out    |    24 +
 .../results/clientpositive/spark/join_rc.q.out  |     6 +
 .../clientpositive/spark/join_reorder.q.out     |    44 +
 .../clientpositive/spark/join_reorder2.q.out    |    20 +
 .../clientpositive/spark/join_reorder3.q.out    |    20 +
 .../clientpositive/spark/join_reorder4.q.out    |    24 +
 .../clientpositive/spark/join_star.q.out        |    48 +
 .../clientpositive/spark/join_thrift.q.out      |     4 +
 .../results/clientpositive/spark/join_vc.q.out  |     8 +
 .../clientpositive/spark/join_view.q.out        |     8 +
 .../spark/lateral_view_explode2.q.out           |     4 +
 .../clientpositive/spark/leftsemijoin.q.out     |     8 +
 .../clientpositive/spark/limit_pushdown.q.out   |    56 +
 .../clientpositive/spark/limit_pushdown2.q.out  |    44 +
 .../spark/list_bucket_dml_10.q.out              |     4 +
 .../spark/list_bucket_dml_2.q.out               |    14 +
 .../clientpositive/spark/load_dyn_part1.q.out   |    12 +
 .../clientpositive/spark/load_dyn_part10.q.out  |     7 +
 .../clientpositive/spark/load_dyn_part13.q.out  |     3 +
 .../clientpositive/spark/load_dyn_part14.q.out  |     3 +
 .../clientpositive/spark/load_dyn_part2.q.out   |    11 +
 .../clientpositive/spark/load_dyn_part3.q.out   |    11 +
 .../clientpositive/spark/load_dyn_part4.q.out   |    11 +
 .../clientpositive/spark/load_dyn_part5.q.out   |     3 +
 .../clientpositive/spark/load_dyn_part8.q.out   |    12 +
 .../clientpositive/spark/load_dyn_part9.q.out   |     7 +
 .../clientpositive/spark/louter_join_ppr.q.out  |    40 +
 .../results/clientpositive/spark/mapjoin1.q.out |    24 +
 .../clientpositive/spark/mapjoin_decimal.q.out  |     6 +
 .../clientpositive/spark/mapjoin_distinct.q.out |    32 +
 .../spark/mapjoin_filter_on_outerjoin.q.out     |    12 +
 .../clientpositive/spark/mapjoin_mapjoin.q.out  |    46 +
 .../clientpositive/spark/mapjoin_memcheck.q.out |     4 +
 .../clientpositive/spark/mapjoin_subquery.q.out |    20 +
 .../spark/mapjoin_subquery2.q.out               |     8 +
 .../spark/mapjoin_test_outer.q.out              |    16 +
 .../clientpositive/spark/mapreduce1.q.out       |     4 +
 .../clientpositive/spark/mapreduce2.q.out       |     4 +
 .../results/clientpositive/spark/merge1.q.out   |    20 +
 .../results/clientpositive/spark/merge2.q.out   |    20 +
 .../clientpositive/spark/mergejoins.q.out       |    16 +
 .../clientpositive/spark/mergejoins_mixed.q.out |    48 +
 .../spark/metadata_only_queries.q.out           |    70 +
 .../metadata_only_queries_with_filters.q.out    |     8 +
 .../clientpositive/spark/multi_insert.q.out     |    88 +
 .../clientpositive/spark/multi_insert_gby.q.out |    12 +
 .../spark/multi_insert_gby2.q.out               |     6 +
 .../spark/multi_insert_gby3.q.out               |    26 +
 .../spark/multi_insert_lateral_view.q.out       |    38 +
 .../spark/multi_insert_mixed.q.out              |     8 +
 ...i_insert_move_tasks_share_dependencies.q.out |   136 +
 .../clientpositive/spark/multi_join_union.q.out |    10 +
 .../spark/multigroupby_singlemr.q.out           |    32 +
 .../clientpositive/spark/nullgroup.q.out        |    16 +
 .../clientpositive/spark/nullgroup2.q.out       |    16 +
 .../clientpositive/spark/nullgroup4.q.out       |    16 +
 .../spark/nullgroup4_multi_distinct.q.out       |     8 +
 .../spark/optimize_nullscan.q.out               |    64 +
 .../clientpositive/spark/orc_merge1.q.out       |     9 +
 .../clientpositive/spark/orc_merge2.q.out       |     3 +
 .../clientpositive/spark/orc_merge3.q.out       |     8 +
 .../clientpositive/spark/orc_merge4.q.out       |     8 +
 .../clientpositive/spark/orc_merge5.q.out       |    12 +
 .../clientpositive/spark/orc_merge6.q.out       |    12 +
 .../clientpositive/spark/orc_merge7.q.out       |    10 +
 .../spark/orc_merge_diff_fs.q.out               |     9 +
 .../spark/orc_merge_incompat1.q.out             |     4 +
 .../spark/orc_merge_incompat2.q.out             |     7 +
 .../results/clientpositive/spark/order.q.out    |     8 +
 .../clientpositive/spark/outer_join_ppr.q.out   |    20 +
 .../results/clientpositive/spark/parallel.q.out |     6 +
 .../clientpositive/spark/parallel_join0.q.out   |     7 +
 .../clientpositive/spark/parallel_join1.q.out   |     4 +
 .../clientpositive/spark/parallel_orderby.q.out |     6 +
 .../clientpositive/spark/parquet_join.q.out     |    18 +
 .../spark/parquet_vectorization_0.q.out         |    60 +
 .../spark/parquet_vectorization_1.q.out         |     4 +
 .../spark/parquet_vectorization_10.q.out        |     4 +
 .../spark/parquet_vectorization_11.q.out        |     4 +
 .../spark/parquet_vectorization_12.q.out        |     4 +
 .../spark/parquet_vectorization_13.q.out        |     8 +
 .../spark/parquet_vectorization_14.q.out        |     4 +
 .../spark/parquet_vectorization_15.q.out        |     4 +
 .../spark/parquet_vectorization_16.q.out        |     4 +
 .../spark/parquet_vectorization_17.q.out        |     4 +
 .../spark/parquet_vectorization_2.q.out         |     4 +
 .../spark/parquet_vectorization_3.q.out         |     4 +
 .../spark/parquet_vectorization_4.q.out         |     4 +
 .../spark/parquet_vectorization_5.q.out         |     4 +
 .../spark/parquet_vectorization_6.q.out         |     4 +
 .../spark/parquet_vectorization_7.q.out         |     8 +
 .../spark/parquet_vectorization_8.q.out         |     8 +
 .../spark/parquet_vectorization_9.q.out         |     4 +
 .../parquet_vectorization_decimal_date.q.out    |     4 +
 .../spark/parquet_vectorization_div0.q.out      |    12 +
 .../spark/parquet_vectorization_limit.q.out     |    28 +
 .../parquet_vectorization_offset_limit.q.out    |     8 +
 .../parquet_vectorization_part_project.q.out    |     8 +
 .../spark/parquet_vectorization_pushdown.q.out  |     4 +
 .../test/results/clientpositive/spark/pcr.q.out |   186 +
 .../clientpositive/spark/ppd_gby_join.q.out     |     8 +
 .../results/clientpositive/spark/ppd_join.q.out |     8 +
 .../clientpositive/spark/ppd_join2.q.out        |     8 +
 .../clientpositive/spark/ppd_join3.q.out        |     8 +
 .../clientpositive/spark/ppd_join4.q.out        |     4 +
 .../clientpositive/spark/ppd_join5.q.out        |    12 +
 .../clientpositive/spark/ppd_join_filter.q.out  |    16 +
 .../clientpositive/spark/ppd_multi_insert.q.out |    20 +
 .../clientpositive/spark/ppd_outer_join1.q.out  |     8 +
 .../clientpositive/spark/ppd_outer_join2.q.out  |     8 +
 .../clientpositive/spark/ppd_outer_join3.q.out  |     8 +
 .../clientpositive/spark/ppd_outer_join4.q.out  |     8 +
 .../clientpositive/spark/ppd_outer_join5.q.out  |    24 +
 .../clientpositive/spark/ppd_transform.q.out    |    18 +
 .../test/results/clientpositive/spark/ptf.q.out |    96 +
 .../clientpositive/spark/ptf_matchpath.q.out    |    12 +
 .../clientpositive/spark/ptf_streaming.q.out    |    48 +
 .../clientpositive/spark/quotedid_smb.q.out     |     6 +
 .../spark/reduce_deduplicate.q.out              |     8 +
 .../spark/reduce_deduplicate_exclude_join.q.out |     4 +
 .../clientpositive/spark/router_join_ppr.q.out  |    40 +
 .../spark/runtime_skewjoin_mapjoin_spark.q.out  |     6 +
 .../results/clientpositive/spark/sample1.q.out  |     6 +
 .../results/clientpositive/spark/sample10.q.out |    12 +
 .../results/clientpositive/spark/sample2.q.out  |     4 +
 .../results/clientpositive/spark/sample3.q.out  |     4 +
 .../results/clientpositive/spark/sample4.q.out  |     4 +
 .../results/clientpositive/spark/sample5.q.out  |     4 +
 .../results/clientpositive/spark/sample6.q.out  |    32 +
 .../results/clientpositive/spark/sample7.q.out  |     4 +
 .../results/clientpositive/spark/sample8.q.out  |    24 +
 .../results/clientpositive/spark/sample9.q.out  |     4 +
 .../clientpositive/spark/script_pipe.q.out      |     8 +
 .../results/clientpositive/spark/semijoin.q.out |   148 +
 .../results/clientpositive/spark/skewjoin.q.out |    46 +
 .../clientpositive/spark/skewjoin_noskew.q.out  |     6 +
 .../spark/skewjoin_union_remove_1.q.out         |    24 +
 .../spark/skewjoin_union_remove_2.q.out         |     8 +
 .../clientpositive/spark/skewjoinopt1.q.out     |    24 +
 .../clientpositive/spark/skewjoinopt10.q.out    |     6 +
 .../clientpositive/spark/skewjoinopt11.q.out    |     6 +
 .../clientpositive/spark/skewjoinopt12.q.out    |     6 +
 .../clientpositive/spark/skewjoinopt13.q.out    |     8 +
 .../clientpositive/spark/skewjoinopt14.q.out    |     8 +
 .../clientpositive/spark/skewjoinopt15.q.out    |    24 +
 .../clientpositive/spark/skewjoinopt16.q.out    |     6 +
 .../clientpositive/spark/skewjoinopt17.q.out    |    12 +
 .../clientpositive/spark/skewjoinopt18.q.out    |     6 +
 .../clientpositive/spark/skewjoinopt19.q.out    |     6 +
 .../clientpositive/spark/skewjoinopt2.q.out     |    24 +
 .../clientpositive/spark/skewjoinopt20.q.out    |     6 +
 .../clientpositive/spark/skewjoinopt3.q.out     |    12 +
 .../clientpositive/spark/skewjoinopt4.q.out     |    12 +
 .../clientpositive/spark/skewjoinopt5.q.out     |     6 +
 .../clientpositive/spark/skewjoinopt6.q.out     |     6 +
 .../clientpositive/spark/skewjoinopt7.q.out     |     8 +
 .../clientpositive/spark/skewjoinopt8.q.out     |     8 +
 .../clientpositive/spark/skewjoinopt9.q.out     |    12 +
 .../clientpositive/spark/smb_mapjoin_1.q.out    |    48 +
 .../clientpositive/spark/smb_mapjoin_10.q.out   |     8 +
 .../clientpositive/spark/smb_mapjoin_11.q.out   |    22 +
 .../clientpositive/spark/smb_mapjoin_12.q.out   |    24 +
 .../clientpositive/spark/smb_mapjoin_13.q.out   |    12 +
 .../clientpositive/spark/smb_mapjoin_14.q.out   |    70 +
 .../clientpositive/spark/smb_mapjoin_15.q.out   |    24 +
 .../clientpositive/spark/smb_mapjoin_16.q.out   |     6 +
 .../clientpositive/spark/smb_mapjoin_17.q.out   |    68 +
 .../clientpositive/spark/smb_mapjoin_18.q.out   |    18 +
 .../clientpositive/spark/smb_mapjoin_19.q.out   |     6 +
 .../clientpositive/spark/smb_mapjoin_2.q.out    |    48 +
 .../clientpositive/spark/smb_mapjoin_20.q.out   |    18 +
 .../clientpositive/spark/smb_mapjoin_21.q.out   |    36 +
 .../clientpositive/spark/smb_mapjoin_22.q.out   |     8 +
 .../clientpositive/spark/smb_mapjoin_25.q.out   |    16 +
 .../clientpositive/spark/smb_mapjoin_3.q.out    |    48 +
 .../clientpositive/spark/smb_mapjoin_4.q.out    |   104 +
 .../clientpositive/spark/smb_mapjoin_5.q.out    |   104 +
 .../clientpositive/spark/smb_mapjoin_6.q.out    |    30 +
 .../clientpositive/spark/smb_mapjoin_7.q.out    |     6 +
 .../results/clientpositive/spark/sort.q.out     |     4 +
 .../spark/spark_combine_equivalent_work_2.q.out |     8 +
 .../spark/spark_constprog_dpp.q.out             |     6 +
 .../spark/spark_dynamic_partition_pruning.q.out |   586 +
 .../spark_dynamic_partition_pruning_2.q.out     |    80 +
 .../spark_dynamic_partition_pruning_3.q.out     |   122 +
 .../spark_dynamic_partition_pruning_4.q.out     |   206 +
 .../spark_dynamic_partition_pruning_5.q.out     |    24 +
 .../spark_dynamic_partition_pruning_6.q.out     |    44 +
 .../spark_dynamic_partition_pruning_7.q.out     |    28 +
 ...dynamic_partition_pruning_mapjoin_only.q.out |    36 +
 ...ic_partition_pruning_recursive_mapjoin.q.out |   112 +
 .../spark/spark_explain_groupbyshuffle.q.out    |     8 +
 .../spark/spark_explainuser_1.q.out             |   756 +-
 .../spark/spark_in_process_launcher.q.out       |     4 +
 .../spark/spark_local_queries.q.out             |     4 +
 .../spark_multi_insert_parallel_orderby.q.out   |    22 +
 .../spark/spark_union_merge.q.out               |     8 +
 .../spark/spark_use_op_stats.q.out              |    10 +
 .../spark/spark_use_ts_stats_for_mapjoin.q.out  |    20 +
 ...k_vectorized_dynamic_partition_pruning.q.out |   572 +
 .../results/clientpositive/spark/stats0.q.out   |    16 +
 .../results/clientpositive/spark/stats1.q.out   |     6 +
 .../results/clientpositive/spark/stats10.q.out  |    16 +
 .../results/clientpositive/spark/stats12.q.out  |    12 +
 .../results/clientpositive/spark/stats13.q.out  |     8 +
 .../results/clientpositive/spark/stats2.q.out   |    31 +
 .../results/clientpositive/spark/stats3.q.out   |     4 +
 .../results/clientpositive/spark/stats5.q.out   |     4 +
 .../results/clientpositive/spark/stats7.q.out   |    12 +
 .../results/clientpositive/spark/stats8.q.out   |    52 +
 .../results/clientpositive/spark/stats9.q.out   |     4 +
 .../clientpositive/spark/stats_noscan_1.q.out   |    20 +
 .../clientpositive/spark/stats_noscan_2.q.out   |    10 +
 .../clientpositive/spark/stats_only_null.q.out  |    20 +
 .../clientpositive/spark/subquery_exists.q.out  |    28 +
 .../clientpositive/spark/subquery_in.q.out      |   156 +
 .../clientpositive/spark/subquery_multi.q.out   |    98 +
 .../spark/subquery_multiinsert.q.out            |    12 +
 .../clientpositive/spark/subquery_notin.q.out   |   130 +
 .../spark/subquery_null_agg.q.out               |     4 +
 .../clientpositive/spark/subquery_scalar.q.out  |   196 +
 .../clientpositive/spark/subquery_select.q.out  |   126 +
 .../clientpositive/spark/subquery_views.q.out   |     6 +
 .../clientpositive/spark/temp_table.q.out       |    22 +
 .../clientpositive/spark/temp_table_join1.q.out |    14 +
 .../clientpositive/spark/tez_join_tests.q.out   |     6 +
 .../spark/tez_joins_explain.q.out               |     6 +
 .../clientpositive/spark/transform1.q.out       |    12 +
 .../clientpositive/spark/transform_ppr1.q.out   |    14 +
 .../clientpositive/spark/transform_ppr2.q.out   |    10 +
 .../clientpositive/spark/udf_example_add.q.out  |     4 +
 .../clientpositive/spark/udf_in_file.q.out      |     4 +
 .../results/clientpositive/spark/union.q.out    |     4 +
 .../results/clientpositive/spark/union10.q.out  |     4 +
 .../results/clientpositive/spark/union11.q.out  |     4 +
 .../results/clientpositive/spark/union12.q.out  |     8 +
 .../results/clientpositive/spark/union13.q.out  |     4 +
 .../results/clientpositive/spark/union14.q.out  |     6 +
 .../results/clientpositive/spark/union15.q.out  |     6 +
 .../results/clientpositive/spark/union16.q.out  |     4 +
 .../results/clientpositive/spark/union17.q.out  |     6 +
 .../results/clientpositive/spark/union18.q.out  |     6 +
 .../results/clientpositive/spark/union19.q.out  |     6 +
 .../results/clientpositive/spark/union2.q.out   |     4 +
 .../results/clientpositive/spark/union20.q.out  |     4 +
 .../results/clientpositive/spark/union21.q.out  |     6 +
 .../results/clientpositive/spark/union22.q.out  |    10 +
 .../results/clientpositive/spark/union23.q.out  |     4 +
 .../results/clientpositive/spark/union24.q.out  |    30 +
 .../results/clientpositive/spark/union25.q.out  |    12 +
 .../results/clientpositive/spark/union26.q.out  |     8 +
 .../results/clientpositive/spark/union27.q.out  |     8 +
 .../results/clientpositive/spark/union28.q.out  |     4 +
 .../results/clientpositive/spark/union29.q.out  |     4 +
 .../results/clientpositive/spark/union3.q.out   |     4 +
 .../results/clientpositive/spark/union30.q.out  |     4 +
 .../results/clientpositive/spark/union31.q.out  |    24 +
 .../results/clientpositive/spark/union32.q.out  |    30 +
 .../results/clientpositive/spark/union33.q.out  |     8 +
 .../results/clientpositive/spark/union34.q.out  |    20 +
 .../results/clientpositive/spark/union4.q.out   |     4 +
 .../results/clientpositive/spark/union5.q.out   |     4 +
 .../results/clientpositive/spark/union6.q.out   |     6 +
 .../results/clientpositive/spark/union7.q.out   |     6 +
 .../results/clientpositive/spark/union8.q.out   |     4 +
 .../results/clientpositive/spark/union9.q.out   |     4 +
 .../spark/union_lateralview.q.out               |     8 +
 .../clientpositive/spark/union_ppr.q.out        |     8 +
 .../clientpositive/spark/union_remove_1.q.out   |     4 +
 .../clientpositive/spark/union_remove_10.q.out  |     4 +
 .../clientpositive/spark/union_remove_11.q.out  |     4 +
 .../clientpositive/spark/union_remove_12.q.out  |     4 +
 .../clientpositive/spark/union_remove_13.q.out  |     4 +
 .../clientpositive/spark/union_remove_14.q.out  |     4 +
 .../clientpositive/spark/union_remove_15.q.out  |     3 +
 .../clientpositive/spark/union_remove_16.q.out  |     3 +
 .../clientpositive/spark/union_remove_17.q.out  |     3 +
 .../clientpositive/spark/union_remove_18.q.out  |     3 +
 .../clientpositive/spark/union_remove_19.q.out  |    12 +
 .../clientpositive/spark/union_remove_2.q.out   |     4 +
 .../clientpositive/spark/union_remove_20.q.out  |     4 +
 .../clientpositive/spark/union_remove_21.q.out  |     4 +
 .../clientpositive/spark/union_remove_22.q.out  |     8 +
 .../clientpositive/spark/union_remove_23.q.out  |     4 +
 .../clientpositive/spark/union_remove_24.q.out  |     4 +
 .../clientpositive/spark/union_remove_25.q.out  |    18 +
 .../clientpositive/spark/union_remove_3.q.out   |     4 +
 .../clientpositive/spark/union_remove_4.q.out   |     4 +
 .../clientpositive/spark/union_remove_5.q.out   |     4 +
 .../clientpositive/spark/union_remove_6.q.out   |     6 +
 .../spark/union_remove_6_subq.q.out             |    14 +
 .../clientpositive/spark/union_remove_7.q.out   |     4 +
 .../clientpositive/spark/union_remove_8.q.out   |     4 +
 .../clientpositive/spark/union_remove_9.q.out   |     4 +
 .../clientpositive/spark/union_top_level.q.out  |    28 +
 .../spark/vector_between_in.q.out               |    48 +
 .../spark/vector_cast_constant.q.out            |     4 +
 .../clientpositive/spark/vector_char_4.q.out    |     4 +
 .../spark/vector_count_distinct.q.out           |    64 +
 .../spark/vector_data_types.q.out               |    12 +
 .../spark/vector_decimal_aggregate.q.out        |    16 +
 .../spark/vector_decimal_mapjoin.q.out          |    36 +
 .../spark/vector_distinct_2.q.out               |     4 +
 .../clientpositive/spark/vector_elt.q.out       |     8 +
 .../clientpositive/spark/vector_groupby_3.q.out |     4 +
 .../spark/vector_inner_join.q.out               |    54 +
 .../spark/vector_left_outer_join.q.out          |     4 +
 .../spark/vector_mapjoin_reduce.q.out           |     8 +
 .../clientpositive/spark/vector_orderby_5.q.out |     4 +
 .../spark/vector_outer_join0.q.out              |    12 +
 .../spark/vector_outer_join1.q.out              |    12 +
 .../spark/vector_outer_join2.q.out              |     4 +
 .../spark/vector_outer_join3.q.out              |    12 +
 .../spark/vector_outer_join4.q.out              |    12 +
 .../spark/vector_outer_join5.q.out              |    60 +
 .../spark/vector_string_concat.q.out            |     8 +
 .../clientpositive/spark/vector_varchar_4.q.out |     4 +
 .../clientpositive/spark/vectorization_0.q.out  |    60 +
 .../clientpositive/spark/vectorization_1.q.out  |     4 +
 .../clientpositive/spark/vectorization_10.q.out |     4 +
 .../clientpositive/spark/vectorization_11.q.out |     4 +
 .../clientpositive/spark/vectorization_12.q.out |     4 +
 .../clientpositive/spark/vectorization_13.q.out |     8 +
 .../clientpositive/spark/vectorization_14.q.out |     4 +
 .../clientpositive/spark/vectorization_15.q.out |     4 +
 .../clientpositive/spark/vectorization_16.q.out |     4 +
 .../clientpositive/spark/vectorization_17.q.out |     4 +
 .../clientpositive/spark/vectorization_2.q.out  |     4 +
 .../clientpositive/spark/vectorization_3.q.out  |     4 +
 .../clientpositive/spark/vectorization_4.q.out  |     4 +
 .../clientpositive/spark/vectorization_5.q.out  |     4 +
 .../clientpositive/spark/vectorization_6.q.out  |     4 +
 .../clientpositive/spark/vectorization_9.q.out  |     4 +
 .../spark/vectorization_decimal_date.q.out      |     4 +
 .../spark/vectorization_div0.q.out              |    16 +
 .../vectorization_input_format_excludes.q.out   |    40 +
 .../spark/vectorization_nested_udf.q.out        |     4 +
 .../vectorization_parquet_projection.q.out      |    26 +
 .../spark/vectorization_part_project.q.out      |     8 +
 .../spark/vectorization_pushdown.q.out          |     4 +
 .../spark/vectorization_short_regress.q.out     |    80 +
 .../clientpositive/spark/vectorized_case.q.out  |    52 +-
 .../spark/vectorized_mapjoin.q.out              |     4 +
 .../spark/vectorized_math_funcs.q.out           |     4 +
 .../spark/vectorized_nested_mapjoin.q.out       |     4 +
 .../clientpositive/spark/vectorized_ptf.q.out   |    96 +
 .../spark/vectorized_shufflejoin.q.out          |     4 +
 .../spark/vectorized_string_funcs.q.out         |     4 +
 .../spark/vectorized_timestamp_funcs.q.out      |    28 +
 .../clientpositive/spark/windowing.q.out        |     4 +
 .../special_character_in_tabnames_2.q.out       |     4 +
 .../clientpositive/stat_estimate_drill.q.out    |    28 +
 .../stat_estimate_related_col.q.out             |    40 +
 ql/src/test/results/clientpositive/stats0.q.out |    16 +
 ql/src/test/results/clientpositive/stats1.q.out |     6 +
 .../test/results/clientpositive/stats10.q.out   |    16 +
 .../test/results/clientpositive/stats12.q.out   |    12 +
 .../test/results/clientpositive/stats13.q.out   |     8 +
 ql/src/test/results/clientpositive/stats2.q.out |    31 +
 ql/src/test/results/clientpositive/stats3.q.out |     4 +
 ql/src/test/results/clientpositive/stats4.q.out |    12 +
 ql/src/test/results/clientpositive/stats5.q.out |     4 +
 ql/src/test/results/clientpositive/stats7.q.out |    12 +
 ql/src/test/results/clientpositive/stats8.q.out |    52 +
 ql/src/test/results/clientpositive/stats9.q.out |     4 +
 .../clientpositive/stats_empty_dyn_part.q.out   |     3 +
 .../clientpositive/stats_empty_partition2.q.out |    10 +
 .../results/clientpositive/stats_nonpart.q.out  |    24 +
 .../results/clientpositive/stats_noscan_1.q.out |    20 +
 .../results/clientpositive/stats_noscan_2.q.out |    10 +
 .../clientpositive/stats_null_optimizer.q.out   |     4 +
 .../clientpositive/stats_only_null.q.out        |    20 +
 .../results/clientpositive/stats_part.q.out     |    48 +
 .../results/clientpositive/stats_part2.q.out    |    70 +
 .../clientpositive/stats_partial_size.q.out     |     8 +
 .../results/clientpositive/stats_ppr_all.q.out  |    32 +
 .../results/clientpositive/stats_sizebug.q.out  |     4 +
 .../results/clientpositive/statsoptimizer.q.out |     4 +
 .../results/clientpositive/str_to_map.q.out     |    16 +
 .../test/results/clientpositive/structin.q.out  |     8 +
 ql/src/test/results/clientpositive/subq.q.out   |     4 +
 ql/src/test/results/clientpositive/subq2.q.out  |     4 +
 .../subq_where_serialization.q.out              |     4 +
 .../results/clientpositive/subquery_alias.q.out |     8 +
 .../clientpositive/subquery_exists.q.out        |    28 +
 .../clientpositive/subquery_exists_having.q.out |     8 +
 .../clientpositive/subquery_multiinsert.q.out   |    12 +
 .../clientpositive/subquery_notexists.q.out     |    16 +
 .../subquery_notexists_having.q.out             |     8 +
 .../clientpositive/subquery_notin_having.q.out  |    24 +
 .../subquery_unqual_corr_expr.q.out             |     8 +
 .../subquery_unqualcolumnrefs.q.out             |    18 +
 .../symlink_text_input_format.q.out             |    28 +
 .../results/clientpositive/tablevalues.q.out    |    48 +
 .../temp_table_display_colstats_tbllvl.q.out    |    18 +
 .../clientpositive/temp_table_join1.q.out       |    14 +
 .../clientpositive/temp_table_truncate.q.out    |     4 +
 .../test_teradatabinaryfile.q.out               |     2 +-
 .../tez/acid_vectorization_original_tez.q.out   |    16 +
 .../clientpositive/tez/explainanalyze_1.q.out   |    56 +
 .../clientpositive/tez/explainanalyze_3.q.out   |    88 +
 .../clientpositive/tez/explainanalyze_4.q.out   |    24 +
 .../clientpositive/tez/explainanalyze_5.q.out   |    24 +
 .../clientpositive/tez/explainuser_3.q.out      |    92 +
 .../tez/hybridgrace_hashjoin_1.q.out            |    64 +
 .../tez/hybridgrace_hashjoin_2.q.out            |   128 +
 .../tez/multi_count_distinct.q.out              |     8 +
 .../results/clientpositive/tez/tez-tag.q.out    |    18 +
 .../results/clientpositive/tez/topnkey.q.out    |    12 +
 .../tez/vector_join_part_col_char.q.out         |    14 +
 .../tez/vector_non_string_partition.q.out       |    12 +
 .../clientpositive/tez/vector_topnkey.q.out     |    12 +
 .../test/results/clientpositive/timestamp.q.out |     8 +
 .../clientpositive/timestamp_ints_casts.q.out   |     8 +
 .../clientpositive/timestamp_literal.q.out      |    12 +
 .../results/clientpositive/timestamptz.q.out    |    16 +
 .../test/results/clientpositive/topnkey.q.out   |    12 +
 .../results/clientpositive/transform1.q.out     |    12 +
 .../results/clientpositive/transform_ppr1.q.out |    14 +
 .../results/clientpositive/transform_ppr2.q.out |    10 +
 .../truncate_column_list_bucket.q.out           |    12 +
 .../results/clientpositive/truncate_table.q.out |    16 +
 .../clientpositive/tumbled_window_tests.q.out   |   135 +
 .../results/clientpositive/type_cast_1.q.out    |     4 +
 .../results/clientpositive/type_widening.q.out  |    24 +
 .../udaf_binarysetfunctions.q.out               |     4 +
 .../udaf_binarysetfunctions_no_cbo.q.out        |     4 +
 .../clientpositive/udaf_number_format.q.out     |     4 +
 .../udaf_percentile_approx_23.q.out             |     8 +
 ql/src/test/results/clientpositive/udf1.q.out   |     4 +
 ql/src/test/results/clientpositive/udf2.q.out   |     4 +
 ql/src/test/results/clientpositive/udf3.q.out   |     4 +
 ql/src/test/results/clientpositive/udf4.q.out   |     4 +
 ql/src/test/results/clientpositive/udf5.q.out   |     8 +
 ql/src/test/results/clientpositive/udf6.q.out   |     8 +
 ql/src/test/results/clientpositive/udf7.q.out   |     4 +
 ql/src/test/results/clientpositive/udf8.q.out   |     4 +
 ql/src/test/results/clientpositive/udf9.q.out   |     4 +
 .../results/clientpositive/udf_10_trims.q.out   |     4 +
 ql/src/test/results/clientpositive/udf_E.q.out  |     8 +
 ql/src/test/results/clientpositive/udf_PI.q.out |     8 +
 .../test/results/clientpositive/udf_abs.q.out   |     8 +
 .../results/clientpositive/udf_add_months.q.out |     4 +
 .../clientpositive/udf_aes_decrypt.q.out        |     4 +
 .../clientpositive/udf_aes_encrypt.q.out        |     4 +
 .../test/results/clientpositive/udf_array.q.out |     4 +
 .../test/results/clientpositive/udf_ascii.q.out |     4 +
 .../results/clientpositive/udf_between.q.out    |    16 +
 .../clientpositive/udf_bitwise_shiftleft.q.out  |     4 +
 .../clientpositive/udf_bitwise_shiftright.q.out |     4 +
 .../udf_bitwise_shiftrightunsigned.q.out        |     4 +
 .../test/results/clientpositive/udf_case.q.out  |     4 +
 .../udf_case_column_pruning.q.out               |     4 +
 .../clientpositive/udf_case_thrift.q.out        |     4 +
 .../test/results/clientpositive/udf_cbrt.q.out  |     4 +
 .../clientpositive/udf_character_length.q.out   |    12 +
 .../udf_compare_java_string.q.out               |     2 +
 .../results/clientpositive/udf_concat_ws.q.out  |     8 +
 .../test/results/clientpositive/udf_count.q.out |    20 +
 .../test/results/clientpositive/udf_crc32.q.out |     4 +
 .../clientpositive/udf_current_database.q.out   |    16 +
 .../clientpositive/udf_date_format.q.out        |     4 +
 .../results/clientpositive/udf_decode.q.out     |     4 +
 .../results/clientpositive/udf_degrees.q.out    |     8 +
 .../test/results/clientpositive/udf_elt.q.out   |     4 +
 .../clientpositive/udf_example_add.q.out        |     4 +
 .../results/clientpositive/udf_explode.q.out    |    16 +
 .../results/clientpositive/udf_factorial.q.out  |     4 +
 .../clientpositive/udf_find_in_set.q.out        |     4 +
 .../clientpositive/udf_folder_constants.q.out   |     6 +
 .../clientpositive/udf_format_number.q.out      |     4 +
 .../clientpositive/udf_from_utc_timestamp.q.out |     4 +
 .../clientpositive/udf_get_json_object.q.out    |     4 +
 .../results/clientpositive/udf_greatest.q.out   |     4 +
 .../test/results/clientpositive/udf_hash.q.out  |     4 +
 .../test/results/clientpositive/udf_hour.q.out  |     4 +
 ql/src/test/results/clientpositive/udf_if.q.out |     8 +
 .../results/clientpositive/udf_in_file.q.out    |     4 +
 .../results/clientpositive/udf_inline.q.out     |     4 +
 .../test/results/clientpositive/udf_instr.q.out |     4 +
 .../clientpositive/udf_isnull_isnotnull.q.out   |     8 +
 .../clientpositive/udf_isops_simplify.q.out     |   356 +
 .../clientpositive/udf_java_method.q.out        |     4 +
 .../results/clientpositive/udf_last_day.q.out   |     4 +
 .../test/results/clientpositive/udf_least.q.out |     4 +
 .../results/clientpositive/udf_length.q.out     |     8 +
 .../clientpositive/udf_levenshtein.q.out        |     4 +
 .../test/results/clientpositive/udf_like.q.out  |     4 +
 .../results/clientpositive/udf_locate.q.out     |     4 +
 .../clientpositive/udf_logic_java_boolean.q.out |     2 +
 .../test/results/clientpositive/udf_lower.q.out |     4 +
 .../test/results/clientpositive/udf_lpad.q.out  |     4 +
 .../test/results/clientpositive/udf_map.q.out   |     4 +
 .../test/results/clientpositive/udf_mask.q.out  |     4 +
 .../clientpositive/udf_mask_first_n.q.out       |     4 +
 .../results/clientpositive/udf_mask_hash.q.out  |     4 +
 .../clientpositive/udf_mask_last_n.q.out        |     4 +
 .../clientpositive/udf_mask_show_first_n.q.out  |     4 +
 .../clientpositive/udf_mask_show_last_n.q.out   |     4 +
 .../test/results/clientpositive/udf_md5.q.out   |     4 +
 .../results/clientpositive/udf_minute.q.out     |     4 +
 .../clientpositive/udf_months_between.q.out     |     4 +
 .../clientpositive/udf_named_struct.q.out       |     4 +
 .../results/clientpositive/udf_next_day.q.out   |     4 +
 .../results/clientpositive/udf_notequal.q.out   |     8 +
 .../results/clientpositive/udf_nullif.q.out     |    12 +
 .../test/results/clientpositive/udf_nvl.q.out   |     4 +
 .../clientpositive/udf_octet_length.q.out       |     8 +
 .../results/clientpositive/udf_parse_url.q.out  |     4 +
 .../results/clientpositive/udf_printf.q.out     |     4 +
 .../results/clientpositive/udf_quarter.q.out    |     4 +
 .../results/clientpositive/udf_radians.q.out    |     8 +
 .../results/clientpositive/udf_reflect.q.out    |     4 +
 .../results/clientpositive/udf_reflect2.q.out   |     4 +
 .../results/clientpositive/udf_repeat.q.out     |     4 +
 .../results/clientpositive/udf_reverse.q.out    |     4 +
 .../test/results/clientpositive/udf_rpad.q.out  |     4 +
 .../results/clientpositive/udf_second.q.out     |     4 +
 .../test/results/clientpositive/udf_sha1.q.out  |     4 +
 .../test/results/clientpositive/udf_sha2.q.out  |     4 +
 .../test/results/clientpositive/udf_sign.q.out  |     8 +
 .../test/results/clientpositive/udf_size.q.out  |     4 +
 .../results/clientpositive/udf_sort_array.q.out |     4 +
 .../results/clientpositive/udf_soundex.q.out    |     4 +
 .../test/results/clientpositive/udf_space.q.out |     4 +
 .../test/results/clientpositive/udf_split.q.out |     4 +
 .../results/clientpositive/udf_struct.q.out     |     4 +
 .../clientpositive/udf_substring_index.q.out    |     4 +
 .../results/clientpositive/udf_testlength.q.out |     2 +
 .../clientpositive/udf_testlength2.q.out        |     2 +
 .../results/clientpositive/udf_to_string.q.out  |    18 +
 .../clientpositive/udf_to_unix_timestamp.q.out  |     8 +
 .../clientpositive/udf_to_utc_timestamp.q.out   |     4 +
 .../test/results/clientpositive/udf_trunc.q.out |    48 +
 .../clientpositive/udf_trunc_number.q.out       |    24 +
 .../test/results/clientpositive/udf_union.q.out |     4 +
 .../test/results/clientpositive/udf_when.q.out  |     4 +
 .../clientpositive/udf_width_bucket.q.out       |     4 +
 .../results/clientpositive/udtf_explode.q.out   |    16 +
 .../clientpositive/udtf_json_tuple.q.out        |    16 +
 .../clientpositive/udtf_parse_url_tuple.q.out   |    16 +
 .../results/clientpositive/udtf_stack.q.out     |    12 +
 .../results/clientpositive/unicode_data.q.out   |     6 +
 ql/src/test/results/clientpositive/union.q.out  |     4 +
 .../test/results/clientpositive/union10.q.out   |     4 +
 .../test/results/clientpositive/union11.q.out   |     4 +
 .../test/results/clientpositive/union12.q.out   |     8 +
 .../test/results/clientpositive/union13.q.out   |     4 +
 .../test/results/clientpositive/union14.q.out   |     6 +
 .../test/results/clientpositive/union15.q.out   |     6 +
 .../test/results/clientpositive/union16.q.out   |     4 +
 .../test/results/clientpositive/union17.q.out   |     6 +
 .../test/results/clientpositive/union18.q.out   |     6 +
 .../test/results/clientpositive/union19.q.out   |     6 +
 ql/src/test/results/clientpositive/union2.q.out |     4 +
 .../test/results/clientpositive/union20.q.out   |     4 +
 .../test/results/clientpositive/union21.q.out   |     6 +
 .../test/results/clientpositive/union22.q.out   |    10 +
 .../test/results/clientpositive/union23.q.out   |     4 +
 .../test/results/clientpositive/union24.q.out   |    30 +
 .../test/results/clientpositive/union25.q.out   |    12 +
 .../test/results/clientpositive/union26.q.out   |     8 +
 .../test/results/clientpositive/union27.q.out   |     8 +
 .../test/results/clientpositive/union28.q.out   |     4 +
 .../test/results/clientpositive/union29.q.out   |     4 +
 ql/src/test/results/clientpositive/union3.q.out |     4 +
 .../test/results/clientpositive/union30.q.out   |     4 +
 .../test/results/clientpositive/union31.q.out   |    24 +
 .../test/results/clientpositive/union32.q.out   |    30 +
 .../test/results/clientpositive/union33.q.out   |     8 +
 .../test/results/clientpositive/union34.q.out   |    20 +
 .../test/results/clientpositive/union37.q.out   |    24 +
 ql/src/test/results/clientpositive/union4.q.out |     4 +
 ql/src/test/results/clientpositive/union5.q.out |     4 +
 ql/src/test/results/clientpositive/union6.q.out |     6 +
 ql/src/test/results/clientpositive/union7.q.out |     6 +
 ql/src/test/results/clientpositive/union8.q.out |     4 +
 ql/src/test/results/clientpositive/union9.q.out |     4 +
 .../clientpositive/union_lateralview.q.out      |     8 +
 .../results/clientpositive/union_offcbo.q.out   |    30 +
 .../results/clientpositive/union_paren.q.out    |     4 +
 .../clientpositive/union_pos_alias.q.out        |    16 +
 .../test/results/clientpositive/union_ppr.q.out |     8 +
 .../results/clientpositive/union_remove_1.q.out |     4 +
 .../clientpositive/union_remove_10.q.out        |     4 +
 .../clientpositive/union_remove_11.q.out        |     4 +
 .../clientpositive/union_remove_12.q.out        |     4 +
 .../clientpositive/union_remove_13.q.out        |     4 +
 .../clientpositive/union_remove_14.q.out        |     4 +
 .../clientpositive/union_remove_15.q.out        |     3 +
 .../clientpositive/union_remove_16.q.out        |     3 +
 .../clientpositive/union_remove_17.q.out        |     3 +
 .../clientpositive/union_remove_18.q.out        |     3 +
 .../clientpositive/union_remove_19.q.out        |    12 +
 .../results/clientpositive/union_remove_2.q.out |     4 +
 .../clientpositive/union_remove_20.q.out        |     4 +
 .../clientpositive/union_remove_21.q.out        |     4 +
 .../clientpositive/union_remove_22.q.out        |     8 +
 .../clientpositive/union_remove_23.q.out        |     4 +
 .../clientpositive/union_remove_24.q.out        |     4 +
 .../clientpositive/union_remove_25.q.out        |    18 +
 .../results/clientpositive/union_remove_3.q.out |     4 +
 .../results/clientpositive/union_remove_4.q.out |     4 +
 .../results/clientpositive/union_remove_5.q.out |     4 +
 .../results/clientpositive/union_remove_6.q.out |     6 +
 .../clientpositive/union_remove_6_subq.q.out    |    14 +
 .../results/clientpositive/union_remove_7.q.out |     4 +
 .../results/clientpositive/union_remove_8.q.out |     4 +
 .../results/clientpositive/union_remove_9.q.out |     4 +
 .../clientpositive/union_remove_plan.q.out      |     4 +
 .../clientpositive/unionall_unbalancedppd.q.out |    12 +
 .../clientpositive/updateBasicStats.q.out       |    70 +
 .../clientpositive/vector_aggregate_9.q.out     |    12 +
 .../vector_aggregate_without_gby.q.out          |     4 +
 .../clientpositive/vector_between_columns.q.out |    12 +
 .../vector_binary_join_groupby.q.out            |    12 +
 .../results/clientpositive/vector_bround.q.out  |     4 +
 .../results/clientpositive/vector_bucket.q.out  |     4 +
 .../clientpositive/vector_case_when_1.q.out     |    47 +-
 .../clientpositive/vector_case_when_2.q.out     |    51 +-
 .../clientpositive/vector_cast_constant.q.out   |     4 +
 .../results/clientpositive/vector_char_2.q.out  |     8 +
 .../results/clientpositive/vector_char_4.q.out  |     4 +
 .../clientpositive/vector_char_mapjoin1.q.out   |    16 +
 .../clientpositive/vector_char_simple.q.out     |    12 +
 .../clientpositive/vector_coalesce.q.out        |    40 +-
 .../clientpositive/vector_coalesce_2.q.out      |    44 +-
 .../clientpositive/vector_coalesce_3.q.out      |    12 +-
 .../clientpositive/vector_coalesce_4.q.out      |    12 +-
 .../results/clientpositive/vector_const.q.out   |     4 +
 .../results/clientpositive/vector_count.q.out   |    16 +
 .../vector_custom_udf_configure.q.out           |     4 +
 .../clientpositive/vector_data_types.q.out      |    12 +
 .../results/clientpositive/vector_date_1.q.out  |    28 +
 .../clientpositive/vector_decimal_1.q.out       |    36 +
 .../clientpositive/vector_decimal_10_0.q.out    |     8 +
 .../clientpositive/vector_decimal_5.q.out       |     4 +
 .../clientpositive/vector_decimal_6.q.out       |    20 +
 .../vector_decimal_aggregate.q.out              |    16 +
 .../clientpositive/vector_decimal_cast.q.out    |     8 +
 .../vector_decimal_expressions.q.out            |    10 +-
 .../clientpositive/vector_decimal_mapjoin.q.out |    36 +
 .../vector_decimal_math_funcs.q.out             |     8 +
 .../vector_decimal_precision.q.out              |     8 +
 .../clientpositive/vector_decimal_round.q.out   |    24 +
 .../clientpositive/vector_decimal_round_2.q.out |    16 +
 .../vector_decimal_trailing.q.out               |     4 +
 .../clientpositive/vector_decimal_udf2.q.out    |    16 +
 .../vector_delete_orig_table.q.out              |     4 +
 .../clientpositive/vector_distinct_2.q.out      |     4 +
 .../results/clientpositive/vector_elt.q.out     |     8 +
 .../clientpositive/vector_empty_where.q.out     |    16 +
 .../clientpositive/vector_gather_stats.q.out    |     8 +
 .../clientpositive/vector_groupby4.q.out        |     4 +
 .../clientpositive/vector_groupby6.q.out        |     4 +
 .../clientpositive/vector_groupby_3.q.out       |     4 +
 .../clientpositive/vector_groupby_mapjoin.q.out |     4 +
 .../clientpositive/vector_groupby_reduce.q.out  |    16 +
 .../clientpositive/vector_grouping_sets.q.out   |    12 +
 .../results/clientpositive/vector_if_expr.q.out |     4 +
 .../clientpositive/vector_include_no_sel.q.out  |     6 +
 .../clientpositive/vector_interval_1.q.out      |    32 +
 .../vector_interval_arithmetic.q.out            |    32 +
 .../vector_interval_mapjoin.q.out               |     6 +
 .../vector_join_part_col_char.q.out             |    14 +
 .../clientpositive/vector_left_outer_join.q.out |     4 +
 .../vector_left_outer_join2.q.out               |    36 +
 .../clientpositive/vector_map_order.q.out       |     4 +
 .../vector_mr_diff_schema_alias.q.out           |     8 +
 .../clientpositive/vector_multi_insert.q.out    |     8 +
 .../vector_non_constant_in_expr.q.out           |     4 +
 .../vector_non_string_partition.q.out           |    12 +
 .../clientpositive/vector_null_projection.q.out |    10 +
 .../results/clientpositive/vector_nvl.q.out     |    16 +
 .../clientpositive/vector_orderby_5.q.out       |     4 +
 .../clientpositive/vector_outer_join0.q.out     |    12 +
 .../clientpositive/vector_outer_join1.q.out     |    12 +
 .../clientpositive/vector_outer_join2.q.out     |     4 +
 .../clientpositive/vector_outer_join3.q.out     |    12 +
 .../clientpositive/vector_outer_join4.q.out     |    12 +
 .../clientpositive/vector_outer_join6.q.out     |    16 +
 .../vector_outer_join_no_keys.q.out             |    12 +
 .../results/clientpositive/vector_reduce1.q.out |     4 +
 .../results/clientpositive/vector_reduce2.q.out |     4 +
 .../results/clientpositive/vector_reduce3.q.out |     4 +
 .../vector_reduce_groupby_decimal.q.out         |     4 +
 .../vector_reduce_groupby_duplicate_cols.q.out  |     6 +
 .../clientpositive/vector_string_concat.q.out   |     8 +
 .../clientpositive/vector_struct_in.q.out       |    32 +
 .../vector_tablesample_rows.q.out               |    18 +
 .../results/clientpositive/vector_topnkey.q.out |    12 +
 .../results/clientpositive/vector_udf3.q.out    |     4 +
 .../vector_udf_character_length.q.out           |    12 +
 .../vector_udf_octet_length.q.out               |     8 +
 .../clientpositive/vector_varchar_4.q.out       |     4 +
 .../vector_varchar_mapjoin1.q.out               |    16 +
 .../clientpositive/vector_varchar_simple.q.out  |    12 +
 .../clientpositive/vector_when_case_null.q.out  |     4 +
 .../clientpositive/vectorization_1.q.out        |     4 +
 .../clientpositive/vectorization_10.q.out       |     4 +
 .../clientpositive/vectorization_11.q.out       |     4 +
 .../clientpositive/vectorization_12.q.out       |     4 +
 .../clientpositive/vectorization_13.q.out       |     8 +
 .../clientpositive/vectorization_14.q.out       |     4 +
 .../clientpositive/vectorization_15.q.out       |     4 +
 .../clientpositive/vectorization_16.q.out       |     4 +
 .../clientpositive/vectorization_17.q.out       |     4 +
 .../clientpositive/vectorization_2.q.out        |     4 +
 .../clientpositive/vectorization_3.q.out        |     4 +
 .../clientpositive/vectorization_4.q.out        |     4 +
 .../clientpositive/vectorization_5.q.out        |     4 +
 .../clientpositive/vectorization_6.q.out        |     4 +
 .../clientpositive/vectorization_7.q.out        |     8 +
 .../clientpositive/vectorization_8.q.out        |     8 +
 .../clientpositive/vectorization_9.q.out        |     4 +
 .../vectorization_decimal_date.q.out            |     4 +
 .../clientpositive/vectorization_limit.q.out    |    28 +
 .../vectorization_nested_udf.q.out              |     4 +
 .../vectorization_numeric_overflows.q.out       |    40 +
 .../vectorization_offset_limit.q.out            |     8 +
 .../vectorization_parquet_projection.q.out      |    26 +
 .../vectorization_part_project.q.out            |     8 +
 .../clientpositive/vectorization_pushdown.q.out |     4 +
 .../vectorized_bucketmapjoin1.q.out             |    18 +
 .../clientpositive/vectorized_case.q.out        |    52 +-
 .../clientpositive/vectorized_casts.q.out       |     4 +
 .../clientpositive/vectorized_context.q.out     |     8 +
 .../clientpositive/vectorized_date_funcs.q.out  |    20 +
 .../vectorized_distinct_gby.q.out               |     8 +
 .../clientpositive/vectorized_join46_mr.q.out   |   102 +
 .../clientpositive/vectorized_mapjoin.q.out     |     4 +
 .../clientpositive/vectorized_mapjoin2.q.out    |     6 +
 .../clientpositive/vectorized_mapjoin3.q.out    |    18 +
 .../clientpositive/vectorized_math_funcs.q.out  |     4 +
 .../vectorized_parquet_types.q.out              |    24 +
 .../clientpositive/vectorized_shufflejoin.q.out |     4 +
 .../vectorized_string_funcs.q.out               |     4 +
 .../clientpositive/vectorized_timestamp.q.out   |    20 +
 .../vectorized_timestamp_funcs.q.out            |    28 +
 .../vectorized_timestamp_ints_casts.q.out       |     8 +
 .../view_authorization_sqlstd.q.out             |     6 +
 .../test/results/clientpositive/view_cbo.q.out  |    10 +
 .../results/clientpositive/windowing_gby2.q.out |    18 +
 .../clientpositive/windowing_navfn.q.out        |     4 +
 .../clientpositive/windowing_streaming.q.out    |    12 +
 serde/pom.xml                                   |    20 +
 .../hadoop/hive/serde2/MultiDelimitSerDe.java   |   308 +
 .../PrimitiveObjectInspectorUtils.java          |     4 +
 service-rpc/pom.xml                             |    60 +-
 .../service/rpc/thrift/TOpenSessionReq.java     |     7 +-
 .../org/apache/hive/tmpl/QueryProfileTmpl.jamon |    91 +-
 .../apache/hive/service/auth/HttpAuthUtils.java |    24 +-
 .../cli/operation/GetTablesOperation.java       |     3 +-
 .../hive/service/cli/operation/Operation.java   |     4 +
 .../service/cli/operation/OperationManager.java |    29 +-
 .../service/cli/operation/SQLOperation.java     |    16 +-
 .../service/cli/session/HiveSessionImpl.java    |     1 +
 .../hive/service/server/KillQueryImpl.java      |   123 +-
 .../hive-webapps/hiveserver2/hiveserver2.jsp    |     1 +
 .../hive-webapps/hiveserver2/llap.html          |     1 +
 .../hive-webapps/hiveserver2/logconf.jsp        |   140 +
 .../static/css/query-plan-graph.css             |    22 +
 .../resources/hive-webapps/static/js/logconf.js |    40 +
 .../hive-webapps/static/js/query-plan-graph.js  |   533 +
 .../resources/hive-webapps/static/js/vis.min.js |    63 +
 .../apache/hadoop/hive/shims/Hadoop23Shims.java |    17 +-
 .../apache/hadoop/hive/shims/HadoopShims.java   |    16 +
 .../hive/spark/client/SparkClientUtilities.java |     7 +-
 .../spark/client/SparkSubmitSparkClient.java    |     5 +-
 .../hive/spark/client/TestSparkClient.java      |    11 +
 .../hive/metastore/api/CommitTxnKeyValue.java   |   589 +
 .../hive/metastore/api/CommitTxnRequest.java    |   119 +-
 .../metastore/api/GetPartitionsFilterSpec.java  |   560 +
 .../api/GetPartitionsProjectionSpec.java        |   652 +
 .../metastore/api/GetPartitionsRequest.java     |  1188 +
 .../metastore/api/GetPartitionsResponse.java    |   449 +
 .../api/NotificationEventsCountRequest.java     |   206 +-
 .../hive/metastore/api/PartitionFilterMode.java |    48 +
 .../apache/hadoop/hive/metastore/api/Table.java |   357 +-
 .../hive/metastore/api/ThriftHiveMetastore.java |  4027 ++-
 .../gen-php/metastore/ThriftHiveMetastore.php   |  1613 +-
 .../src/gen/thrift/gen-php/metastore/Types.php  |   991 +-
 .../hive_metastore/ThriftHiveMetastore-remote   |     7 +
 .../hive_metastore/ThriftHiveMetastore.py       |  1132 +-
 .../gen/thrift/gen-py/hive_metastore/ttypes.py  |   722 +-
 .../gen/thrift/gen-rb/hive_metastore_types.rb   |   174 +-
 .../gen/thrift/gen-rb/thrift_hive_metastore.rb  |    61 +
 .../hive/metastore/HiveMetaStoreClient.java     |    36 +-
 .../hadoop/hive/metastore/IMetaStoreClient.java |    47 +
 .../hive/metastore/LockComponentBuilder.java    |   126 +
 .../hive/metastore/LockRequestBuilder.java      |   185 +
 .../metastore/PartitionExpressionProxy.java     |     9 +-
 .../hive/metastore/ReplChangeManager.java       |    20 +-
 .../hive/metastore/conf/MetastoreConf.java      |    41 +-
 .../hadoop/hive/metastore/utils/LogUtils.java   |   149 +
 .../hive/metastore/utils/MetaStoreUtils.java    |    55 +-
 .../src/main/thrift/hive_metastore.thrift       |   119 +-
 .../findbugs/findbugs-exclude.xml               |    24 +
 .../hadoop/hive/metastore/DatabaseProduct.java  |     2 +-
 .../DefaultPartitionExpressionProxy.java        |     2 +-
 .../hadoop/hive/metastore/HiveAlterHandler.java |     7 +-
 .../hadoop/hive/metastore/HiveMetaStore.java    |   156 +-
 .../hive/metastore/LockComponentBuilder.java    |   126 -
 .../hive/metastore/LockRequestBuilder.java      |   185 -
 .../hive/metastore/MetaStoreDirectSql.java      |   795 +-
 .../hive/metastore/MetastoreDirectSqlUtils.java |   571 +
 .../hadoop/hive/metastore/ObjectStore.java      |   380 +-
 .../hive/metastore/PartFilterExprUtil.java      |     4 +-
 .../metastore/PartitionProjectionEvaluator.java |   893 +
 .../apache/hadoop/hive/metastore/RawStore.java  |    37 +
 .../hive/metastore/StatObjectConverter.java     |   153 +-
 .../hive/metastore/cache/CachedStore.java       |   140 +-
 .../hive/metastore/cache/SharedCache.java       |     8 +-
 .../merge/DateColumnStatsMerger.java            |    33 +-
 .../hive/metastore/messaging/EventMessage.java  |    64 +-
 .../metastore/messaging/MessageBuilder.java     |   425 +
 .../metastore/messaging/MessageEncoder.java     |    27 +
 .../metastore/messaging/MessageFactory.java     |   364 +-
 .../metastore/messaging/MessageSerializer.java  |    24 +
 .../event/filters/DatabaseAndTableFilter.java   |     8 +-
 .../messaging/json/JSONAcidWriteMessage.java    |     9 +-
 .../json/JSONAddForeignKeyMessage.java          |     5 +-
 .../json/JSONAddNotNullConstraintMessage.java   |     5 +-
 .../messaging/json/JSONAddPartitionMessage.java |    11 +-
 .../json/JSONAddPrimaryKeyMessage.java          |     5 +-
 .../json/JSONAddUniqueConstraintMessage.java    |     5 +-
 .../messaging/json/JSONAlterCatalogMessage.java |     9 +-
 .../json/JSONAlterDatabaseMessage.java          |     9 +-
 .../json/JSONAlterPartitionMessage.java         |    15 +-
 .../messaging/json/JSONAlterTableMessage.java   |     9 +-
 .../messaging/json/JSONCommitTxnMessage.java    |     5 +-
 .../json/JSONCreateDatabaseMessage.java         |     5 +-
 .../json/JSONCreateFunctionMessage.java         |     5 +-
 .../messaging/json/JSONCreateTableMessage.java  |     5 +-
 .../json/JSONDropPartitionMessage.java          |     5 +-
 .../messaging/json/JSONDropTableMessage.java    |     5 +-
 .../messaging/json/JSONInsertMessage.java       |     9 +-
 .../messaging/json/JSONMessageEncoder.java      |    70 +
 .../messaging/json/JSONMessageFactory.java      |   401 -
 .../messaging/json/gzip/DeSerializer.java       |   199 +
 .../json/gzip/GzipJSONMessageEncoder.java       |    68 +
 .../messaging/json/gzip/Serializer.java         |    50 +
 .../hadoop/hive/metastore/model/MSerDeInfo.java |     3 +
 .../metastore/model/MStorageDescriptor.java     |     9 +-
 .../hadoop/hive/metastore/model/MTable.java     |    10 +-
 .../hive/metastore/tools/SQLGenerator.java      |   110 +-
 .../hadoop/hive/metastore/txn/TxnHandler.java   |   609 +-
 .../hadoop/hive/metastore/txn/TxnStore.java     |     4 +
 .../hadoop/hive/metastore/utils/LogUtils.java   |   140 -
 .../metastore/utils/MetaStoreServerUtils.java   |   282 +-
 .../src/main/resources/package.jdo              |     8 +-
 .../DummyRawStoreControlledCommit.java          |    53 +-
 .../DummyRawStoreForJdoConnection.java          |     9 +
 .../HiveMetaStoreClientPreCatalog.java          |    20 +
 .../InjectableBehaviourObjectStore.java         |    24 +
 .../hive/metastore/MetaStoreTestUtils.java      |    11 +
 .../MockPartitionExpressionForMetastore.java    |     2 +-
 ...PartitionsUsingProjectionAndFilterSpecs.java |   904 +
 .../hive/metastore/TestHiveMetaStore.java       |   196 +-
 .../TestHiveMetaStorePartitionSpecs.java        |     2 +
 .../hive/metastore/TestHiveMetaStoreTxns.java   |   107 +
 .../hadoop/hive/metastore/TestOldSchema.java    |     2 +-
 .../TestPartitionProjectionEvaluator.java       |   250 +
 .../TestTablesCreateDropAlterTruncate.java      |    11 +
 .../merge/DateColumnStatsMergerTest.java        |   108 +
 .../merge/DecimalColumnStatsMergerTest.java     |     2 -
 .../utils/TestMetaStoreServerUtils.java         |   443 +-
 .../hive/streaming/AbstractRecordWriter.java    |    65 +-
 .../streaming/AbstractStreamingTransaction.java |   160 +
 .../apache/hive/streaming/ConnectionStats.java  |    38 +-
 .../hive/streaming/HiveStreamingConnection.java |   704 +-
 .../hive/streaming/InvalidTransactionState.java |     5 +-
 .../apache/hive/streaming/PartitionInfo.java    |     1 +
 .../org/apache/hive/streaming/RecordWriter.java |    38 +-
 .../hive/streaming/StreamingConnection.java     |    56 +
 .../hive/streaming/StreamingTransaction.java    |   125 +
 .../apache/hive/streaming/TransactionBatch.java |   448 +
 .../apache/hive/streaming/TransactionError.java |     7 +-
 .../streaming/UnManagedSingleTransaction.java   |   136 +
 .../org/apache/hive/streaming/package-info.java |    22 +
 .../java/org/apache/hive/streaming/package.html |     3 +-
 .../apache/hive/streaming/TestStreaming.java    |   470 +-
 .../ptest2/conf/deployed/master-mr2.properties  |     2 +-
 3805 files changed, 219342 insertions(+), 55021 deletions(-)
----------------------------------------------------------------------