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 2017/02/02 02:03:49 UTC

[50/50] [abbrv] hive git commit: HIVE-14671 : merge master into hive-14535 (Sergey Shelukhin) UNVERIFIED (build only)

HIVE-14671 : merge master into hive-14535 (Sergey Shelukhin) UNVERIFIED (build only)

Conflicts:
	metastore/if/hive_metastore.thrift
	metastore/scripts/upgrade/derby/hive-schema-2.2.0.derby.sql
	metastore/scripts/upgrade/mssql/hive-schema-2.2.0.mssql.sql
	metastore/scripts/upgrade/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql
	metastore/scripts/upgrade/mysql/hive-schema-2.2.0.mysql.sql
	metastore/scripts/upgrade/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql
	metastore/scripts/upgrade/oracle/hive-schema-2.2.0.oracle.sql
	metastore/scripts/upgrade/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql
	metastore/scripts/upgrade/postgres/hive-schema-2.2.0.postgres.sql
	metastore/scripts/upgrade/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql
	metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
	metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
	metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
	metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
	metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
	metastore/src/gen/thrift/gen-php/metastore/Types.php
	metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
	metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
	metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
	metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
	metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
	metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
	metastore/src/model/org/apache/hadoop/hive/metastore/model/MTable.java
	ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
	ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
	ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java
	ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
	ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
	ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
	ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
	ql/src/java/org/apache/hadoop/hive/ql/optimizer/StatsOptimizer.java
	ql/src/java/org/apache/hadoop/hive/ql/parse/EximUtil.java
	ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java
	ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
	ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
	ql/src/java/org/apache/hadoop/hive/ql/plan/LoadDesc.java
	ql/src/java/org/apache/hadoop/hive/ql/plan/LoadTableDesc.java
	ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java


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

Branch: refs/heads/hive-14535
Commit: 748c1bd2fa2942459e88e26e9820ebe3b3dd1fb5
Parents: d00196c a67eb03
Author: Sergey Shelukhin <se...@apache.org>
Authored: Wed Feb 1 18:00:52 2017 -0800
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Wed Feb 1 18:00:52 2017 -0800

----------------------------------------------------------------------
 LICENSE                                         |  235 -
 NOTICE                                          |    9 +-
 .../test/results/positive/accumulo_joins.q.out  |   16 +-
 .../positive/accumulo_predicate_pushdown.q.out  |   72 +-
 .../results/positive/accumulo_queries.q.out     |   20 +-
 .../accumulo_single_sourced_multi_insert.q.out  |   41 +-
 .../apache/hadoop/hive/ant/GenVectorCode.java   |   83 +
 beeline/pom.xml                                 |   12 +-
 .../java/org/apache/hive/beeline/BeeLine.java   |  155 +-
 .../org/apache/hive/beeline/HiveSchemaTool.java |  461 +-
 .../hive/beeline/cli/CliOptionsProcessor.java   |    4 +-
 .../org/apache/hive/beeline/cli/HiveCli.java    |    6 +-
 .../apache/hive/beeline/TestBeeLineHistory.java |    9 +-
 bin/beeline                                     |    4 -
 bin/ext/help.cmd                                |    4 +-
 bin/ext/help.sh                                 |    2 +-
 bin/ext/hwi.cmd                                 |   62 -
 bin/ext/hwi.sh                                  |   50 -
 bin/hive                                        |    8 +
 bin/hive.cmd                                    |    4 +-
 bin/hplsql                                      |    4 -
 binary-package-licenses/NOTICE                  |   15 +
 binary-package-licenses/README                  |   89 +
 binary-package-licenses/asm-LICENSE             |   29 +
 .../com.google.protobuf-LICENSE                 |   42 +
 .../com.ibm.icu.icu4j-LICENSE                   |  385 +
 binary-package-licenses/com.sun.jersey-LICENSE  |   93 +
 .../com.thoughtworks.paranamer-LICENSE          |   26 +
 .../javax.transaction.transaction-api-LICENSE   |  128 +
 binary-package-licenses/javolution-LICENSE      |   25 +
 binary-package-licenses/jline-LICENSE           |   32 +
 .../org.abego.treelayout.core-LICENSE           |   26 +
 binary-package-licenses/org.antlr-LICENSE       |   27 +
 .../org.antlr.antlr4-LICENSE                    |   27 +
 .../org.antlr.stringtemplate-LICENSE            |   27 +
 .../org.codehaus.janino-LICENSE                 |   29 +
 .../org.jamon.jamon-runtime-LICENSE             |   27 +
 binary-package-licenses/org.jruby-LICENSE       |   17 +
 binary-package-licenses/org.json-LICENSE        |   22 +
 .../org.mozilla.rhino-LICENSE                   |  373 +
 binary-package-licenses/org.slf4j-LICENSE       |   21 +
 binary-package-licenses/sqlline-LICENSE         |   33 +
 .../org/apache/hadoop/hive/cli/CliDriver.java   |   46 +-
 .../hadoop/hive/cli/OptionsProcessor.java       |    4 +-
 common/pom.xml                                  |    1 -
 .../hadoop/hive/common/BlobStorageUtils.java    |   14 +-
 .../apache/hadoop/hive/common/FileUtils.java    |   49 +-
 .../hadoop/hive/common/JvmPauseMonitor.java     |    3 +-
 .../hadoop/hive/common/StatsSetupConst.java     |   24 +
 .../common/classification/RetrySemantics.java   |   55 +
 .../org/apache/hadoop/hive/conf/Constants.java  |    7 +
 .../org/apache/hadoop/hive/conf/HiveConf.java   |  226 +-
 .../hive/common/util/HiveStringUtils.java       |    5 +
 .../java/org/apache/hive/common/util/Ref.java   |   32 +
 .../java/org/apache/hive/http/HttpServer.java   |    8 +-
 .../hadoop/hive/common/TestFileUtils.java       |   51 +
 .../hive/common/type/HiveDecimalTestBase.java   |  561 ++
 .../hive/common/type/TestHiveDecimal.java       |  216 -
 .../TestHiveDecimalOrcSerializationUtils.java   |  378 +
 .../apache/hadoop/hive/conf/TestHiveConf.java   |    2 +-
 .../hive/common/util/TestBloomFilter.java       |  464 -
 conf/hive-env.sh.template                       |    4 +-
 .../hadoop/hive/contrib/serde2/RegexSerDe.java  |    5 +-
 .../hive/contrib/serde2/TypedBytesSerDe.java    |    5 +-
 .../clientnegative/case_with_row_sequence.q.out |    4 +-
 .../clientnegative/invalid_row_sequence.q.out   |    8 +-
 .../results/clientnegative/serde_regex.q.out    |    6 +-
 .../test/results/clientpositive/dboutput.q.out  |   10 +-
 .../clientpositive/fileformat_base64.q.out      |   10 +-
 .../clientpositive/udaf_example_max.q.out       |    2 +
 .../clientpositive/udaf_example_min.q.out       |    2 +
 .../clientpositive/udf_row_sequence.q.out       |   22 +-
 .../test/results/clientpositive/url_hook.q.out  |    6 +-
 data/conf/hive-site.xml                         |    6 +
 data/conf/spark/yarn-client/hive-site.xml       |    7 +-
 data/files/escapetest.txt                       |  Bin 254 -> 202 bytes
 data/files/over10k.gz                           |  Bin 0 -> 249276 bytes
 data/files/part_tiny_nulls.txt                  |   26 +
 data/files/table1.avsc                          |   25 +
 data/files/table1_1.avsc                        |   19 +
 data/files/trunc_number.txt                     |    4 +
 data/files/trunc_number1.txt                    |    4 +
 druid-handler/README.md                         |    3 +
 druid-handler/pom.xml                           |  165 +-
 .../hadoop/hive/druid/DruidStorageHandler.java  |  474 +-
 .../hive/druid/DruidStorageHandlerUtils.java    |  372 +-
 .../hive/druid/HiveDruidOutputFormat.java       |   55 -
 .../druid/HiveDruidQueryBasedInputFormat.java   |  370 -
 .../hadoop/hive/druid/HiveDruidSplit.java       |   83 -
 .../hadoop/hive/druid/io/DruidOutputFormat.java |  205 +
 .../druid/io/DruidQueryBasedInputFormat.java    |  420 +
 .../hadoop/hive/druid/io/DruidRecordWriter.java |  277 +
 .../hadoop/hive/druid/io/HiveDruidSplit.java    |   84 +
 .../serde/DruidGroupByQueryRecordReader.java    |   15 +-
 .../druid/serde/DruidQueryRecordReader.java     |   58 +-
 .../serde/DruidSelectQueryRecordReader.java     |   23 +-
 .../hadoop/hive/druid/serde/DruidSerDe.java     |  257 +-
 .../hive/druid/serde/DruidSerDeUtils.java       |    6 +-
 .../serde/DruidTimeseriesQueryRecordReader.java |    7 +-
 .../druid/serde/DruidTopNQueryRecordReader.java |    8 +-
 .../hive/druid/DruidStorageHandlerTest.java     |  224 +
 .../hadoop/hive/druid/QTestDruidSerDe.java      |   60 +-
 .../hadoop/hive/druid/QTestDruidSerDe2.java     |   92 +
 .../hive/druid/QTestDruidStorageHandler2.java   |   34 +
 .../hadoop/hive/druid/TestDerbyConnector.java   |  126 +
 .../hadoop/hive/druid/TestDruidSerDe.java       |  853 +-
 .../TestHiveDruidQueryBasedInputFormat.java     |   91 +-
 .../hive/ql/io/DruidRecordWriterTest.java       |  239 +
 errata.txt                                      |    1 +
 .../hive/hbase/HiveHFileOutputFormat.java       |    2 +-
 .../test/results/negative/cascade_dbdrop.q.out  |   24 +-
 .../generatehfiles_require_family_path.q.out    |    8 +-
 .../results/positive/hbase_binary_binary.q.out  |    4 -
 .../hbase_binary_external_table_queries.q.out   |    6 +-
 .../src/test/results/positive/hbase_bulk.q.out  |   47 +-
 .../results/positive/hbase_custom_key2.q.out    |   24 +-
 .../results/positive/hbase_custom_key3.q.out    |   24 +-
 .../results/positive/hbase_handler_bulk.q.out   |   34 +-
 .../src/test/results/positive/hbase_joins.q.out |   16 +-
 .../test/results/positive/hbase_ppd_join.q.out  |   64 +-
 .../results/positive/hbase_ppd_key_range.q.out  |   78 +-
 .../test/results/positive/hbase_pushdown.q.out  |   72 +-
 .../test/results/positive/hbase_queries.q.out   |   20 +-
 .../hbase_single_sourced_multi_insert.q.out     |   41 +-
 .../positive/hbase_timestamp_format.q.out       |    6 +-
 .../test/results/positive/hbase_viewjoins.q.out |    6 +
 .../src/test/results/positive/hbasestats.q.out  |    7 +-
 .../hive/hcatalog/data/HCatRecordSerDe.java     |    6 +-
 .../apache/hive/hcatalog/data/JsonSerDe.java    |    5 +-
 .../hive/hcatalog/mapreduce/InternalUtil.java   |    3 +
 .../hive/hcatalog/common/TestHCatUtil.java      |    5 +-
 .../hcatalog/pig/AbstractHCatLoaderTest.java    |  746 ++
 .../hcatalog/pig/AbstractHCatStorerTest.java    |    8 +-
 .../hive/hcatalog/pig/TestAvroHCatLoader.java   |   31 +
 .../hive/hcatalog/pig/TestE2EScenarios.java     |    2 +-
 .../hive/hcatalog/pig/TestHCatLoader.java       |  816 --
 .../hcatalog/pig/TestHCatLoaderEncryption.java  |    4 +-
 .../hive/hcatalog/pig/TestHCatLoaderStorer.java |   10 +-
 .../hive/hcatalog/pig/TestOrcHCatLoader.java    |   31 +
 .../hcatalog/pig/TestParquetHCatLoader.java     |   85 +
 .../hive/hcatalog/pig/TestRCFileHCatLoader.java |   31 +
 .../pig/TestSequenceFileHCatLoader.java         |   32 +
 .../hcatalog/pig/TestTextFileHCatLoader.java    |   31 +
 .../listener/DbNotificationListener.java        |  321 +-
 .../listener/TestNotificationListener.java      |   29 +-
 .../hive/hcatalog/streaming/HiveEndPoint.java   |   16 +-
 .../hive/hcatalog/streaming/TestStreaming.java  |   19 +
 .../worker/TestWarehousePartitionHelper.java    |    4 +-
 .../apache/hive/hcatalog/templeton/Server.java  |   29 +-
 .../templeton/tool/TempletonStorage.java        |    2 +-
 .../templeton/tool/ZooKeeperCleanup.java        |    4 -
 .../hive/hcatalog/templeton/TestServer.java     |   30 +
 .../java/org/apache/hive/hplsql/Arguments.java  |    4 +-
 hwi/pom.xml                                     |  132 -
 .../org/apache/hadoop/hive/hwi/HWIAuth.java     |  105 -
 .../hadoop/hive/hwi/HWIContextListener.java     |   74 -
 .../apache/hadoop/hive/hwi/HWIException.java    |   48 -
 .../org/apache/hadoop/hive/hwi/HWIServer.java   |  146 -
 .../apache/hadoop/hive/hwi/HWISessionItem.java  |  610 --
 .../hadoop/hive/hwi/HWISessionManager.java      |  222 -
 .../apache/hadoop/hive/hwi/TestHWIServer.java   |   77 -
 hwi/web/WEB-INF/web.xml                         |   34 -
 hwi/web/authorize.jsp                           |   88 -
 hwi/web/css/bootstrap.min.css                   |  706 --
 hwi/web/diagnostics.jsp                         |   84 -
 hwi/web/error_page.jsp                          |   54 -
 hwi/web/img/glyphicons-halflings-white.png      |  Bin 4352 -> 0 bytes
 hwi/web/img/glyphicons-halflings.png            |  Bin 4352 -> 0 bytes
 hwi/web/index.jsp                               |   48 -
 hwi/web/left_navigation.jsp                     |   31 -
 hwi/web/navbar.jsp                              |   33 -
 hwi/web/session_create.jsp                      |   84 -
 hwi/web/session_diagnostics.jsp                 |   77 -
 hwi/web/session_history.jsp                     |  125 -
 hwi/web/session_kill.jsp                        |   65 -
 hwi/web/session_list.jsp                        |   73 -
 hwi/web/session_manage.jsp                      |  197 -
 hwi/web/session_remove.jsp                      |   67 -
 hwi/web/session_result.jsp                      |   72 -
 hwi/web/show_database.jsp                       |   71 -
 hwi/web/show_databases.jsp                      |   62 -
 hwi/web/show_table.jsp                          |  184 -
 hwi/web/view_file.jsp                           |   79 -
 .../apache/hadoop/hive/serde2/CustomSerDe1.java |    5 +-
 .../apache/hadoop/hive/serde2/CustomSerDe2.java |    5 +-
 .../apache/hadoop/hive/serde2/CustomSerDe3.java |    7 +-
 .../apache/hadoop/hive/serde2/CustomSerDe4.java |    5 +-
 .../apache/hadoop/hive/serde2/CustomSerDe5.java |    5 +-
 .../api/TestHCatClientNotification.java         |   90 +-
 .../listener/TestDbNotificationListener.java    | 1102 +-
 itests/hive-blobstore/pom.xml                   |   25 -
 .../src/test/queries/clientpositive/ctas.q      |   30 +
 .../test/queries/clientpositive/insert_into.q   |    7 -
 .../insert_into_dynamic_partitions.q            |   24 +
 .../queries/clientpositive/insert_into_table.q  |   12 +
 .../clientpositive/insert_overwrite_directory.q |   27 +
 .../insert_overwrite_dynamic_partitions.q       |   30 +
 .../clientpositive/insert_overwrite_table.q     |   13 +
 .../write_final_output_blobstore.q              |   21 +
 .../src/test/resources/hive-site.xml            |   19 +
 .../clientnegative/select_dropped_table.q.out   |    4 +-
 .../src/test/results/clientpositive/ctas.q.out  |  879 ++
 .../results/clientpositive/insert_into.q.out    |  330 -
 .../insert_into_dynamic_partitions.q.out        |  333 +
 .../clientpositive/insert_into_table.q.out      |  368 +
 .../insert_overwrite_directory.q.out            |  645 ++
 .../insert_overwrite_dynamic_partitions.q.out   |  413 +
 .../clientpositive/insert_overwrite_table.q.out |  403 +
 .../write_final_output_blobstore.q.out          |  470 +
 itests/hive-unit/pom.xml                        |    5 +
 .../hadoop/hive/io/TestHadoopFileStatus.java    |   92 +
 .../hive/metastore/TestHiveMetaStore.java       |    1 +
 .../hive/metastore/TestReplChangeManager.java   |  330 +
 .../hive/metastore/hbase/TestHBaseImport.java   |  110 +-
 .../metastore/hbase/TestHBaseSchemaTool.java    |    8 +-
 .../hive/ql/TestReplicationScenarios.java       | 1097 ++
 .../TestHiveAuthorizerCheckInvocation.java      |    4 +-
 .../org/apache/hive/beeline/TestSchemaTool.java |  149 +-
 .../org/apache/hive/jdbc/TestJdbcDriver2.java   |   47 +-
 .../apache/hive/jdbc/TestJdbcWithMiniHS2.java   |   35 +
 .../cli/session/TestHiveSessionImpl.java        |    2 +-
 .../test/resources/testconfiguration.properties |   42 +-
 .../control/AbstractCoreBlobstoreCliDriver.java |   13 +-
 .../hadoop/hive/cli/control/CliConfigs.java     |    1 +
 .../org/apache/hadoop/hive/ql/QTestUtil.java    |    8 +-
 jdbc/pom.xml                                    |    6 -
 .../org/apache/hive/jdbc/HiveBaseResultSet.java |    6 +-
 .../hive/jdbc/TestHivePreparedStatement.java    |   17 +
 .../ext/LlapTaskUmbilicalExternalClient.java    |   66 +-
 .../apache/hadoop/hive/llap/io/api/LlapIo.java  |    3 +-
 .../hive/llap/registry/ServiceInstance.java     |    7 -
 .../hive/llap/registry/ServiceInstanceSet.java  |    5 +
 .../registry/impl/InactiveServiceInstance.java  |    5 -
 .../registry/impl/LlapFixedRegistryImpl.java    |    5 -
 .../impl/LlapZookeeperRegistryImpl.java         |   42 +-
 .../daemon/rpc/LlapDaemonProtocolProtos.java    |  323 +-
 .../org/apache/hadoop/hive/llap/DaemonId.java   |   17 +-
 .../org/apache/hadoop/hive/llap/LlapUtil.java   |   55 +-
 .../protocol/LlapTaskUmbilicalProtocol.java     |   12 +-
 .../hive/llap/security/LlapTokenIdentifier.java |    3 +-
 .../src/protobuf/LlapDaemonProtocol.proto       |    1 +
 .../hadoop/hive/llap/LlapBaseInputFormat.java   |    4 +-
 llap-server/pom.xml                             |    9 +
 .../llap/IncrementalObjectSizeEstimator.java    |    2 +-
 .../hadoop/hive/llap/cache/BuddyAllocator.java  |    3 +-
 .../hive/llap/cache/EvictionDispatcher.java     |   13 +-
 .../hadoop/hive/llap/cache/FileCache.java       |  107 +
 .../hive/llap/cache/FileCacheCleanupThread.java |  104 +
 .../hadoop/hive/llap/cache/LlapDataBuffer.java  |    7 +
 .../hive/llap/cache/LowLevelCacheImpl.java      |  255 +-
 .../llap/cache/LowLevelLrfuCachePolicy.java     |    2 +-
 .../hive/llap/cache/SerDeLowLevelCacheImpl.java |  731 ++
 .../hadoop/hive/llap/cli/LlapServiceDriver.java |   54 +-
 .../llap/cli/LlapStatusOptionsProcessor.java    |   85 +-
 .../hive/llap/cli/LlapStatusServiceDriver.java  |  413 +-
 .../hive/llap/daemon/impl/AMReporter.java       |  133 +-
 .../llap/daemon/impl/ContainerRunnerImpl.java   |   67 +-
 .../impl/EvictingPriorityBlockingQueue.java     |   16 +-
 .../hive/llap/daemon/impl/LlapDaemon.java       |   62 +-
 .../hive/llap/daemon/impl/LlapTokenChecker.java |    4 +-
 .../llap/daemon/impl/PriorityBlockingDeque.java |    4 +-
 .../hadoop/hive/llap/daemon/impl/QueryInfo.java |    7 +-
 .../hive/llap/daemon/impl/QueryTracker.java     |   27 +-
 .../llap/daemon/impl/TaskExecutorService.java   |   63 +-
 .../llap/daemon/impl/TaskRunnerCallable.java    |   62 +-
 .../comparator/ShortestJobFirstComparator.java  |   17 +-
 .../daemon/services/impl/LlapWebServices.java   |    6 +-
 .../hive/llap/io/api/impl/LlapInputFormat.java  |  350 +-
 .../hive/llap/io/api/impl/LlapIoImpl.java       |   32 +-
 .../hive/llap/io/api/impl/LlapRecordReader.java |  350 +
 .../llap/io/decode/ColumnVectorProducer.java    |   12 +-
 .../llap/io/decode/EncodedDataConsumer.java     |   23 +-
 .../io/decode/GenericColumnVectorProducer.java  |  208 +
 .../llap/io/decode/OrcColumnVectorProducer.java |   19 +-
 .../llap/io/decode/OrcEncodedDataConsumer.java  |  102 +-
 .../hive/llap/io/decode/ReadPipeline.java       |    3 +-
 .../llap/io/encoded/LineRrOffsetReader.java     |   86 +
 .../llap/io/encoded/OrcEncodedDataReader.java   |   20 +-
 .../llap/io/encoded/PassThruOffsetReader.java   |   66 +
 .../llap/io/encoded/SerDeEncodedDataReader.java | 1291 +++
 .../io/encoded/VertorDeserializeOrcWriter.java  |  261 +
 .../llap/io/metadata/ConsumerFileMetadata.java  |   31 +
 .../io/metadata/ConsumerStripeMetadata.java     |   35 +
 .../hive/llap/io/metadata/OrcFileMetadata.java  |    8 +-
 .../hive/llap/io/metadata/OrcMetadataCache.java |    2 +-
 .../llap/io/metadata/OrcStripeMetadata.java     |   13 +-
 .../llap/metrics/LlapDaemonExecutorMetrics.java |   17 +-
 .../llap/shufflehandler/ShuffleHandler.java     |    2 +-
 .../main/resources/hive-webapps/llap/index.html |   14 +-
 .../resources/hive-webapps/llap/js/metrics.js   |    2 +-
 .../resources/llap-daemon-log4j2.properties     |    5 +-
 llap-server/src/main/resources/package.py       |    2 +-
 .../hive/llap/cache/TestLowLevelCacheImpl.java  |   34 +
 .../hive/llap/daemon/MiniLlapCluster.java       |    2 +-
 .../daemon/impl/TaskExecutorTestHelpers.java    |   21 +-
 .../daemon/impl/TestTaskExecutorService.java    |   26 +-
 .../TestShortestJobFirstComparator.java         |  107 +-
 .../services/impl/TestLlapWebServices.java      |   69 +
 .../llap/tezplugins/LlapTaskCommunicator.java   |   88 +-
 .../tezplugins/LlapTaskSchedulerService.java    |  401 +-
 .../TestLlapTaskSchedulerService.java           |   58 +-
 metastore/if/hive_metastore.thrift              |   19 +-
 .../upgrade/derby/037-HIVE-14496.derby.sql      |    8 +
 .../upgrade/derby/037-HIVE-14637.derby.sql      |    6 -
 .../upgrade/derby/038-HIVE-14637.derby.sql      |    6 +
 .../upgrade/derby/hive-schema-2.2.0.derby.sql   |    2 +-
 .../derby/hive-txn-schema-2.2.0.derby.sql       |    2 +
 .../derby/upgrade-2.1.0-to-2.2.0.derby.sql      |    1 +
 .../upgrade/mssql/022-HIVE-14496.mssql.sql      |    1 +
 .../upgrade/mssql/022-HIVE-14637.mssql.sql      |   15 -
 .../upgrade/mssql/023-HIVE-14637.mssql.sql      |   15 +
 .../upgrade/mssql/hive-schema-2.2.0.mssql.sql   |    3 +
 .../mssql/upgrade-2.1.0-to-2.2.0.mssql.sql      |    3 +-
 .../upgrade/mysql/037-HIVE-14496.mysql.sql      |    8 +
 .../upgrade/mysql/037-HIVE-14637.mysql.sql      |   15 -
 .../upgrade/mysql/038-HIVE-14637.mysql.sql      |   15 +
 .../upgrade/mysql/hive-schema-2.2.0.mysql.sql   |    1 +
 .../mysql/hive-txn-schema-2.2.0.mysql.sql       |    2 +
 .../mysql/upgrade-2.1.0-to-2.2.0.mysql.sql      |    3 +-
 .../upgrade/oracle/037-HIVE-14496.oracle.sql    |    9 +
 .../upgrade/oracle/037-HIVE-14637.oracle.sql    |   15 -
 .../upgrade/oracle/038-HIVE-14637.oracle.sql    |   15 +
 .../upgrade/oracle/hive-schema-2.2.0.oracle.sql |    1 +
 .../oracle/hive-txn-schema-2.2.0.oracle.sql     |    2 +
 .../oracle/upgrade-2.1.0-to-2.2.0.oracle.sql    |    3 +-
 .../postgres/036-HIVE-14496.postgres.sql        |    8 +
 .../postgres/036-HIVE-14637.postgres.sql        |   16 -
 .../postgres/037-HIVE-14637.postgres.sql        |   16 +
 .../postgres/hive-schema-2.2.0.postgres.sql     |    1 +
 .../postgres/hive-txn-schema-2.2.0.postgres.sql |    2 +
 .../upgrade-2.1.0-to-2.2.0.postgres.sql         |    3 +-
 .../metastore/hbase/HbaseMetastoreProto.java    | 5474 +++++++++-
 .../gen/thrift/gen-cpp/ThriftHiveMetastore.cpp  | 2437 +++--
 .../gen/thrift/gen-cpp/ThriftHiveMetastore.h    |  126 +
 .../ThriftHiveMetastore_server.skeleton.cpp     |    5 +
 .../gen/thrift/gen-cpp/hive_metastore_types.cpp | 1387 +--
 .../gen/thrift/gen-cpp/hive_metastore_types.h   |   89 +-
 .../metastore/api/ClearFileMetadataRequest.java |   32 +-
 .../hive/metastore/api/ClientCapabilities.java  |   32 +-
 .../hive/metastore/api/CompactionResponse.java  |  583 ++
 .../hive/metastore/api/FireEventRequest.java    |   32 +-
 .../metastore/api/GetAllFunctionsResponse.java  |   36 +-
 .../api/GetFileMetadataByExprRequest.java       |   32 +-
 .../api/GetFileMetadataByExprResult.java        |   48 +-
 .../metastore/api/GetFileMetadataRequest.java   |   32 +-
 .../metastore/api/GetFileMetadataResult.java    |   44 +-
 .../hive/metastore/api/GetTablesRequest.java    |   32 +-
 .../hive/metastore/api/GetTablesResult.java     |   36 +-
 .../metastore/api/GetValidWriteIdsResult.java   |   32 +-
 .../metastore/api/InsertEventRequestData.java   |  181 +-
 .../metastore/api/PutFileMetadataRequest.java   |   64 +-
 .../api/ShowCompactResponseElement.java         |  107 +-
 .../apache/hadoop/hive/metastore/api/Table.java |  131 +-
 .../hive/metastore/api/ThriftHiveMetastore.java | 3456 ++++---
 .../gen-php/metastore/ThriftHiveMetastore.php   | 1466 +--
 .../src/gen/thrift/gen-php/metastore/Types.php  |  484 +-
 .../hive_metastore/ThriftHiveMetastore-remote   |    7 +
 .../hive_metastore/ThriftHiveMetastore.py       | 1391 +--
 .../gen/thrift/gen-py/hive_metastore/ttypes.py  |  334 +-
 .../gen/thrift/gen-rb/hive_metastore_types.rb   |   37 +-
 .../gen/thrift/gen-rb/thrift_hive_metastore.rb  |   54 +
 .../hadoop/hive/metastore/HiveAlterHandler.java |   29 +-
 .../hadoop/hive/metastore/HiveMetaHookV2.java   |   51 +
 .../hadoop/hive/metastore/HiveMetaStore.java    |  145 +-
 .../hive/metastore/HiveMetaStoreClient.java     |  137 +-
 .../hadoop/hive/metastore/IMetaStoreClient.java |   38 +-
 .../hive/metastore/MetaStoreDirectSql.java      |   19 +-
 .../hadoop/hive/metastore/MetaStoreUtils.java   |   83 +-
 .../hadoop/hive/metastore/ObjectStore.java      |   17 +-
 .../apache/hadoop/hive/metastore/RawStore.java  |   12 +
 .../hive/metastore/ReplChangeManager.java       |  356 +
 .../hive/metastore/RetryingHMSHandler.java      |   14 +-
 .../hive/metastore/RetryingMetaStoreClient.java |   13 +-
 .../apache/hadoop/hive/metastore/Warehouse.java |    7 +-
 .../hive/metastore/events/InsertEvent.java      |   35 +-
 .../hive/metastore/hbase/HBaseImport.java       |   19 +
 .../hive/metastore/hbase/HBaseReadWrite.java    |  100 +
 .../hadoop/hive/metastore/hbase/HBaseStore.java |  146 +-
 .../hadoop/hive/metastore/hbase/HBaseUtils.java |  123 +
 .../messaging/AddPartitionMessage.java          |   66 +
 .../metastore/messaging/AlterIndexMessage.java  |   33 +
 .../messaging/AlterPartitionMessage.java        |   65 +
 .../metastore/messaging/AlterTableMessage.java  |   54 +
 .../messaging/CreateDatabaseMessage.java        |   28 +
 .../messaging/CreateFunctionMessage.java        |   46 +
 .../metastore/messaging/CreateIndexMessage.java |   46 +
 .../metastore/messaging/CreateTableMessage.java |   51 +
 .../messaging/DropDatabaseMessage.java          |   27 +
 .../messaging/DropFunctionMessage.java          |   38 +
 .../metastore/messaging/DropIndexMessage.java   |   46 +
 .../messaging/DropPartitionMessage.java         |   47 +
 .../metastore/messaging/DropTableMessage.java   |   40 +
 .../hive/metastore/messaging/EventMessage.java  |  106 +
 .../hive/metastore/messaging/EventUtils.java    |  244 +
 .../hive/metastore/messaging/InsertMessage.java |   59 +
 .../messaging/MessageDeserializer.java          |  145 +
 .../metastore/messaging/MessageFactory.java     |  244 +
 .../metastore/messaging/PartitionFiles.java     |   50 +
 .../messaging/json/JSONAddPartitionMessage.java |  165 +
 .../messaging/json/JSONAlterIndexMessage.java   |   98 +
 .../json/JSONAlterPartitionMessage.java         |  137 +
 .../messaging/json/JSONAlterTableMessage.java   |  110 +
 .../json/JSONCreateDatabaseMessage.java         |   71 +
 .../json/JSONCreateFunctionMessage.java         |   86 +
 .../messaging/json/JSONCreateIndexMessage.java  |   87 +
 .../messaging/json/JSONCreateTableMessage.java  |  118 +
 .../messaging/json/JSONDropDatabaseMessage.java |   71 +
 .../messaging/json/JSONDropFunctionMessage.java |   79 +
 .../messaging/json/JSONDropIndexMessage.java    |   91 +
 .../json/JSONDropPartitionMessage.java          |  119 +
 .../messaging/json/JSONDropTableMessage.java    |   86 +
 .../messaging/json/JSONInsertMessage.java       |  110 +
 .../messaging/json/JSONMessageDeserializer.java |  189 +
 .../messaging/json/JSONMessageFactory.java      |  307 +
 .../metastore/txn/CompactionTxnHandler.java     |   76 +-
 .../hadoop/hive/metastore/txn/TxnHandler.java   |  326 +-
 .../hadoop/hive/metastore/txn/TxnStore.java     |   54 +-
 .../hadoop/hive/metastore/txn/TxnUtils.java     |   12 +-
 .../hadoop/hive/metastore/model/MTable.java     |   18 +-
 metastore/src/model/package.jdo                 |    3 +
 .../metastore/hbase/hbase_metastore_proto.proto |   37 +
 .../hive/metastore/TestHiveAlterHandler.java    |  108 +
 .../hive/metastore/TestMetaStoreUtils.java      |   41 +
 .../hadoop/hive/metastore/TestObjectStore.java  |   27 +-
 .../TestRetriesInRetryingHMSHandler.java        |  109 +
 .../hbase/TestHBaseAggregateStatsCache.java     |   20 +-
 ...stHBaseAggregateStatsCacheWithBitVector.java |   21 +-
 .../TestHBaseAggregateStatsExtrapolation.java   |   21 +-
 .../TestHBaseAggregateStatsNDVUniformDist.java  |   21 +-
 .../hive/metastore/hbase/TestHBaseStore.java    |  392 +
 .../metastore/hbase/TestHBaseStoreCached.java   |   43 +-
 .../hadoop/hive/metastore/txn/TestTxnUtils.java |   40 +-
 orc/pom.xml                                     |    1 -
 orc/src/java/org/apache/orc/OrcUtils.java       |   83 +
 .../java/org/apache/orc/TypeDescription.java    |  212 +-
 .../apache/orc/impl/ColumnStatisticsImpl.java   |   50 +-
 .../orc/impl/ConvertTreeReaderFactory.java      |   81 +-
 .../java/org/apache/orc/impl/OrcAcidUtils.java  |    3 +
 orc/src/java/org/apache/orc/impl/OrcTail.java   |    2 +-
 .../org/apache/orc/impl/PhysicalFsWriter.java   |  529 +
 .../org/apache/orc/impl/PhysicalWriter.java     |  122 +
 .../java/org/apache/orc/impl/ReaderImpl.java    |   13 +-
 .../org/apache/orc/impl/RecordReaderImpl.java   |   58 +-
 .../org/apache/orc/impl/RecordReaderUtils.java  |    2 +-
 .../org/apache/orc/impl/SchemaEvolution.java    |   77 +-
 .../org/apache/orc/impl/TreeReaderFactory.java  |   34 +-
 .../java/org/apache/orc/impl/WriterImpl.java    |  666 +-
 .../org/apache/orc/TestColumnStatistics.java    |   13 +-
 .../org/apache/orc/impl/TestOrcWideTable.java   |   12 +-
 .../apache/orc/impl/TestRecordReaderImpl.java   |    2 +-
 packaging/pom.xml                               |    6 -
 packaging/src/main/assembly/bin.xml             |   23 +
 packaging/src/main/assembly/src.xml             |    2 +-
 pom.xml                                         |   34 +-
 .../ExpressionTemplates/FilterColumnBetween.txt |    2 +-
 .../FilterColumnBetweenDynamicValue.txt         |  101 +
 .../FilterDecimalColumnBetween.txt              |   16 +
 .../FilterStringColumnBetween.txt               |    8 +-
 .../FilterTimestampColumnBetween.txt            |   16 +
 .../FilterTruncStringColumnBetween.txt          |    8 +-
 .../UDAFTemplates/VectorUDAFMinMaxDecimal.txt   |   45 +-
 .../org/apache/hadoop/hive/llap/DebugUtils.java |    1 +
 .../java/org/apache/hadoop/hive/ql/Context.java |   39 +-
 .../java/org/apache/hadoop/hive/ql/Driver.java  |  121 +-
 .../org/apache/hadoop/hive/ql/ErrorMsg.java     |   11 +-
 .../org/apache/hadoop/hive/ql/QueryState.java   |    2 -
 .../hive/ql/exec/AbstractMapJoinOperator.java   |    2 +-
 .../hive/ql/exec/AbstractMapOperator.java       |    1 +
 .../hadoop/hive/ql/exec/ArchiveUtils.java       |    2 +-
 .../hadoop/hive/ql/exec/CommonJoinOperator.java |  309 +-
 .../hive/ql/exec/CommonMergeJoinOperator.java   |    8 +-
 .../org/apache/hadoop/hive/ql/exec/DDLTask.java |  181 +-
 .../hive/ql/exec/DynamicValueRegistry.java      |   30 +
 .../hive/ql/exec/ExprNodeColumnEvaluator.java   |    5 +-
 .../exec/ExprNodeConstantDefaultEvaluator.java  |    7 +-
 .../hive/ql/exec/ExprNodeConstantEvaluator.java |    7 +-
 .../ql/exec/ExprNodeDynamicValueEvaluator.java  |   54 +
 .../hadoop/hive/ql/exec/ExprNodeEvaluator.java  |   13 +-
 .../hive/ql/exec/ExprNodeEvaluatorFactory.java  |   18 +-
 .../hive/ql/exec/ExprNodeEvaluatorHead.java     |    2 +-
 .../hive/ql/exec/ExprNodeEvaluatorRef.java      |    2 +-
 .../hive/ql/exec/ExprNodeFieldEvaluator.java    |    7 +-
 .../ql/exec/ExprNodeGenericFuncEvaluator.java   |    7 +-
 .../hadoop/hive/ql/exec/FetchOperator.java      |    2 +-
 .../hadoop/hive/ql/exec/FileSinkOperator.java   |   34 +-
 .../hadoop/hive/ql/exec/FilterOperator.java     |    2 +-
 .../hadoop/hive/ql/exec/FunctionRegistry.java   |   17 +-
 .../hadoop/hive/ql/exec/GroupByOperator.java    |   88 +-
 .../hive/ql/exec/HashTableDummyOperator.java    |   10 +
 .../hive/ql/exec/HashTableSinkOperator.java     |    6 +-
 .../hadoop/hive/ql/exec/JoinOperator.java       |    3 +-
 .../apache/hadoop/hive/ql/exec/JoinUtil.java    |   25 +-
 .../apache/hadoop/hive/ql/exec/MapOperator.java |   72 +-
 .../apache/hadoop/hive/ql/exec/MoveTask.java    |   15 +-
 .../apache/hadoop/hive/ql/exec/ObjectCache.java |   10 +
 .../hadoop/hive/ql/exec/ObjectCacheWrapper.java |    5 +
 .../apache/hadoop/hive/ql/exec/Operator.java    |    8 +-
 .../hadoop/hive/ql/exec/OperatorUtils.java      |   16 +
 .../apache/hadoop/hive/ql/exec/PTFOperator.java |   12 +-
 .../hadoop/hive/ql/exec/PTFPartition.java       |    6 +-
 .../apache/hadoop/hive/ql/exec/PTFTopNHash.java |   13 +-
 .../hadoop/hive/ql/exec/ReduceSinkOperator.java |    4 +-
 .../apache/hadoop/hive/ql/exec/Registry.java    |    2 +-
 .../hadoop/hive/ql/exec/ReplCopyTask.java       |   43 +-
 .../hadoop/hive/ql/exec/SelectOperator.java     |    2 +-
 .../hadoop/hive/ql/exec/SkewJoinHandler.java    |    2 +-
 .../apache/hadoop/hive/ql/exec/StatsTask.java   |   11 +-
 .../apache/hadoop/hive/ql/exec/TopNHash.java    |   33 +-
 .../apache/hadoop/hive/ql/exec/Utilities.java   |  219 +-
 .../hadoop/hive/ql/exec/mr/MapRedTask.java      |    9 +
 .../hadoop/hive/ql/exec/mr/ObjectCache.java     |    5 +
 .../persistence/MapJoinEagerRowContainer.java   |    2 +-
 .../persistence/MapJoinTableContainerSerDe.java |    2 +-
 .../hive/ql/exec/spark/GroupByShuffler.java     |   10 +-
 .../hive/ql/exec/spark/HiveReduceFunction.java  |    4 +-
 .../spark/HiveReduceFunctionResultList.java     |    8 +-
 .../ql/exec/spark/HiveSparkClientFactory.java   |   31 +-
 .../hadoop/hive/ql/exec/spark/ReduceTran.java   |    4 +-
 .../ql/exec/spark/RemoteHiveSparkClient.java    |    8 +-
 .../hadoop/hive/ql/exec/spark/ShuffleTran.java  |    6 +-
 .../hive/ql/exec/spark/SortByShuffler.java      |   65 +-
 .../hive/ql/exec/spark/SparkPlanGenerator.java  |    7 -
 .../ql/exec/spark/SparkReduceRecordHandler.java |   29 +-
 .../hive/ql/exec/spark/SparkShuffler.java       |    2 +-
 .../hadoop/hive/ql/exec/spark/SparkTask.java    |  102 +-
 .../hive/ql/exec/spark/SparkUtilities.java      |    8 +-
 .../spark/status/RemoteSparkJobMonitor.java     |   24 +-
 .../ql/exec/spark/status/SparkJobStatus.java    |    2 +
 .../spark/status/impl/LocalSparkJobStatus.java  |   12 +
 .../spark/status/impl/RemoteSparkJobStatus.java |    5 +
 .../hadoop/hive/ql/exec/tez/DagUtils.java       |    5 +
 .../ql/exec/tez/DynamicValueRegistryTez.java    |  137 +
 .../hive/ql/exec/tez/LlapObjectCache.java       |   18 +
 .../hive/ql/exec/tez/MapRecordProcessor.java    |   39 +-
 .../hadoop/hive/ql/exec/tez/ObjectCache.java    |   16 +
 .../hive/ql/exec/tez/ReduceRecordProcessor.java |   56 +-
 .../hive/ql/exec/tez/TezSessionPoolManager.java |  143 +-
 .../hive/ql/exec/tez/TezSessionState.java       |    7 +-
 .../apache/hadoop/hive/ql/exec/tez/TezTask.java |   10 +-
 .../ql/exec/vector/VectorDeserializeRow.java    |    3 +-
 .../exec/vector/VectorExpressionDescriptor.java |    3 +-
 .../hive/ql/exec/vector/VectorExtractRow.java   |    6 +-
 .../ql/exec/vector/VectorFilterOperator.java    |    2 +
 .../ql/exec/vector/VectorHashKeyWrapper.java    |    3 +-
 .../exec/vector/VectorHashKeyWrapperBatch.java  |    2 +-
 .../ql/exec/vector/VectorMapJoinOperator.java   |    2 +-
 .../VectorMapJoinOuterFilteredOperator.java     |    4 +-
 .../hive/ql/exec/vector/VectorMapOperator.java  |    1 -
 .../exec/vector/VectorSMBMapJoinOperator.java   |    2 +-
 .../ql/exec/vector/VectorSelectOperator.java    |    1 +
 .../hive/ql/exec/vector/VectorSerializeRow.java |  635 +-
 .../ql/exec/vector/VectorizationContext.java    |  328 +-
 .../expressions/CastDecimalToBoolean.java       |    7 +-
 .../vector/expressions/CastDecimalToChar.java   |    4 +-
 .../vector/expressions/CastDecimalToDouble.java |    2 +-
 .../vector/expressions/CastDecimalToLong.java   |   44 +-
 .../vector/expressions/CastDecimalToString.java |   23 +-
 .../expressions/CastDecimalToTimestamp.java     |   11 +-
 .../expressions/CastDecimalToVarChar.java       |    4 +-
 .../vector/expressions/CastDoubleToDecimal.java |   10 +-
 .../vector/expressions/DecimalColumnInList.java |   21 +-
 .../ql/exec/vector/expressions/DecimalUtil.java |  281 +-
 .../DynamicValueVectorExpression.java           |  314 +
 .../expressions/FilterDecimalColumnInList.java  |   18 +-
 .../expressions/FilterStructColumnInList.java   |    2 +-
 .../vector/expressions/FuncDecimalToLong.java   |   19 +-
 .../vector/expressions/StructColumnInList.java  |    2 +-
 .../vector/expressions/VectorExpression.java    |   13 +-
 .../VectorInBloomFilterColDynamicValue.java     |  285 +
 .../expressions/VectorUDFDateAddScalarCol.java  |    2 +
 .../expressions/VectorUDFDateDiffColScalar.java |    2 +
 .../expressions/VectorUDFDateDiffScalarCol.java |    2 +
 .../aggregates/VectorUDAFAvgDecimal.java        |   95 +-
 .../aggregates/VectorUDAFBloomFilter.java       |  474 +
 .../aggregates/VectorUDAFBloomFilterMerge.java  |  365 +
 .../aggregates/VectorUDAFSumDecimal.java        |  148 +-
 .../mapjoin/VectorMapJoinCommonOperator.java    |   11 +-
 .../VectorMapJoinGenerateResultOperator.java    |    5 +-
 .../ql/exec/vector/udf/VectorUDFAdaptor.java    |   10 +-
 .../apache/hadoop/hive/ql/hooks/ATSHook.java    |  269 +-
 .../hadoop/hive/ql/hooks/HookContext.java       |   38 +-
 .../hadoop/hive/ql/hooks/LineageLogger.java     |   31 +-
 .../hooks/PostExecOrcRowGroupCountPrinter.java  |   75 +
 .../apache/hadoop/hive/ql/hooks/ReadEntity.java |    6 +-
 .../org/apache/hadoop/hive/ql/io/AcidUtils.java |   32 +-
 .../hive/ql/io/CombineHiveRecordReader.java     |   67 +-
 .../ql/io/HiveContextAwareRecordReader.java     |   10 +
 .../hadoop/hive/ql/io/HiveInputFormat.java      |  102 +-
 .../io/LlapWrappableInputFormatInterface.java   |    5 +-
 .../hadoop/hive/ql/io/NullRowsInputFormat.java  |    3 +-
 .../hive/ql/io/OneNullRowInputFormat.java       |    2 +-
 .../hadoop/hive/ql/io/ZeroRowsInputFormat.java  |   54 +
 .../ql/io/avro/AvroGenericRecordReader.java     |    7 +-
 .../hadoop/hive/ql/io/merge/MergeFileTask.java  |    3 +-
 .../hadoop/hive/ql/io/orc/OrcInputFormat.java   |  128 +-
 .../hadoop/hive/ql/io/orc/OrcOutputFormat.java  |    7 +-
 .../hive/ql/io/orc/OrcRawRecordMerger.java      |   14 +-
 .../apache/hadoop/hive/ql/io/orc/OrcSerde.java  |    6 +-
 .../apache/hadoop/hive/ql/io/orc/OrcSplit.java  |    6 +-
 .../hadoop/hive/ql/io/orc/ReaderImpl.java       |    9 +-
 .../ql/io/orc/VectorizedOrcInputFormat.java     |    5 +-
 .../hadoop/hive/ql/io/orc/WriterImpl.java       |   28 +-
 .../hive/ql/io/orc/encoded/CacheChunk.java      |    4 +
 .../ql/io/orc/encoded/EncodedReaderImpl.java    |   20 +-
 .../orc/encoded/EncodedTreeReaderFactory.java   |    2 +-
 .../hive/ql/io/orc/encoded/StreamUtils.java     |   13 +-
 .../io/parquet/MapredParquetOutputFormat.java   |    8 +-
 .../parquet/read/DataWritableReadSupport.java   |   24 +-
 .../serde/ArrayWritableObjectInspector.java     |   82 +-
 .../ql/io/parquet/serde/ParquetHiveSerDe.java   |   64 +-
 .../parquet/vector/VectorizedColumnReader.java  |  566 +-
 .../vector/VectorizedParquetRecordReader.java   |   84 +-
 .../vector/VectorizedPrimitiveColumnReader.java |  589 ++
 .../vector/VectorizedStructColumnReader.java    |   59 +
 .../ql/io/parquet/write/DataWritableWriter.java |    3 +-
 .../ql/io/rcfile/stats/PartialScanTask.java     |    3 +-
 .../io/rcfile/truncate/ColumnTruncateTask.java  |    3 +-
 .../hive/ql/io/sarg/ConvertAstToSearchArg.java  |   62 +-
 .../hadoop/hive/ql/lib/ExpressionWalker.java    |   97 +
 .../hadoop/hive/ql/lockmgr/DbLockManager.java   |    3 +-
 .../hadoop/hive/ql/lockmgr/DbTxnManager.java    |   18 +-
 .../hadoop/hive/ql/lockmgr/DummyTxnManager.java |   11 +-
 .../hive/ql/lockmgr/EmbeddedLockManager.java    |    3 +-
 .../hadoop/hive/ql/lockmgr/HiveLockManager.java |    3 +-
 .../hadoop/hive/ql/lockmgr/HiveTxnManager.java  |   20 +-
 .../hive/ql/lockmgr/HiveTxnManagerImpl.java     |    8 +
 .../zookeeper/ZooKeeperHiveLockManager.java     |   29 +-
 .../apache/hadoop/hive/ql/metadata/Hive.java    |  294 +-
 .../metadata/HiveMaterializedViewsRegistry.java |  393 +
 .../apache/hadoop/hive/ql/metadata/Table.java   |   27 +-
 .../formatting/MetaDataFormatUtils.java         |    3 +-
 .../hive/ql/optimizer/ColumnPrunerProcCtx.java  |  325 +-
 .../ql/optimizer/ColumnPrunerProcFactory.java   |  258 +-
 .../ql/optimizer/ConstantPropagateProcCtx.java  |    2 +-
 .../optimizer/ConstantPropagateProcFactory.java |    4 +-
 .../hive/ql/optimizer/ConvertJoinMapJoin.java   |   82 +-
 .../DynamicPartitionPruningOptimization.java    |  342 +-
 .../hadoop/hive/ql/optimizer/FieldNode.java     |  134 +-
 .../optimizer/FixedBucketPruningOptimizer.java  |    2 +-
 .../hive/ql/optimizer/GenMapRedUtils.java       |  171 +-
 .../ql/optimizer/LimitPushdownOptimizer.java    |   67 +-
 .../hive/ql/optimizer/MapJoinProcessor.java     |    1 +
 .../hadoop/hive/ql/optimizer/Optimizer.java     |    5 +-
 .../ql/optimizer/ReduceSinkMapJoinProc.java     |    3 +-
 ...edundantDynamicPruningConditionsRemoval.java |   24 +-
 ...tedDynPartitionTimeGranularityOptimizer.java |  372 +
 .../SparkRemoveDynamicPruningBySize.java        |   12 +-
 .../hive/ql/optimizer/StatsOptimizer.java       |   45 +-
 .../calcite/CalciteSemanticException.java       |    8 +-
 .../CalciteSubquerySemanticException.java       |   52 +
 .../optimizer/calcite/HivePlannerContext.java   |   12 +-
 .../ql/optimizer/calcite/HiveRelFactories.java  |    4 +-
 .../ql/optimizer/calcite/HiveRelShuttle.java    |   40 +
 .../optimizer/calcite/HiveRelShuttleImpl.java   |  145 +
 .../optimizer/calcite/HiveRexExecutorImpl.java  |   10 +-
 .../calcite/HiveSubQRemoveRelBuilder.java       | 1680 ++++
 .../ql/optimizer/calcite/RelOptHiveTable.java   |   21 +
 .../calcite/reloperators/HiveAggregate.java     |    7 -
 .../calcite/reloperators/HiveFilter.java        |   80 +-
 .../calcite/reloperators/HiveJoin.java          |   42 +-
 .../calcite/reloperators/HiveMultiJoin.java     |    2 +-
 .../calcite/reloperators/HiveProject.java       |   18 +-
 .../calcite/reloperators/HiveSemiJoin.java      |    8 -
 .../calcite/reloperators/HiveSortLimit.java     |   10 +
 .../calcite/reloperators/HiveTableScan.java     |    6 -
 .../rules/HiveExpandDistinctAggregatesRule.java |   29 +-
 .../rules/HiveReduceExpressionsRule.java        |    8 +
 .../calcite/rules/HiveRelDecorrelator.java      | 3011 ++++++
 .../calcite/rules/HiveRelFieldTrimmer.java      |   72 +-
 .../calcite/rules/HiveSemiJoinRule.java         |  110 +
 .../calcite/rules/HiveSubQueryRemoveRule.java   |  432 +
 .../HiveMaterializedViewFilterScanRule.java     |   91 +
 .../MaterializedViewSubstitutionVisitor.java    |  292 +
 .../rules/views/SubstitutionVisitor.java        | 2458 +++++
 .../stats/HiveRelMdDistinctRowCount.java        |    3 +-
 .../calcite/stats/HiveRelMdSelectivity.java     |   17 +-
 .../optimizer/calcite/stats/HiveRelMdSize.java  |   25 +-
 .../calcite/translator/ExprNodeConverter.java   |   33 +-
 .../calcite/translator/HiveOpConverter.java     |   49 +-
 .../translator/PlanModifierForASTConv.java      |    5 +-
 .../calcite/translator/RexNodeConverter.java    |  111 +-
 .../translator/SqlFunctionConverter.java        |   22 +-
 .../calcite/translator/TypeConverter.java       |   26 +-
 .../QueryPlanTreeTransformation.java            |    2 +-
 .../RewriteQueryUsingAggregateIndexCtx.java     |    3 +-
 .../ListBucketingPrunerUtils.java               |    2 +-
 .../annotation/OpTraitsRulesProcFactory.java    |   38 +-
 .../hive/ql/optimizer/physical/LlapDecider.java |   17 +-
 .../physical/NullScanTaskDispatcher.java        |   30 +-
 .../hive/ql/optimizer/physical/Vectorizer.java  |   39 +-
 .../hive/ql/optimizer/ppr/PartitionPruner.java  |   18 +-
 .../spark/CombineEquivalentWorkResolver.java    |   25 +
 .../spark/SetSparkReducerParallelism.java       |   56 +-
 .../optimizer/spark/SparkMapJoinOptimizer.java  |    2 +-
 .../stats/annotation/StatsRulesProcFactory.java |   64 +-
 .../apache/hadoop/hive/ql/parse/ASTNode.java    |    9 -
 .../hive/ql/parse/BaseSemanticAnalyzer.java     |   35 +-
 .../hadoop/hive/ql/parse/CalcitePlanner.java    |  744 +-
 .../ql/parse/ColumnStatsSemanticAnalyzer.java   |   38 +-
 .../hive/ql/parse/DDLSemanticAnalyzer.java      |   79 +-
 .../apache/hadoop/hive/ql/parse/EximUtil.java   |   96 +-
 .../hive/ql/parse/ExportSemanticAnalyzer.java   |    5 +-
 .../hadoop/hive/ql/parse/FromClauseParser.g     |   77 +-
 .../hadoop/hive/ql/parse/GenTezUtils.java       |  180 +-
 .../apache/hadoop/hive/ql/parse/GenTezWork.java |    6 +-
 .../apache/hadoop/hive/ql/parse/HiveParser.g    |   23 +-
 .../hadoop/hive/ql/parse/IdentifiersParser.g    |   91 +-
 .../hive/ql/parse/ImportSemanticAnalyzer.java   |   64 +-
 .../hadoop/hive/ql/parse/PTFTranslator.java     |   66 +-
 .../hadoop/hive/ql/parse/ParseContext.java      |   21 +
 .../hadoop/hive/ql/parse/QBParseInfo.java       |   21 +-
 .../apache/hadoop/hive/ql/parse/QBSubQuery.java |  200 +-
 .../ql/parse/ReplicationSemanticAnalyzer.java   | 1113 +-
 .../hadoop/hive/ql/parse/ReplicationSpec.java   |   41 +
 .../hadoop/hive/ql/parse/RuntimeValuesInfo.java |   62 +
 .../hadoop/hive/ql/parse/SemanticAnalyzer.java  |  350 +-
 .../hadoop/hive/ql/parse/StorageFormat.java     |    4 +-
 .../hadoop/hive/ql/parse/SubQueryUtils.java     |   15 +-
 .../hadoop/hive/ql/parse/TaskCompiler.java      |    5 +-
 .../hadoop/hive/ql/parse/TezCompiler.java       |  412 +-
 .../hadoop/hive/ql/parse/TypeCheckCtx.java      |   49 +-
 .../hive/ql/parse/TypeCheckProcFactory.java     |  178 +-
 .../ql/parse/UpdateDeleteSemanticAnalyzer.java  |  302 +-
 .../hadoop/hive/ql/parse/WindowingSpec.java     |  253 +-
 .../hive/ql/parse/spark/GenSparkUtils.java      |   19 +
 .../hive/ql/parse/spark/SparkCompiler.java      |  112 +
 .../hive/ql/plan/AbstractOperatorDesc.java      |   11 +
 .../hadoop/hive/ql/plan/AddPartitionDesc.java   |   22 +
 .../hadoop/hive/ql/plan/AggregationDesc.java    |    7 +
 .../apache/hadoop/hive/ql/plan/BaseWork.java    |   15 +
 .../hadoop/hive/ql/plan/CreateTableDesc.java    |   21 +
 .../hadoop/hive/ql/plan/CreateViewDesc.java     |   16 +-
 .../org/apache/hadoop/hive/ql/plan/DDLWork.java |   17 +
 .../hadoop/hive/ql/plan/DynamicValue.java       |  137 +
 .../hadoop/hive/ql/plan/ExprNodeColumnDesc.java |   50 +-
 .../hadoop/hive/ql/plan/ExprNodeDescUtils.java  |   69 +
 .../hive/ql/plan/ExprNodeDynamicValueDesc.java  |   76 +
 .../hive/ql/plan/ExprNodeSubQueryDesc.java      |  102 +
 .../apache/hadoop/hive/ql/plan/FetchWork.java   |    2 +-
 .../hadoop/hive/ql/plan/InsertTableDesc.java    |   40 +
 .../apache/hadoop/hive/ql/plan/JoinDesc.java    |   33 +
 .../apache/hadoop/hive/ql/plan/LoadDesc.java    |    4 +-
 .../hadoop/hive/ql/plan/LoadFileDesc.java       |   10 +
 .../hadoop/hive/ql/plan/LoadTableDesc.java      |   14 +-
 .../apache/hadoop/hive/ql/plan/MoveWork.java    |   10 +
 .../apache/hadoop/hive/ql/plan/OpTraits.java    |   21 +-
 .../hadoop/hive/ql/plan/OperatorDesc.java       |    2 +
 .../hadoop/hive/ql/plan/PTFDeserializer.java    |   12 +-
 .../hadoop/hive/ql/plan/PartitionDesc.java      |   68 +
 .../apache/hadoop/hive/ql/plan/PlanUtils.java   |   97 +-
 .../hive/ql/plan/ShowCompactionsDesc.java       |    2 +-
 .../apache/hadoop/hive/ql/plan/TableDesc.java   |   22 +-
 .../hadoop/hive/ql/plan/TableScanDesc.java      |   11 +
 .../hive/ql/plan/VectorPartitionDesc.java       |   42 +-
 .../hadoop/hive/ql/plan/ptf/BoundaryDef.java    |   56 +-
 .../hadoop/hive/ql/plan/ptf/CurrentRowDef.java  |   48 -
 .../hive/ql/plan/ptf/RangeBoundaryDef.java      |   72 -
 .../hive/ql/plan/ptf/ValueBoundaryDef.java      |   82 -
 .../hadoop/hive/ql/plan/ptf/WindowFrameDef.java |   22 +-
 .../hive/ql/ppd/ExprWalkerProcFactory.java      |    9 +-
 .../hadoop/hive/ql/ppd/OpProcFactory.java       |    4 +-
 .../ql/processors/CommandProcessorFactory.java  |    5 +
 .../hadoop/hive/ql/processors/HiveCommand.java  |    7 +-
 .../plugin/SettableConfigUpdater.java           |    2 +-
 .../plugin/sqlstd/Operation2Privilege.java      |    7 +-
 .../hadoop/hive/ql/session/LineageState.java    |   19 +-
 .../hadoop/hive/ql/session/SessionState.java    |   12 +-
 .../apache/hadoop/hive/ql/stats/StatsUtils.java |   47 +-
 .../hive/ql/txn/compactor/CompactorMR.java      |   19 +-
 .../hadoop/hive/ql/txn/compactor/Initiator.java |    6 +-
 .../hadoop/hive/ql/txn/compactor/Worker.java    |    4 +-
 .../org/apache/hadoop/hive/ql/udf/UDFLog.java   |    4 +-
 .../org/apache/hadoop/hive/ql/udf/UDFMath.java  |    2 +-
 .../org/apache/hadoop/hive/ql/udf/UDFSign.java  |    6 +-
 .../apache/hadoop/hive/ql/udf/UDFToBoolean.java |    4 +-
 .../apache/hadoop/hive/ql/udf/UDFToByte.java    |    4 +-
 .../apache/hadoop/hive/ql/udf/UDFToDouble.java  |    4 +-
 .../apache/hadoop/hive/ql/udf/UDFToFloat.java   |    4 +-
 .../apache/hadoop/hive/ql/udf/UDFToInteger.java |    4 +-
 .../apache/hadoop/hive/ql/udf/UDFToLong.java    |    4 +-
 .../apache/hadoop/hive/ql/udf/UDFToShort.java   |    4 +-
 .../hive/ql/udf/generic/GenericUDAFAverage.java |   37 +-
 .../ql/udf/generic/GenericUDAFBloomFilter.java  |  271 +
 .../ql/udf/generic/GenericUDAFEvaluator.java    |   51 +
 .../hive/ql/udf/generic/GenericUDAFSum.java     |   83 +-
 .../hadoop/hive/ql/udf/generic/GenericUDF.java  |   16 +
 .../hive/ql/udf/generic/GenericUDFAbs.java      |    3 +-
 .../hive/ql/udf/generic/GenericUDFBRound.java   |    7 +-
 .../ql/udf/generic/GenericUDFBaseNumeric.java   |   29 +
 .../generic/GenericUDFCardinalityViolation.java |   64 +
 .../hive/ql/udf/generic/GenericUDFCeil.java     |    4 +-
 .../hive/ql/udf/generic/GenericUDFDateDiff.java |   14 +-
 .../hive/ql/udf/generic/GenericUDFFloor.java    |    4 +-
 .../hive/ql/udf/generic/GenericUDFGrouping.java |   91 +
 .../ql/udf/generic/GenericUDFInBloomFilter.java |  174 +
 .../ql/udf/generic/GenericUDFMonthsBetween.java |   23 +-
 .../hive/ql/udf/generic/GenericUDFOPDivide.java |   26 +-
 .../ql/udf/generic/GenericUDFOPEqualNS.java     |    5 +
 .../hive/ql/udf/generic/GenericUDFOPMod.java    |    8 +-
 .../ql/udf/generic/GenericUDFOPMultiply.java    |   10 +-
 .../ql/udf/generic/GenericUDFOPNegative.java    |    4 +-
 .../ql/udf/generic/GenericUDFOPNotEqualNS.java  |   45 +
 .../udf/generic/GenericUDFOPNumericMinus.java   |   15 +-
 .../ql/udf/generic/GenericUDFOPNumericPlus.java |   17 +-
 .../hive/ql/udf/generic/GenericUDFRound.java    |   16 +-
 .../ql/udf/generic/GenericUDFSQCountCheck.java  |   99 +
 .../ql/udf/generic/GenericUDFStringToMap.java   |    2 +-
 .../hive/ql/udf/generic/GenericUDFTrunc.java    |  325 +-
 .../hive/ql/udf/ptf/BasePartitionEvaluator.java |  503 +
 .../hive/ql/udf/ptf/TableFunctionEvaluator.java |    2 +-
 .../hive/ql/udf/ptf/ValueBoundaryScanner.java   |  729 ++
 .../hive/ql/udf/ptf/WindowingTableFunction.java |  914 +-
 .../hive/metastore/txn/TestTxnHandler.java      |   88 +-
 .../apache/hadoop/hive/ql/TestTxnCommands.java  |  240 +-
 .../apache/hadoop/hive/ql/TestTxnCommands2.java |  113 +-
 .../ql/TestTxnCommands2WithSplitUpdate.java     |    6 -
 .../hive/ql/exec/InputEstimatorTestClass.java   |  106 +
 .../hive/ql/exec/TestFunctionRegistry.java      |    2 +
 .../hadoop/hive/ql/exec/TestUtilities.java      |  215 +-
 .../exec/vector/TestVectorGroupByOperator.java  |   12 +-
 .../hive/ql/exec/vector/TestVectorSerDeRow.java |  226 +-
 .../ql/exec/vector/VectorRandomRowSource.java   |   26 +-
 .../vector/expressions/TestDecimalUtil.java     |    1 -
 .../TestVectorFilterExpressions.java            |   12 +
 .../TestVectorGenericDateExpressions.java       |    2 +-
 .../vector/expressions/TestVectorTypeCasts.java |   28 +-
 .../mapjoin/fast/CheckFastRowHashMap.java       |   27 +-
 .../exec/vector/mapjoin/fast/VerifyFastRow.java |    5 +-
 .../vector/util/VectorizedRowGroupGenUtil.java  |    6 +-
 .../hive/ql/io/orc/TestInputOutputFormat.java   |  227 +-
 .../io/parquet/TestVectorizedColumnReader.java  |  418 +-
 ...ectorizedDictionaryEncodingColumnReader.java |   85 +
 .../parquet/VectorizedColumnReaderTestBase.java |  694 ++
 .../read/TestDataWritableReadSupport.java       |   16 +-
 .../ql/io/sarg/TestConvertAstToSearchArg.java   |   39 +-
 .../hive/ql/io/sarg/TestSearchArgumentImpl.java |    2 +-
 .../hive/ql/lockmgr/TestDbTxnManager.java       |   78 +-
 .../hive/ql/lockmgr/TestDbTxnManager2.java      |  254 +-
 .../hive/ql/lockmgr/TestDummyTxnManager.java    |   24 +-
 .../hadoop/hive/ql/metadata/TestHive.java       |    4 +
 .../hive/ql/metadata/TestHiveCopyFiles.java     |  223 +
 .../ql/optimizer/TestColumnPrunerProcCtx.java   |   91 +-
 ...TestGenMapRedUtilsCreateConditionalTask.java |  290 +
 .../calcite/TestCBORuleFiredOnlyOnce.java       |    2 +-
 .../ql/optimizer/physical/TestVectorizer.java   |   57 +-
 .../hadoop/hive/ql/parse/TestGenTezWork.java    |    5 +
 .../apache/hadoop/hive/ql/parse/TestIUD.java    |    4 +-
 .../hive/ql/parse/TestMergeStatement.java       |   17 +
 .../hadoop/hive/ql/parse/TestQBSubQuery.java    |    2 +-
 .../apache/hadoop/hive/ql/plan/TestMapWork.java |   17 +
 .../hadoop/hive/ql/plan/TestViewEntity.java     |   37 +
 .../TestSQLStdHiveAccessControllerHS2.java      |    1 +
 .../hadoop/hive/ql/udaf/TestStreamingSum.java   |   13 +-
 .../generic/TestGenericUDFMonthsBetween.java    |   59 +-
 .../ql/udf/generic/TestGenericUDFOPDivide.java  |   62 +-
 .../udf/generic/TestGenericUDFOPMultiply.java   |    6 +
 .../queries/clientnegative/authorization_msck.q |   20 +
 ql/src/test/queries/clientnegative/druid_case.q |    6 +
 .../queries/clientnegative/druid_external.q     |    5 -
 .../queries/clientnegative/fs_default_name1.q   |    2 +-
 .../queries/clientnegative/fs_default_name2.q   |    2 +-
 ql/src/test/queries/clientnegative/join45.q     |   13 -
 .../queries/clientnegative/subquery_corr_from.q |    3 +
 .../clientnegative/subquery_corr_grandparent.q  |    5 +
 .../clientnegative/subquery_corr_select.q       |    2 +
 .../subquery_exists_implicit_gby.q              |    2 +-
 .../clientnegative/subquery_in_implicit_gby.q   |   11 +
 .../queries/clientnegative/subquery_in_on.q     |    3 +
 .../clientnegative/subquery_nested_subquery.q   |    4 -
 .../subquery_notexists_implicit_gby.q           |    2 +-
 .../subquery_notin_implicit_gby.q               |   11 +
 .../subquery_scalar_implicit_gby.q              |    1 +
 .../subquery_scalar_multi_columns.q             |    2 +
 .../clientnegative/subquery_scalar_multi_rows.q |    2 +
 .../clientnegative/subquery_shared_alias.q      |    6 -
 .../subquery_subquery_chain_exists.q            |    4 +
 .../clientnegative/subquery_with_or_cond.q      |    2 +-
 .../queries/clientnegative/udf_trunc_error3.q   |    1 +
 .../test/queries/clientpositive/acid_subquery.q |   18 +
 .../clientpositive/alter_table_stats_status.q   |   48 +
 .../queries/clientpositive/analyze_tbl_date.q   |   14 +
 .../queries/clientpositive/analyze_tbl_part.q   |    4 +-
 .../clientpositive/annotate_stats_join_pkfk.q   |   41 +
 .../queries/clientpositive/avrocountemptytbl.q  |    2 +
 .../test/queries/clientpositive/avrotblsjoin.q  |   28 +
 .../queries/clientpositive/cast_on_constant.q   |    1 +
 .../queries/clientpositive/cbo_rp_auto_join1.q  |    1 +
 .../queries/clientpositive/cbo_rp_windowing_2.q |   38 +-
 .../queries/clientpositive/cbo_subq_not_in.q    |    9 -
 .../clientpositive/comma_in_column_name.q       |   14 +
 ql/src/test/queries/clientpositive/constGby.q   |   21 +
 .../clientpositive/ctas_uses_table_location.q   |    1 +
 ql/src/test/queries/clientpositive/date_udf.q   |   15 +-
 .../queries/clientpositive/dbtxnmgr_showlocks.q |    6 +
 .../clientpositive/dynamic_semijoin_reduction.q |   80 +
 ql/src/test/queries/clientpositive/equal_ns.q   |    6 +
 ql/src/test/queries/clientpositive/escape2.q    |   30 +-
 .../queries/clientpositive/explainanalyze_1.q   |    1 +
 .../queries/clientpositive/explainanalyze_2.q   |    2 +
 .../queries/clientpositive/explainanalyze_3.q   |    2 +
 .../queries/clientpositive/explainanalyze_4.q   |    2 +
 .../queries/clientpositive/explainanalyze_5.q   |    2 +
 .../test/queries/clientpositive/explainuser_3.q |    1 +
 .../test/queries/clientpositive/explainuser_4.q |    6 +
 .../filter_cond_pushdown_HIVE_15647.q           |   24 +
 .../groupby_grouping_sets_grouping.q            |   89 +
 .../clientpositive/index_auto_mult_tables.q     |    2 +-
 .../index_auto_mult_tables_compact.q            |    2 +-
 ql/src/test/queries/clientpositive/input19.q    |    2 +-
 .../clientpositive/insert_overwrite_directory.q |    6 +-
 ql/src/test/queries/clientpositive/join31.q     |    1 +
 ql/src/test/queries/clientpositive/join46.q     |  275 +
 .../queries/clientpositive/join_emit_interval.q |   31 +
 .../limit_partition_metadataonly.q              |    1 +
 .../queries/clientpositive/limit_pushdown2.q    |   18 +
 .../queries/clientpositive/limit_pushdown3.q    |    3 +-
 ql/src/test/queries/clientpositive/llap_stats.q |   26 +
 ql/src/test/queries/clientpositive/llap_text.q  |   91 +
 ql/src/test/queries/clientpositive/mapjoin3.q   |   55 +
 ql/src/test/queries/clientpositive/mapjoin46.q  |  264 +
 .../clientpositive/mapjoin_emit_interval.q      |   32 +
 .../materialized_view_create_rewrite.q          |   59 +
 .../materialized_view_create_rewrite_multi_db.q |   40 +
 .../clientpositive/metadata_empty_table.q       |   22 +
 .../test/queries/clientpositive/metadataonly1.q |    1 +
 .../test/queries/clientpositive/multiMapJoin2.q |    1 +
 .../clientpositive/multi_count_distinct_null.q  |   45 +
 .../queries/clientpositive/multi_insert_gby4.q  |   26 +
 .../clientpositive/multi_insert_with_join2.q    |   29 +-
 .../clientpositive/nested_column_pruning.q      |  191 +
 .../clientpositive/offset_limit_ppd_optimizer.q |    4 +-
 .../test/queries/clientpositive/orc_ppd_basic.q |   21 +-
 .../clientpositive/orc_ppd_schema_evol_1a.q     |    4 +-
 .../clientpositive/orc_ppd_schema_evol_1b.q     |    2 +
 .../clientpositive/orc_ppd_schema_evol_2a.q     |    4 +-
 .../clientpositive/orc_ppd_schema_evol_2b.q     |    2 +
 .../clientpositive/orc_ppd_schema_evol_3a.q     |   12 +-
 ql/src/test/queries/clientpositive/partInit.q   |    5 +
 .../clientpositive/partial_column_stats.q       |    9 +
 .../queries/clientpositive/partition_date2.q    |    2 +
 .../clientpositive/partition_timestamp2.q       |    1 +
 .../test/queries/clientpositive/perf/query1.q   |   24 +
 .../test/queries/clientpositive/perf/query12.q  |   12 +-
 .../test/queries/clientpositive/perf/query14.q  |  104 +
 .../test/queries/clientpositive/perf/query16.q  |   30 +
 .../test/queries/clientpositive/perf/query21.q  |   15 +-
 .../test/queries/clientpositive/perf/query22.q  |   22 +-
 .../test/queries/clientpositive/perf/query23.q  |   51 +
 .../test/queries/clientpositive/perf/query27.q  |   23 +-
 .../test/queries/clientpositive/perf/query30.q  |   30 +
 .../test/queries/clientpositive/perf/query33.q  |   73 +
 .../test/queries/clientpositive/perf/query36.q  |   29 +
 .../test/queries/clientpositive/perf/query37.q  |   16 +
 .../test/queries/clientpositive/perf/query38.q  |   22 +
 .../test/queries/clientpositive/perf/query40.q  |   28 +-
 .../test/queries/clientpositive/perf/query45.q  |    1 -
 .../test/queries/clientpositive/perf/query5.q   |  127 +
 .../test/queries/clientpositive/perf/query56.q  |   65 +
 .../test/queries/clientpositive/perf/query6.q   |   25 +
 .../test/queries/clientpositive/perf/query60.q  |   77 +
 .../test/queries/clientpositive/perf/query67.q  |   14 +-
 .../test/queries/clientpositive/perf/query69.q  |   46 +
 .../test/queries/clientpositive/perf/query70.q  |   39 +-
 .../test/queries/clientpositive/perf/query72.q  |   31 +-
 .../test/queries/clientpositive/perf/query8.q   |  107 +
 .../test/queries/clientpositive/perf/query80.q  |   96 +-
 .../test/queries/clientpositive/perf/query81.q  |   30 +
 .../test/queries/clientpositive/perf/query82.q  |   17 +-
 .../test/queries/clientpositive/perf/query83.q  |   65 +
 .../test/queries/clientpositive/perf/query86.q  |   25 +
 .../test/queries/clientpositive/perf/query87.q  |   23 +-
 .../test/queries/clientpositive/perf/query98.q  |    7 +-
 ql/src/test/queries/clientpositive/ptf.q        |   40 +-
 .../clientpositive/rename_table_location.q      |    2 +
 ql/src/test/queries/clientpositive/row__id.q    |   22 +
 ql/src/test/queries/clientpositive/sample2.q    |    3 +-
 ql/src/test/queries/clientpositive/sample4.q    |    3 +-
 ql/src/test/queries/clientpositive/sample5.q    |    6 +-
 ql/src/test/queries/clientpositive/sample6.q    |    3 +-
 ql/src/test/queries/clientpositive/sample7.q    |    3 +-
 ql/src/test/queries/clientpositive/sample9.q    |    3 +-
 .../test/queries/clientpositive/serde_opencsv.q |    6 +-
 ql/src/test/queries/clientpositive/setop_subq.q |   12 +
 .../clientpositive/show_create_table_db_table.q |   12 +-
 .../queries/clientpositive/smb_mapjoin_46.q     |  240 +
 .../spark_combine_equivalent_work.q             |   33 +
 .../spark_dynamic_partition_pruning.q           |  100 +-
 ...spark_vectorized_dynamic_partition_pruning.q |    1 +
 .../test/queries/clientpositive/specialChar.q   |   30 +
 ql/src/test/queries/clientpositive/sqlmerge.q   |   12 +
 .../clientpositive/stats_based_fetch_decision.q |    7 +-
 .../clientpositive/stats_missing_warning.q      |   55 +
 .../queries/clientpositive/subquery_exists.q    |   27 +
 .../test/queries/clientpositive/subquery_in.q   |  165 +-
 .../queries/clientpositive/subquery_in_having.q |   47 +-
 .../queries/clientpositive/subquery_multi.q     |  111 +
 .../clientpositive/subquery_nested_subquery.q   |    4 +
 .../queries/clientpositive/subquery_notexists.q |   27 +-
 .../queries/clientpositive/subquery_notin.q     |  167 +-
 .../clientpositive/subquery_notin_having.q      |   16 +
 .../queries/clientpositive/subquery_null_agg.q  |   22 +
 .../queries/clientpositive/subquery_scalar.q    |  177 +
 .../clientpositive/subquery_shared_alias.q      |    6 +
 .../clientpositive/subquery_unqualcolumnrefs.q  |   29 -
 .../queries/clientpositive/temp_table_gb1.q     |    2 +
 .../test/queries/clientpositive/tez_nway_join.q |   29 +
 ql/src/test/queries/clientpositive/tez_smb_1.q  |   20 +
 .../clientpositive/timestamp_date_only.q        |    3 +
 .../queries/clientpositive/udf_trunc_number.q   |   72 +
 .../queries/clientpositive/union_top_level.q    |    8 +-
 .../queries/clientpositive/vector_between_in.q  |   24 +-
 .../queries/clientpositive/vector_coalesce_3.q  |   19 +
 .../test/queries/clientpositive/vector_udf1.q   |   57 +-
 .../clientpositive/vectorized_date_funcs.q      |   67 +-
 .../vectorized_dynamic_semijoin_reduction.q     |   43 +
 .../queries/clientpositive/vectorized_join46.q  |  225 +
 .../clientpositive/vectorized_math_funcs.q      |   16 +-
 .../queries/clientpositive/vectorized_ptf.q     |   36 +-
 ql/src/test/queries/clientpositive/windowing.q  |   38 +-
 .../add_partition_with_whitelist.q.out          |    8 +-
 .../alter_partition_change_col_dup_col.q.out    |    3 +-
 .../alter_partition_change_col_nonexist.q.out   |    3 +-
 .../alter_partition_coltype_2columns.q.out      |   12 +-
 ...alter_partition_coltype_invalidcolname.q.out |   12 +-
 .../alter_partition_coltype_invalidtype.q.out   |   12 +-
 .../alter_partition_with_whitelist.q.out        |    8 +-
 .../alter_view_as_select_with_partition.q.out   |    2 +
 .../clientnegative/alter_view_failure.q.out     |    2 +
 .../clientnegative/alter_view_failure2.q.out    |    1 +
 .../clientnegative/alter_view_failure4.q.out    |    1 +
 .../clientnegative/alter_view_failure5.q.out    |    1 +
 .../clientnegative/alter_view_failure6.q.out    |    1 +
 .../clientnegative/alter_view_failure7.q.out    |    1 +
 .../clientnegative/alter_view_failure8.q.out    |    6 +-
 .../clientnegative/alter_view_failure9.q.out    |    2 +
 .../results/clientnegative/analyze_view.q.out   |    2 +
 .../test/results/clientnegative/archive1.q.out  |   10 +-
 .../test/results/clientnegative/archive2.q.out  |   10 +-
 .../clientnegative/archive_insert1.q.out        |   10 +-
 .../clientnegative/archive_insert2.q.out        |   10 +-
 .../clientnegative/archive_insert3.q.out        |   10 +-
 .../clientnegative/archive_insert4.q.out        |   10 +-
 .../results/clientnegative/archive_multi1.q.out |   10 +-
 .../results/clientnegative/archive_multi2.q.out |   10 +-
 .../results/clientnegative/archive_multi3.q.out |   10 +-
 .../results/clientnegative/archive_multi4.q.out |   10 +-
 .../results/clientnegative/archive_multi5.q.out |   10 +-
 .../results/clientnegative/archive_multi6.q.out |   10 +-
 .../results/clientnegative/archive_multi7.q.out |   10 +-
 .../clientnegative/archive_partspec1.q.out      |   10 +-
 .../clientnegative/archive_partspec2.q.out      |   10 +-
 .../clientnegative/archive_partspec3.q.out      |   10 +-
 .../clientnegative/archive_partspec4.q.out      |   10 +-
 .../clientnegative/archive_partspec5.q.out      |   10 +-
 .../authorization_addpartition.q.out            |    6 +-
 .../authorization_alter_db_owner.q.out          |    8 +-
 .../authorization_alter_drop_ptn.q.out          |    6 +-
 ...on_alter_table_exchange_partition_fail.q.out |   36 +-
 ...n_alter_table_exchange_partition_fail2.q.out |   44 +-
 .../authorization_create_role_no_admin.q.out    |    3 +-
 .../authorization_createview.q.out              |    6 +-
 .../clientnegative/authorization_ctas.q.out     |    6 +-
 .../clientnegative/authorization_ctas2.q.out    |    6 +-
 .../authorization_delete_nodeletepriv.q.out     |    6 +-
 .../authorization_desc_table_nosel.q.out        |    6 +-
 .../authorization_drop_db_cascade.q.out         |   12 +-
 .../authorization_drop_db_empty.q.out           |   12 +-
 .../authorization_droppartition.q.out           |    6 +-
 .../authorization_export_ptn.q.out              |    6 +-
 .../clientnegative/authorization_fail_3.q.out   |    8 +-
 .../clientnegative/authorization_fail_4.q.out   |    8 +-
 .../clientnegative/authorization_fail_5.q.out   |    8 +-
 .../clientnegative/authorization_fail_6.q.out   |    8 +-
 .../clientnegative/authorization_fail_7.q.out   |    8 +-
 .../clientnegative/authorization_fail_8.q.out   |    9 +-
 .../authorization_grant_group.q.out             |   11 +-
 .../authorization_grant_table_allpriv.q.out     |   17 +-
 .../authorization_grant_table_dup.q.out         |   18 +-
 .../authorization_grant_table_fail1.q.out       |   11 +-
 ...authorization_grant_table_fail_nogrant.q.out |   17 +-
 .../clientnegative/authorization_import.q.out   |    2 +-
 .../authorization_import_ptn.q.out              |    6 +-
 .../authorization_insert_noinspriv.q.out        |    6 +-
 .../authorization_insert_noselectpriv.q.out     |    6 +-
 .../authorization_insertoverwrite_nodel.q.out   |    6 +-
 .../authorization_insertpart_noinspriv.q.out    |    8 +-
 .../clientnegative/authorization_msck.q.out     |   27 +
 ...thorization_not_owner_alter_tab_rename.q.out |    6 +-
 ...rization_not_owner_alter_tab_serdeprop.q.out |    6 +-
 .../authorization_not_owner_drop_tab.q.out      |    6 +-
 .../authorization_not_owner_drop_tab2.q.out     |    6 +-
 .../authorization_not_owner_drop_view.q.out     |    7 +-
 .../clientnegative/authorization_part.q.out     |   16 +-
 .../authorization_priv_current_role_neg.q.out   |   29 +-
 .../authorization_revoke_table_fail1.q.out      |   17 +-
 .../authorization_revoke_table_fail2.q.out      |   23 +-
 .../authorization_role_case.q.out               |    3 +-
 .../authorization_role_cycles1.q.out            |    9 +-
 .../authorization_role_cycles2.q.out            |   11 +-
 .../authorization_role_grant.q.out              |   14 +-
 .../authorization_role_grant2.q.out             |   17 +-
 .../authorization_role_grant_nosuchrole.q.out   |   12 +-
 .../authorization_role_grant_otherrole.q.out    |    3 +-
 .../authorization_role_grant_otheruser.q.out    |    3 +-
 .../authorization_rolehierarchy_privs.q.out     |   22 +-
 .../authorization_sba_drop_table.q.out          |    3 +-
 .../clientnegative/authorization_select.q.out   |    6 +-
 .../authorization_select_view.q.out             |    7 +-
 .../authorization_set_invalidconf.q.out         |    6 +-
 .../authorization_set_nonexistent_conf.q.out    |    6 +-
 .../authorization_set_role_neg1.q.out           |    4 +-
 .../authorization_set_role_neg2.q.out           |    8 +-
 .../authorization_show_columns.q.out            |    6 +-
 .../authorization_show_parts_nosel.q.out        |    6 +-
 ...rization_show_role_principals_no_admin.q.out |    3 +-
 .../authorization_show_roles_no_admin.q.out     |    3 +-
 .../authorization_table_grant_nosuchrole.q.out  |   10 +-
 .../clientnegative/authorization_truncate.q.out |    6 +-
 .../authorization_truncate_2.q.out              |    6 +-
 .../authorization_update_noupdatepriv.q.out     |    6 +-
 .../clientnegative/authorization_view_1.q.out   |   10 +-
 .../clientnegative/authorization_view_2.q.out   |   10 +-
 .../clientnegative/authorization_view_3.q.out   |   10 +-
 .../clientnegative/authorization_view_4.q.out   |   14 +-
 .../clientnegative/authorization_view_5.q.out   |    4 +
 .../clientnegative/authorization_view_6.q.out   |   12 +-
 .../clientnegative/authorization_view_7.q.out   |   12 +-
 .../authorization_view_disable_cbo_1.q.out      |   10 +-
 .../authorization_view_disable_cbo_2.q.out      |   10 +-
 .../authorization_view_disable_cbo_3.q.out      |   10 +-
 .../authorization_view_disable_cbo_4.q.out      |   14 +-
 .../authorization_view_disable_cbo_5.q.out      |    4 +
 .../authorization_view_disable_cbo_6.q.out      |   12 +-
 .../authorization_view_disable_cbo_7.q.out      |   12 +-
 .../avro_non_nullable_union.q.out               |    8 +-
 .../bucket_mapjoin_mismatch1.q.out              |   14 +-
 .../bucket_mapjoin_wrong_table_metadata_1.q.out |    8 +-
 .../bucket_mapjoin_wrong_table_metadata_2.q.out |    8 +-
 .../clientnegative/char_pad_convert_fail2.q.out |    2 +-
 .../cluster_tasklog_retrieval.q.out             |    8 +-
 .../columnstats_tbllvl_complex_type.q.out       |    2 +-
 .../clientnegative/compute_stats_long.q.out     |    9 +-
 .../create_or_replace_view1.q.out               |   10 +-
 .../create_or_replace_view2.q.out               |   10 +-
 .../create_or_replace_view4.q.out               |   10 +-
 .../create_or_replace_view5.q.out               |   10 +-
 .../create_or_replace_view6.q.out               |   10 +-
 .../create_or_replace_view7.q.out               |   14 +-
 .../create_or_replace_view8.q.out               |   10 +-
 .../clientnegative/create_view_failure1.q.out   |    6 +-
 .../clientnegative/create_view_failure10.q.out  |    6 +-
 .../clientnegative/create_view_failure2.q.out   |    7 +-
 .../clientnegative/create_view_failure4.q.out   |    3 +-
 .../results/clientnegative/ctasnullcol.q.out    |    2 +-
 .../database_create_already_exists.q.out        |    6 +-
 .../database_create_invalid_name.q.out          |    3 +-
 .../database_drop_not_empty.q.out               |    6 +-
 .../database_drop_not_empty_restrict.q.out      |    6 +-
 .../disallow_incompatible_type_change_on1.q.out |    6 +-
 .../clientnegative/drop_database_cascade.q.out  |   10 +-
 .../clientnegative/drop_table_failure2.q.out    |    4 +-
 .../clientnegative/drop_view_failure1.q.out     |    3 +-
 .../results/clientnegative/druid_case.q.out     |    7 +
 .../results/clientnegative/druid_external.q.out |    7 -
 .../results/clientnegative/dyn_part_max.q.out   |   10 +-
 .../clientnegative/dyn_part_max_per_node.q.out  |    8 +-
 .../dynamic_partitions_with_whitelist.q.out     |    6 +-
 ...nge_partition_neg_incomplete_partition.q.out |    2 +-
 .../exim_00_unsupported_schema.q.out            |    2 +-
 .../clientnegative/fs_default_name1.q.out       |    2 +-
 .../clientnegative/fs_default_name2.q.out       |    2 +-
 .../clientnegative/illegal_partition_type.q.out |    6 +-
 .../insert_into_with_schema.q.out               |    6 +-
 .../insert_into_with_schema1.q.out              |    6 +-
 .../insert_into_with_schema2.q.out              |    6 +-
 .../insert_into_with_schema3.q.out              |    6 +-
 .../insert_into_with_schema4.q.out              |    6 +-
 .../clientnegative/insert_view_failure.q.out    |    2 +
 .../clientnegative/invalid_select_column.q.out  |    6 +-
 .../invalid_select_column_with_subquery.q.out   |    6 +-
 .../invalid_select_column_with_tablename.q.out  |    6 +-
 .../invalid_select_expression.q.out             |    2 +-
 .../clientnegative/invalidate_view1.q.out       |   14 +-
 ql/src/test/results/clientnegative/join45.q.out |   13 -
 .../clientnegative/load_stored_as_dirs.q.out    |    6 +-
 .../clientnegative/load_view_failure.q.out      |    2 +
 .../clientnegative/load_wrong_fileformat.q.out  |   12 +-
 .../load_wrong_fileformat_rc_seq.q.out          |   12 +-
 .../load_wrong_fileformat_txt_seq.q.out         |   12 +-
 ...zed_view_authorization_create_no_grant.q.out |    2 -
 ...ew_authorization_create_no_select_perm.q.out |    2 -
 ...rialized_view_authorization_drop_other.q.out |    2 -
 ...ized_view_authorization_no_select_perm.q.out |    2 -
 .../clientnegative/materialized_view_drop.q.out |    2 -
 .../materialized_view_drop2.q.out               |    2 -
 .../materialized_view_replace_with_view.q.out   |    2 -
 .../clientnegative/minimr_broken_pipe.q.out     |    3 +-
 .../results/clientnegative/msck_repair_1.q.out  |    3 +
 .../results/clientnegative/msck_repair_2.q.out  |    3 +
 .../results/clientnegative/msck_repair_3.q.out  |    3 +
 .../clientnegative/orc_replace_columns2.q.out   |    8 +-
 .../orc_replace_columns2_acid.q.out             |    8 +-
 .../clientnegative/orc_replace_columns3.q.out   |    8 +-
 .../orc_replace_columns3_acid.q.out             |    8 +-
 .../clientnegative/orc_type_promotion1.q.out    |    8 +-
 .../orc_type_promotion1_acid.q.out              |    8 +-
 .../clientnegative/orc_type_promotion2.q.out    |    8 +-
 .../orc_type_promotion2_acid.q.out              |    8 +-
 .../clientnegative/orc_type_promotion3.q.out    |    8 +-
 .../orc_type_promotion3_acid.q.out              |    8 +-
 ...names_with_leading_and_trailing_spaces.q.out |    2 -
 .../ptf_negative_DistributeByOrderBy.q.out      |    3 +-
 .../ptf_negative_PartitionBySortBy.q.out        |    3 +-
 .../clientnegative/ptf_window_boundaries.q.out  |    2 +-
 .../clientnegative/ptf_window_boundaries2.q.out |    2 +-
 .../results/clientnegative/recursive_view.q.out |   12 +-
 .../clientnegative/right_side_join.q.out        |    3 +-
 .../clientnegative/script_broken_pipe2.q.out    |    3 +-
 .../clientnegative/script_broken_pipe3.q.out    |    3 +-
 .../selectDistinctStarNeg_1.q.out               |    8 +-
 .../results/clientnegative/serde_regex.q.out    |    3 +-
 .../results/clientnegative/serde_regex2.q.out   |    9 +-
 .../results/clientnegative/serde_regex3.q.out   |    3 +-
 .../set_hiveconf_internal_variable0.q.out       |    6 +-
 .../set_hiveconf_internal_variable1.q.out       |    6 +-
 .../set_hiveconf_validation0.q.out              |    6 +-
 .../set_hiveconf_validation1.q.out              |    6 +-
 .../set_hiveconf_validation2.q.out              |    6 +-
 .../sortmerge_mapjoin_mismatch_1.q.out          |   18 +-
 .../special_character_in_tabnames_1.q.out       |    7 +-
 .../stats_aggregator_error_1.q.out              |   16 +-
 .../stats_aggregator_error_2.q.out              |   14 +-
 .../stats_partialscan_autogether.q.out          |   10 +-
 .../stats_partscan_norcfile.q.out               |    8 +-
 .../stats_publisher_error_1.q.out               |   16 +-
 .../stats_publisher_error_2.q.out               |   14 +-
 .../clientnegative/subquery_corr_from.q.out     |    1 +
 .../subquery_corr_grandparent.q.out             |    1 +
 .../clientnegative/subquery_corr_select.q.out   |    1 +
 .../subquery_exists_implicit_gby.q.out          |    2 +-
 .../clientnegative/subquery_in_groupby.q.out    |    2 +-
 .../subquery_in_implicit_gby.q.out              |   38 +
 .../results/clientnegative/subquery_in_on.q.out |    1 +
 .../clientnegative/subquery_in_select.q.out     |    2 +-
 .../subquery_multiple_cols_in_select.q.out      |    2 +-
 .../subquery_nested_subquery.q.out              |    1 -
 .../subquery_notexists_implicit_gby.q.out       |    2 +-
 .../subquery_notin_implicit_gby.q.out           |   38 +
 .../subquery_scalar_implicit_gby.q.out          |    1 +
 .../subquery_scalar_multi_columns.q.out         |    1 +
 .../subquery_scalar_multi_rows.q.out            |    7 +
 .../subquery_subquery_chain_exists.q.out        |    1 +
 .../subquery_windowing_corr.q.out               |    2 +-
 .../clientnegative/subquery_with_or_cond.q.out  |    2 +-
 .../table_nonprintable_negative.q.out           |    1 +
 .../truncate_bucketed_column.q.out              |    8 +-
 .../truncate_column_indexed_table.q.out         |    8 +-
 .../truncate_column_list_bucketing.q.out        |    8 +-
 .../truncate_column_seqfile.q.out               |    8 +-
 .../truncate_nonexistant_column.q.out           |    8 +-
 .../truncate_partition_column.q.out             |    8 +-
 .../truncate_partition_column2.q.out            |    8 +-
 .../udf_sort_array_by_wrong3.q.out              |    8 +-
 .../clientnegative/udf_trunc_error1.q.out       |    2 +-
 .../clientnegative/udf_trunc_error2.q.out       |    2 +-
 .../clientnegative/udf_trunc_error3.q.out       |    1 +
 .../results/clientnegative/uniquejoin.q.out     |    2 +-
 .../clientnegative/unset_table_property.q.out   |    1 +
 .../clientnegative/unset_view_property.q.out    |    1 +
 .../results/clientnegative/view_delete.q.out    |    3 +
 .../results/clientnegative/view_update.q.out    |    3 +
 .../test/results/clientpositive/acid_join.q.out |   10 +-
 .../results/clientpositive/acid_mapjoin.q.out   |    4 -
 .../results/clientpositive/acid_subquery.q.out  |  100 +
 .../clientpositive/acid_table_stats.q.out       |    6 +-
 .../clientpositive/acid_vectorization.q.out     |    4 -
 .../results/clientpositive/add_part_exist.q.out |    6 +-
 .../clientpositive/add_part_multiple.q.out      |    8 +-
 .../add_partition_no_whitelist.q.out            |    8 +-
 .../add_partition_with_whitelist.q.out          |    8 +-
 .../clientpositive/alias_casted_column.q.out    |   12 +-
 .../clientpositive/allcolref_in_udf.q.out       |   20 +-
 ql/src/test/results/clientpositive/alter1.q.out |   14 +-
 ql/src/test/results/clientpositive/alter2.q.out |   14 +-
 ql/src/test/results/clientpositive/alter3.q.out |   14 +-
 ql/src/test/results/clientpositive/alter4.q.out |   14 +-
 ql/src/test/results/clientpositive/alter5.q.out |   38 +-
 .../results/clientpositive/alter_char1.q.out    |   50 +-
 .../results/clientpositive/alter_char2.q.out    |    6 +-
 .../clientpositive/alter_file_format.q.out      |   12 +-
 ...lter_numbuckets_partitioned_table2_h23.q.out |   58 +-
 ...alter_numbuckets_partitioned_table_h23.q.out |   54 +-
 .../alter_partition_change_col.q.out            |   56 +-
 .../alter_partition_clusterby_sortby.q.out      |   32 +-
 .../alter_partition_coltype.q.out               |   82 +-
 .../alter_partition_format_loc.q.out            |    6 +-
 .../alter_partition_with_whitelist.q.out        |    8 +-
 .../clientpositive/alter_rename_partition.q.out |   20 +-
 .../alter_rename_partition_authorization.q.out  |   14 +-
 .../clientpositive/alter_skewed_table.q.out     |    3 +
 .../alter_table_add_partition.q.out             |    2 -
 .../clientpositive/alter_table_cascade.q.out    |   88 +-
 .../clientpositive/alter_table_not_sorted.q.out |    1 +
 .../alter_table_partition_drop.q.out            |    2 -
 .../clientpositive/alter_table_serde.q.out      |   20 +-
 .../clientpositive/alter_table_serde2.q.out     |   18 +-
 .../alter_table_stats_status.q.out              |  572 ++
 .../alter_table_update_status.q.out             |   88 +-
 .../results/clientpositive/alter_varchar1.q.out |   50 +-
 .../results/clientpositive/alter_varchar2.q.out |    6 +-
 .../clientpositive/alter_view_as_select.q.out   |    7 +
 .../clientpositive/alter_view_rename.q.out      |    3 +
 .../results/clientpositive/ambiguitycheck.q.out |   12 +-
 .../results/clientpositive/ambiguous_col.q.out  |   18 +-
 .../analyze_table_null_partition.q.out          |   20 +-
 .../clientpositive/analyze_tbl_date.q.out       |  101 +
 .../clientpositive/analyze_tbl_part.q.out       |    8 +-
 .../clientpositive/annotate_stats_filter.q.out  |  166 +-
 .../clientpositive/annotate_stats_groupby.q.out |  414 +-
 .../annotate_stats_groupby2.q.out               |  142 +-
 .../clientpositive/annotate_stats_join.q.out    |   98 +-
 .../annotate_stats_join_pkfk.q.out              |  179 +-
 .../clientpositive/annotate_stats_limit.q.out   |   26 +-
 .../clientpositive/annotate_stats_part.q.out    |  130 +-
 .../clientpositive/annotate_stats_select.q.out  |  226 +-
 .../clientpositive/annotate_stats_table.q.out   |   78 +-
 .../clientpositive/annotate_stats_union.q.out   |   36 +-
 .../clientpositive/ansi_sql_arithmetic.q.out    |   16 +-
 .../results/clientpositive/archive_multi.q.out  |    8 +-
 .../clientpositive/authorization_1.q.out        |   68 +-
 .../authorization_1_sql_std.q.out               |   36 +-
 .../clientpositive/authorization_3.q.out        |    8 +-
 .../clientpositive/authorization_4.q.out        |    8 +-
 .../clientpositive/authorization_5.q.out        |    8 +-
 .../clientpositive/authorization_6.q.out        |   14 +-
 .../clientpositive/authorization_8.q.out        |    3 +
 .../clientpositive/authorization_9.q.out        |    8 +-
 .../authorization_admin_almighty1.q.out         |    8 +-
 .../authorization_admin_almighty2.q.out         |    6 +-
 ...ization_alter_table_exchange_partition.q.out |   44 +-
 .../authorization_cli_createtab.q.out           |   11 +-
 ...authorization_cli_createtab_noauthzapi.q.out |    9 +-
 .../authorization_cli_nonsql.q.out              |    8 +-
 .../authorization_cli_stdconfigauth.q.out       |   10 +-
 .../authorization_create_func1.q.out            |    6 +-
 .../authorization_create_macro1.q.out           |    6 +-
 ...authorization_create_table_owner_privs.q.out |    8 +-
 ...ation_default_create_table_owner_privs.q.out |    6 +-
 .../clientpositive/authorization_delete.q.out   |   14 +-
 .../authorization_grant_option_role.q.out       |   26 +-
 .../authorization_grant_public_role.q.out       |   22 +-
 .../authorization_grant_table_priv.q.out        |   56 +-
 .../clientpositive/authorization_insert.q.out   |   14 +-
 .../clientpositive/authorization_load.q.out     |   14 +-
 .../authorization_owner_actions.q.out           |    7 +-
 .../authorization_owner_actions_db.q.out        |   20 +-
 .../clientpositive/authorization_parts.q.out    |    6 +-
 .../authorization_revoke_table_priv.q.out       |   84 +-
 .../authorization_role_grant1.q.out             |   46 +-
 .../authorization_role_grant2.q.out             |   44 +-
 .../authorization_show_grant.q.out              |   26 +-
 .../clientpositive/authorization_update.q.out   |   14 +-
 .../clientpositive/authorization_view_1.q.out   |   22 +-
 .../clientpositive/authorization_view_2.q.out   |   12 +-
 .../clientpositive/authorization_view_3.q.out   |   12 +-
 .../clientpositive/authorization_view_4.q.out   |   12 +-
 .../authorization_view_disable_cbo_1.q.out      |   30 +-
 .../authorization_view_disable_cbo_2.q.out      |   12 +-
 .../authorization_view_disable_cbo_3.q.out      |   12 +-
 .../authorization_view_disable_cbo_4.q.out      |   12 +-
 .../clientpositive/autoColumnStats_5.q.out      |   30 +-
 .../clientpositive/autoColumnStats_7.q.out      |    6 +-
 .../clientpositive/autoColumnStats_8.q.out      |   23 +-
 .../clientpositive/autoColumnStats_9.q.out      |    8 +-
 .../results/clientpositive/auto_join0.q.out     |    8 +-
 .../results/clientpositive/auto_join1.q.out     |    8 +-
 .../results/clientpositive/auto_join14.q.out    |    8 +-
 .../results/clientpositive/auto_join21.q.out    |    8 +-
 .../results/clientpositive/auto_join23.q.out    |    8 +-
 .../results/clientpositive/auto_join25.q.out    |    6 +-
 .../results/clientpositive/auto_join26.q.out    |    8 +-
 .../results/clientpositive/auto_join29.q.out    |    8 +-
 .../results/clientpositive/auto_join32.q.out    |   18 +-
 .../results/clientpositive/auto_join33.q.out    |    8 +-
 .../auto_join_reordering_values.q.out           |   25 +-
 .../clientpositive/auto_join_stats.q.out        |   10 +-
 .../clientpositive/auto_join_stats2.q.out       |   10 +-
 .../auto_join_without_localtask.q.out           |    6 +-
 .../clientpositive/auto_sortmerge_join_1.q.out  |   44 +-
 .../clientpositive/auto_sortmerge_join_10.q.out |   12 +-
 .../clientpositive/auto_sortmerge_join_11.q.out |   64 +-
 .../clientpositive/auto_sortmerge_join_12.q.out |   22 +-
 .../clientpositive/auto_sortmerge_join_13.q.out |   83 +-
 .../clientpositive/auto_sortmerge_join_14.q.out |   12 +-
 .../clientpositive/auto_sortmerge_join_2.q.out  |   44 +-
 .../clientpositive/auto_sortmerge_join_3.q.out  |   36 +-
 .../clientpositive/auto_sortmerge_join_4.q.out  |   36 +-
 .../clientpositive/auto_sortmerge_join_5.q.out  |   32 +-
 .../clientpositive/auto_sortmerge_join_7.q.out  |   48 +-
 .../clientpositive/autogen_colalias.q.out       |   38 +-
 .../clientpositive/avro_add_column.q.out        |   10 +-
 .../clientpositive/avro_add_column2.q.out       |   10 +-
 .../clientpositive/avro_add_column3.q.out       |   10 +-
 .../clientpositive/avro_change_schema.q.out     |    6 +-
 .../results/clientpositive/avro_comments.q.out  |    6 +-
 .../avro_compression_enabled.q.out              |    8 +-
 .../avro_compression_enabled_native.q.out       |    8 +-
 .../avro_deserialize_map_null.q.out             |   18 +-
 .../clientpositive/avro_evolved_schemas.q.out   |   10 +-
 .../results/clientpositive/avro_joins.q.out     |   12 +-
 .../clientpositive/avro_joins_native.q.out      |   12 +-
 .../results/clientpositive/avro_native.q.out    |   10 +-
 .../clientpositive/avro_nullable_fields.q.out   |   10 +-
 .../clientpositive/avro_nullable_union.q.out    |   16 +-
 .../clientpositive/avro_partitioned.q.out       |   62 +-
 .../avro_partitioned_native.q.out               |   26 +-
 .../clientpositive/avro_sanity_test.q.out       |   10 +-
 .../avro_schema_evolution_native.q.out          |   26 +-
 .../results/clientpositive/avro_timestamp.q.out |   10 +-
 .../clientpositive/avro_type_evolution.q.out    |   10 +-
 .../results/clientpositive/avrotblsjoin.q.out   |   82 +
 .../test/results/clientpositive/ba_table1.q.out |   16 +-
 .../test/results/clientpositive/ba_table2.q.out |   16 +-
 .../test/results/clientpositive/ba_table3.q.out |    8 +-
 .../results/clientpositive/ba_table_udfs.q.out  |   22 +-
 .../results/clientpositive/ba_table_union.q.out |    6 +-
 .../clientpositive/binary_output_format.q.out   |   28 +-
 .../binary_table_bincolserde.q.out              |    8 +-
 .../clientpositive/binary_table_colserde.q.out  |    8 +-
 .../test/results/clientpositive/bucket1.q.out   |   12 +-
 .../test/results/clientpositive/bucket2.q.out   |   12 +-
 .../test/results/clientpositive/bucket3.q.out   |   12 +-
 .../clientpositive/bucket_map_join_1.q.out      |   14 +-
 .../clientpositive/bucket_map_join_2.q.out      |   14 +-
 .../clientpositive/bucket_map_join_spark1.q.out |   16 +
 .../clientpositive/bucket_map_join_spark2.q.out |   16 +
 .../clientpositive/bucket_map_join_spark3.q.out |   16 +
 .../clientpositive/bucket_map_join_spark4.q.out |   20 +-
 .../clientpositive/bucket_num_reducers.q.out    |   10 +-
 .../clientpositive/bucket_num_reducers2.q.out   |   10 +-
 .../clientpositive/bucketcontext_1.q.out        |   16 +-
 .../clientpositive/bucketcontext_2.q.out        |   16 +-
 .../clientpositive/bucketcontext_3.q.out        |   14 +-
 .../clientpositive/bucketcontext_4.q.out        |   14 +-
 .../clientpositive/bucketcontext_5.q.out        |   10 +-
 .../clientpositive/bucketcontext_6.q.out        |   14 +-
 .../clientpositive/bucketcontext_7.q.out        |   18 +-
 .../clientpositive/bucketcontext_8.q.out        |   18 +-
 .../clientpositive/bucketmapjoin10.q.out        |   16 +-
 .../clientpositive/bucketmapjoin11.q.out        |   26 +-
 .../clientpositive/bucketmapjoin12.q.out        |   24 +-
 .../clientpositive/bucketmapjoin13.q.out        |   70 +-
 .../results/clientpositive/bucketmapjoin5.q.out |   24 +
 .../results/clientpositive/bucketmapjoin8.q.out |   24 +-
 .../results/clientpositive/bucketmapjoin9.q.out |   24 +-
 .../clientpositive/bucketmapjoin_negative.q.out |   12 +
 .../bucketmapjoin_negative2.q.out               |   14 +
 .../bucketmapjoin_negative3.q.out               |   30 +-
 .../bucketsortoptimize_insert_1.q.out           |   32 +-
 .../bucketsortoptimize_insert_3.q.out           |   24 +-
 .../bucketsortoptimize_insert_4.q.out           |   22 +-
 .../bucketsortoptimize_insert_5.q.out           |   20 +-
 .../bucketsortoptimize_insert_8.q.out           |   22 +-
 .../clientpositive/cast_on_constant.q.out       |   36 +
 .../results/clientpositive/cast_to_int.q.out    |    6 +-
 .../test/results/clientpositive/cbo_const.q.out |    2 +
 .../results/clientpositive/cbo_gby_empty.q.out  |    6 +-
 .../cbo_rp_annotate_stats_groupby.q.out         |  222 +-
 .../clientpositive/cbo_rp_auto_join1.q.out      |  155 +-
 .../cbo_rp_cross_product_check_2.q.out          |    8 +-
 .../cbo_rp_gby2_map_multi_distinct.q.out        |   16 +-
 .../clientpositive/cbo_rp_gby_empty.q.out       |    6 +-
 .../results/clientpositive/cbo_rp_insert.q.out  |   14 +-
 .../results/clientpositive/cbo_rp_join0.q.out   |   14 +-
 .../clientpositive/cbo_rp_lineage2.q.out        |    2 -
 .../clientpositive/cbo_rp_outer_join_ppr.q.out  |   24 +-
 .../clientpositive/cbo_rp_simple_select.q.out   |   36 +-
 .../results/clientpositive/cbo_rp_stats.q.out   |    6 +-
 .../clientpositive/cbo_rp_subq_exists.q.out     |   34 +-
 .../cbo_rp_udaf_percentile_approx_23.q.out      |   34 +-
 .../clientpositive/cbo_rp_udf_percentile.q.out  |   28 +-
 .../clientpositive/cbo_rp_udf_percentile2.q.out |   10 +-
 .../results/clientpositive/cbo_rp_union.q.out   |   10 +-
 .../clientpositive/cbo_rp_windowing.q.out       |   10 +-
 .../clientpositive/cbo_rp_windowing_2.q.out     |  357 +-
 .../clientpositive/cbo_simple_select.q.out      |   36 +-
 .../test/results/clientpositive/cbo_stats.q.out |    6 +-
 .../clientpositive/cbo_subq_exists.q.out        |   36 +-
 .../results/clientpositive/cbo_udf_max.q.out    |    2 +
 .../test/results/clientpositive/cbo_union.q.out |   10 +-
 .../results/clientpositive/cbo_union_view.q.out |    2 +
 .../results/clientpositive/cbo_windowing.q.out  |   10 +-
 ql/src/test/results/clientpositive/char_1.q.out |   38 +-
 ql/src/test/results/clientpositive/char_2.q.out |   12 +-
 .../test/results/clientpositive/char_cast.q.out |   18 +-
 .../clientpositive/char_comparison.q.out        |   30 +-
 .../results/clientpositive/char_join1.q.out     |   26 +-
 .../clientpositive/char_nested_types.q.out      |   30 +-
 .../clientpositive/char_pad_convert.q.out       |   22 +-
 .../results/clientpositive/char_serde.q.out     |   60 +-
 .../test/results/clientpositive/char_udf1.q.out |   28 +-
 .../results/clientpositive/char_union1.q.out    |   18 +-
 .../columnStatsUpdateForStatsOptimizer_1.q.out  |    8 -
 .../columnStatsUpdateForStatsOptimizer_2.q.out  |   79 +-
 ...names_with_leading_and_trailing_spaces.q.out |    4 -
 .../columnarserde_create_shortcut.q.out         |    8 +-
 .../clientpositive/columnstats_partlvl.q.out    |    4 +
 .../clientpositive/columnstats_partlvl_dp.q.out |   30 +-
 .../clientpositive/columnstats_tbllvl.q.out     |    4 +
 .../test/results/clientpositive/combine1.q.out  |    8 +-
 .../test/results/clientpositive/combine2.q.out  |   34 +-
 .../clientpositive/comma_in_column_name.q.out   |   56 +
 .../results/clientpositive/compustat_avro.q.out |    8 +-
 .../clientpositive/compute_stats_binary.q.out   |   12 +-
 .../clientpositive/compute_stats_boolean.q.out  |   12 +-
 .../clientpositive/compute_stats_date.q.out     |   18 +-
 .../clientpositive/compute_stats_decimal.q.out  |   12 +-
 .../clientpositive/compute_stats_double.q.out   |   12 +-
 .../compute_stats_empty_table.q.out             |    6 +-
 .../clientpositive/compute_stats_long.q.out     |   12 +-
 .../clientpositive/compute_stats_string.q.out   |   12 +-
 .../test/results/clientpositive/concat_op.q.out |   27 +-
 .../test/results/clientpositive/constGby.q.out  |  176 +
 .../clientpositive/constantPropWhen.q.out       |    2 -
 .../constantPropagateForSubQuery.q.out          |   12 +-
 .../clientpositive/constant_prop_3.q.out        |  131 +-
 .../clientpositive/constantfolding.q.out        |   28 +-
 .../clientpositive/constprog_partitioner.q.out  |  134 +-
 .../clientpositive/constprog_semijoin.q.out     |    6 -
 .../clientpositive/convert_enum_to_string.q.out |    8 +-
 .../clientpositive/correlationoptimizer10.q.out |   54 +-
 .../clientpositive/correlationoptimizer11.q.out |   34 +-
 .../clientpositive/correlationoptimizer12.q.out |    6 +-
 .../clientpositive/correlationoptimizer13.q.out |   12 +-
 .../clientpositive/correlationoptimizer14.q.out |   64 +-
 .../clientpositive/correlationoptimizer15.q.out |   14 +-
 .../clientpositive/correlationoptimizer5.q.out  |   24 +-
 .../clientpositive/correlationoptimizer7.q.out  |   24 +-
 .../clientpositive/correlationoptimizer8.q.out  |   56 +-
 .../clientpositive/correlationoptimizer9.q.out  |   14 +-
 .../create_alter_list_bucketing_table1.q.out    |   59 +-
 .../clientpositive/create_big_view.q.out        |  243 +-
 .../results/clientpositive/create_func1.q.out   |   34 +-
 .../results/clientpositive/create_like.q.out    |    1 +
 .../results/clientpositive/create_like2.q.out   |   10 +-
 .../clientpositive/create_like_tbl_props.q.out  |   42 +-
 .../clientpositive/create_like_view.q.out       |   18 +-
 .../clientpositive/create_or_replace_view.q.out |   35 +-
 .../results/clientpositive/create_udaf.q.out    |    6 +-
 .../results/clientpositive/create_view.q.out    |  218 +-
 .../create_view_defaultformats.q.out            |    6 +
 .../create_view_partitioned.q.out               |   58 +-
 .../clientpositive/create_view_translate.q.out  |   16 +-
 .../results/clientpositive/cross_join.q.out     |   18 +-
 .../clientpositive/cross_join_merge.q.out       |    6 +-
 .../clientpositive/cross_product_check_1.q.out  |    8 +-
 .../clientpositive/cross_product_check_2.q.out  |    8 +-
 ql/src/test/results/clientpositive/ctas.q.out   |   10 +-
 .../test/results/clientpositive/ctas_char.q.out |   14 +-
 .../results/clientpositive/ctas_colname.q.out   |   40 +-
 .../test/results/clientpositive/ctas_date.q.out |   22 +-
 .../ctas_uses_database_location.q.out           |   12 +-
 .../ctas_uses_table_location.q.out              |   12 +
 .../results/clientpositive/ctas_varchar.q.out   |   14 +-
 .../test/results/clientpositive/cteViews.q.out  |   13 +-
 ql/src/test/results/clientpositive/cte_1.q.out  |   18 +-
 ql/src/test/results/clientpositive/cte_2.q.out  |   42 +-
 ql/src/test/results/clientpositive/cte_3.q.out  |   12 +-
 ql/src/test/results/clientpositive/cte_4.q.out  |   38 +-
 ql/src/test/results/clientpositive/cte_5.q.out  |    2 -
 ql/src/test/results/clientpositive/cte_6.q.out  |    8 +-
 ql/src/test/results/clientpositive/cte_7.q.out  |    2 -
 .../test/results/clientpositive/cte_mat_4.q.out |    2 -
 .../test/results/clientpositive/cte_mat_5.q.out |    2 -
 .../custom_input_output_format.q.out            |    8 +-
 .../results/clientpositive/database_drop.q.out  |   64 +-
 ql/src/test/results/clientpositive/date_1.q.out |   18 +-
 ql/src/test/results/clientpositive/date_4.q.out |    6 +-
 .../clientpositive/date_comparison.q.out        |   12 +-
 .../results/clientpositive/date_join1.q.out     |   14 +-
 .../results/clientpositive/date_serde.q.out     |   60 +-
 .../test/results/clientpositive/date_udf.q.out  |   58 +-
 .../results/clientpositive/dbtxnmgr_ddl1.q.out  |    1 +
 .../clientpositive/dbtxnmgr_query5.q.out        |    1 +
 .../clientpositive/dbtxnmgr_showlocks.q.out     |   34 +-
 .../test/results/clientpositive/decimal_2.q.out |    4 +-
 .../results/clientpositive/decimal_join.q.out   |   10 +-
 .../clientpositive/decimal_precision.q.out      |  256 +-
 .../results/clientpositive/decimal_udf.q.out    |  376 +-
 .../results/clientpositive/deleteAnalyze.q.out  |    2 -
 .../describe_comment_indent.q.out               |    8 +-
 .../describe_comment_nonascii.q.out             |    9 +-
 .../describe_formatted_view_partitioned.q.out   |    1 +
 ...scribe_formatted_view_partitioned_json.q.out |    1 +
 .../clientpositive/describe_pretty.q.out        |   40 +-
 .../clientpositive/describe_syntax.q.out        |   42 +-
 .../results/clientpositive/describe_xpath.q.out |   36 +-
 .../diff_part_input_formats.q.out               |   10 +-
 .../disallow_incompatible_type_change_off.q.out |    6 +-
 .../display_colstats_tbllvl.q.out               |    2 +
 .../clientpositive/distinct_windowing.q.out     |    8 +-
 .../distinct_windowing_no_cbo.q.out             |    8 +-
 .../results/clientpositive/driverhook.q.out     |   16 +-
 .../drop_database_removes_partition_dirs.q.out  |   10 +-
 .../drop_index_removes_partition_dirs.q.out     |   10 +-
 .../drop_table_removes_partition_dirs.q.out     |   10 +-
 .../clientpositive/drop_table_with_stats.q.out  |    8 +-
 .../results/clientpositive/druid_basic1.q.out   |    6 +-
 .../results/clientpositive/druid_basic2.q.out   |   38 +-
 .../clientpositive/druid_intervals.q.out        |   48 +-
 .../clientpositive/druid_timeseries.q.out       |   78 +-
 .../results/clientpositive/druid_topn.q.out     |   48 +-
 .../dynamic_partition_skip_default.q.out        |    8 +
 .../clientpositive/dynamic_rdd_cache.q.out      |   24 +-
 .../dynpart_sort_opt_bucketing.q.out            |    6 +-
 .../dynpart_sort_optimization_acid.q.out        |   10 -
 .../encrypted/encryption_ctas.q.out             |    4 +-
 .../encrypted/encryption_drop_partition.q.out   |    2 -
 .../encrypted/encryption_drop_view.q.out        |    2 +
 .../encryption_insert_partition_dynamic.q.out   |   36 +-
 .../encryption_insert_partition_static.q.out    |   36 +-
 .../encrypted/encryption_insert_values.q.out    |   16 +-
 .../encryption_join_unencrypted_tbl.q.out       |   12 +-
 ...cryption_load_data_to_encrypted_tables.q.out |    6 +-
 .../encrypted/encryption_move_tbl.q.out         |   28 +-
 ...ryption_select_read_only_encrypted_tbl.q.out |    8 +-
 ...ption_select_read_only_unencrypted_tbl.q.out |    8 +-
 ...on_unencrypted_nonhdfs_external_tables.q.out |   10 +-
 .../test/results/clientpositive/equal_ns.q.out  |   29 +
 .../test/results/clientpositive/escape3.q.out   |   18 +-
 .../clientpositive/escape_clusterby1.q.out      |    6 +-
 .../clientpositive/escape_comments.q.out        |    7 +-
 .../results/clientpositive/escape_crlf.q.out    |   18 +-
 .../clientpositive/escape_distributeby1.q.out   |    6 +-
 .../clientpositive/escape_orderby1.q.out        |    6 +-
 .../results/clientpositive/escape_sortby1.q.out |    6 +-
 .../results/clientpositive/except_all.q.out     |    8 -
 .../clientpositive/exchange_partition3.q.out    |    6 +-
 ...t_parentpath_has_inaccessible_children.q.out |   10 +-
 .../results/clientpositive/explain_ddl.q.out    |   13 +-
 .../clientpositive/explain_dependency.q.out     |   44 +-
 .../clientpositive/explain_dependency2.q.out    |   60 +-
 .../clientpositive/explain_logical.q.out        |   44 +-
 .../clientpositive/explain_rearrange.q.out      |   40 +-
 .../results/clientpositive/expr_cached.q.out    |    6 +-
 .../test/results/clientpositive/extract.q.out   |    6 +-
 .../extrapolate_part_stats_date.q.out           |   16 +-
 .../extrapolate_part_stats_full.q.out           |   38 +-
 .../extrapolate_part_stats_partial.q.out        |   90 +-
 .../filter_cond_pushdown_HIVE_15647.q.out       |  372 +
 .../clientpositive/filter_join_breaktask.q.out  |   15 +-
 .../clientpositive/filter_join_breaktask2.q.out |    8 +-
 .../results/clientpositive/filter_numeric.q.out |    8 +-
 .../results/clientpositive/floor_time.q.out     |    6 +-
 .../clientpositive/folder_predicate.q.out       |    2 -
 .../clientpositive/fouter_join_ppr.q.out        |   40 +-
 .../test/results/clientpositive/groupby1.q.out  |    8 +-
 .../test/results/clientpositive/groupby10.q.out |   16 +-
 .../test/results/clientpositive/groupby11.q.out |    8 +-
 .../results/clientpositive/groupby1_limit.q.out |    8 +-
 .../results/clientpositive/groupby1_map.q.out   |    8 +-
 .../clientpositive/groupby1_map_nomap.q.out     |    8 +-
 .../clientpositive/groupby1_map_skew.q.out      |    8 +-
 .../clientpositive/groupby1_noskew.q.out        |    8 +-
 .../results/clientpositive/groupby2_map.q.out   |    8 +-
 .../groupby2_map_multi_distinct.q.out           |   16 +-
 .../clientpositive/groupby2_noskew.q.out        |    8 +-
 .../groupby2_noskew_multi_distinct.q.out        |    8 +-
 .../test/results/clientpositive/groupby4.q.out  |    8 +-
 .../clientpositive/groupby4_noskew.q.out        |    8 +-
 .../test/results/clientpositive/groupby5.q.out  |    8 +-
 .../clientpositive/groupby5_noskew.q.out        |    8 +-
 .../test/results/clientpositive/groupby6.q.out  |    8 +-
 .../results/clientpositive/groupby6_map.q.out   |    8 +-
 .../clientpositive/groupby6_map_skew.q.out      |    8 +-
 .../clientpositive/groupby6_noskew.q.out        |    8 +-
 .../test/results/clientpositive/groupby7.q.out  |    8 +-
 .../results/clientpositive/groupby7_map.q.out   |    8 +-
 .../groupby7_map_multi_single_reducer.q.out     |    8 +-
 .../clientpositive/groupby7_map_skew.q.out      |    8 +-
 .../clientpositive/groupby7_noskew.q.out        |    8 +-
 .../groupby7_noskew_multi_single_reducer.q.out  |    8 +-
 .../test/results/clientpositive/groupby8.q.out  |    8 +-
 .../results/clientpositive/groupby8_map.q.out   |    8 +-
 .../clientpositive/groupby8_map_skew.q.out      |    8 +-
 .../clientpositive/groupby8_noskew.q.out        |    8 +-
 .../test/results/clientpositive/groupby9.q.out  |    8 +-
 .../clientpositive/groupby_complex_types.q.out  |    8 +-
 ...pby_complex_types_multi_single_reducer.q.out |    8 +-
 .../results/clientpositive/groupby_cube1.q.out  |   82 +-
 .../clientpositive/groupby_cube_multi_gby.q.out |   18 +-
 .../groupby_distinct_samekey.q.out              |   16 +-
 .../clientpositive/groupby_grouping_id3.q.out   |    8 +-
 .../clientpositive/groupby_grouping_sets2.q.out |   38 +-
 .../clientpositive/groupby_grouping_sets3.q.out |   54 +-
 .../clientpositive/groupby_grouping_sets4.q.out |   74 +-
 .../clientpositive/groupby_grouping_sets5.q.out |   44 +-
 .../clientpositive/groupby_grouping_sets6.q.out |   28 +-
 .../groupby_grouping_sets_grouping.q.out        |  767 ++
 .../groupby_grouping_sets_limit.q.out           |   48 +-
 .../groupby_grouping_window.q.out               |    8 +-
 .../clientpositive/groupby_map_ppr.q.out        |   14 +-
 .../groupby_map_ppr_multi_distinct.q.out        |   14 +-
 .../groupby_multi_insert_common_distinct.q.out  |    8 +-
 .../groupby_multi_single_reducer.q.out          |    8 +-
 .../groupby_multi_single_reducer2.q.out         |    8 +-
 .../groupby_multi_single_reducer3.q.out         |   12 +-
 .../clientpositive/groupby_nullvalues.q.out     |    2 -
 .../clientpositive/groupby_position.q.out       |   16 +-
 .../results/clientpositive/groupby_ppd.q.out    |    6 +-
 .../results/clientpositive/groupby_ppr.q.out    |   14 +-
 .../groupby_ppr_multi_distinct.q.out            |   20 +-
 .../clientpositive/groupby_rollup1.q.out        |   64 +-
 .../clientpositive/groupby_sort_10.q.out        |   34 +-
 .../clientpositive/groupby_sort_11.q.out        |   42 +-
 .../clientpositive/groupby_sort_1_23.q.out      |  284 +-
 .../results/clientpositive/groupby_sort_2.q.out |   22 +-
 .../results/clientpositive/groupby_sort_3.q.out |   26 +-
 .../results/clientpositive/groupby_sort_4.q.out |   30 +-
 .../results/clientpositive/groupby_sort_5.q.out |   58 +-
 .../results/clientpositive/groupby_sort_6.q.out |   36 +-
 .../results/clientpositive/groupby_sort_7.q.out |   24 +-
 .../results/clientpositive/groupby_sort_8.q.out |   16 +-
 .../results/clientpositive/groupby_sort_9.q.out |   14 +-
 .../clientpositive/groupby_sort_skew_1_23.q.out |  305 +-
 .../clientpositive/groupby_sort_test_1.q.out    |   14 +-
 ql/src/test/results/clientpositive/having.q.out |    6 +-
 .../clientpositive/implicit_decimal.q.out       |    2 -
 .../results/clientpositive/index_auto.q.out     |   21 +-
 .../clientpositive/index_auto_empty.q.out       |   26 +-
 .../clientpositive/index_auto_file_format.q.out |    8 +-
 .../clientpositive/index_auto_mult_tables.q.out |   20 +-
 .../index_auto_mult_tables_compact.q.out        |   26 +-
 .../clientpositive/index_auto_multiple.q.out    |   10 +-
 .../clientpositive/index_auto_partitioned.q.out |    8 +-
 .../clientpositive/index_auto_self_join.q.out   |   10 +-
 .../clientpositive/index_auto_unused.q.out      |   40 +-
 .../clientpositive/index_auto_update.q.out      |   28 +-
 .../results/clientpositive/index_bitmap.q.out   |    8 +-
 .../results/clientpositive/index_bitmap1.q.out  |    8 +-
 .../results/clientpositive/index_bitmap2.q.out  |    8 +-
 .../results/clientpositive/index_bitmap3.q.out  |    8 +-
 .../clientpositive/index_bitmap_auto.q.out      |   24 +-
 .../index_bitmap_auto_partitioned.q.out         |   10 +-
 .../index_bitmap_compression.q.out              |   14 +-
 .../clientpositive/index_bitmap_rc.q.out        |    8 +-
 .../results/clientpositive/index_compact.q.out  |    8 +-
 .../clientpositive/index_compact_1.q.out        |    8 +-
 .../clientpositive/index_compact_2.q.out        |    8 +-
 .../clientpositive/index_compact_3.q.out        |    8 +-
 .../clientpositive/index_compression.q.out      |   14 +-
 .../results/clientpositive/index_in_db.q.out    |   10 +-
 .../results/clientpositive/index_serde.q.out    |   16 +-
 .../clientpositive/index_skewtable.q.out        |   22 +-
 .../results/clientpositive/index_stale.q.out    |   26 +-
 .../index_stale_partitioned.q.out               |   28 +-
 .../clientpositive/infer_bucket_sort.q.out      |  164 +-
 .../infer_bucket_sort_convert_join.q.out        |   28 +-
 .../infer_bucket_sort_dyn_part.q.out            |   52 +-
 .../infer_bucket_sort_grouping_operators.q.out  |   78 +-
 .../infer_bucket_sort_list_bucket.q.out         |   34 +-
 .../infer_bucket_sort_map_operators.q.out       |   36 +-
 .../infer_bucket_sort_merge.q.out               |   24 +-
 .../infer_bucket_sort_multi_insert.q.out        |   44 +-
 .../infer_bucket_sort_num_buckets.q.out         |   30 +-
 .../infer_bucket_sort_reducers_power_two.q.out  |   50 +-
 .../clientpositive/infer_const_type.q.out       |   16 +-
 .../clientpositive/infer_join_preds.q.out       |    8 +-
 .../test/results/clientpositive/init_file.q.out |   10 +-
 .../test/results/clientpositive/innerjoin.q.out |   16 +-
 .../results/clientpositive/input11_limit.q.out  |    8 +-
 .../test/results/clientpositive/input12.q.out   |    8 +-
 .../test/results/clientpositive/input14.q.out   |    8 +-
 .../test/results/clientpositive/input16.q.out   |    6 +-
 .../test/results/clientpositive/input17.q.out   |    8 +-
 .../test/results/clientpositive/input18.q.out   |    8 +-
 .../test/results/clientpositive/input19.q.out   |    4 +-
 .../results/clientpositive/input1_limit.q.out   |    8 +-
 .../test/results/clientpositive/input23.q.out   |    2 +
 .../test/results/clientpositive/input39.q.out   |   10 +-
 .../test/results/clientpositive/input40.q.out   |    8 +-
 .../test/results/clientpositive/input42.q.out   |   20 +-
 .../clientpositive/input_lazyserde.q.out        |    8 +-
 .../results/clientpositive/input_part1.q.out    |   10 +
 .../results/clientpositive/input_part10.q.out   |   10 +-
 .../results/clientpositive/input_part2.q.out    |   28 +-
 .../results/clientpositive/input_part7.q.out    |    4 +
 .../results/clientpositive/input_part9.q.out    |   12 +-
 .../test/results/clientpositive/inputddl4.q.out |    8 +-
 .../test/results/clientpositive/inputddl5.q.out |    8 +-
 .../test/results/clientpositive/inputddl6.q.out |   10 +-
 .../test/results/clientpositive/inputddl7.q.out |   12 +-
 .../test/results/clientpositive/insert1.q.out   |   20 +-
 .../test/results/clientpositive/insert2.q.out   |    8 +-
 .../results/clientpositive/insert_into1.q.out   |   10 +-
 .../results/clientpositive/insert_into2.q.out   |    2 -
 .../results/clientpositive/insert_into4.q.out   |    8 +-
 .../insert_into_with_schema.q.out               |   12 -
 .../insert_into_with_schema2.q.out              |   20 +-
 .../insert_nonacid_from_acid.q.out              |   12 +-
 .../insert_overwrite_directory.q.out            |    8 +-
 .../insert_values_acid_not_bucketed.q.out       |    2 -
 .../insert_values_dynamic_partitioned.q.out     |    2 -
 .../insert_values_non_partitioned.q.out         |    2 -
 .../clientpositive/insert_values_nonascii.q.out |    2 -
 .../insert_values_orig_table.q.out              |    2 -
 .../insert_values_orig_table_use_metadata.q.out |    8 -
 .../insert_values_partitioned.q.out             |    2 -
 .../insert_values_tmp_table.q.out               |    2 -
 .../clientpositive/insertoverwrite_bucket.q.out |    6 -
 .../clientpositive/insertvalues_espchars.q.out  |    2 -
 .../results/clientpositive/interval_1.q.out     |   12 +-
 .../results/clientpositive/interval_2.q.out     |   20 +-
 .../results/clientpositive/interval_3.q.out     |   12 +-
 .../results/clientpositive/interval_alt.q.out   |    8 +-
 .../clientpositive/interval_arithmetic.q.out    |   12 +-
 .../clientpositive/interval_comparison.q.out    |   24 +-
 ql/src/test/results/clientpositive/join0.q.out  |    8 +-
 ql/src/test/results/clientpositive/join10.q.out |    8 +-
 ql/src/test/results/clientpositive/join11.q.out |    8 +-
 ql/src/test/results/clientpositive/join12.q.out |    8 +-
 ql/src/test/results/clientpositive/join13.q.out |    8 +-
 ql/src/test/results/clientpositive/join14.q.out |   10 +-
 ql/src/test/results/clientpositive/join15.q.out |    8 +-
 ql/src/test/results/clientpositive/join17.q.out |   12 +-
 ql/src/test/results/clientpositive/join18.q.out |    8 +-
 .../clientpositive/join18_multi_distinct.q.out  |    8 +-
 ql/src/test/results/clientpositive/join19.q.out |    8 +-
 ql/src/test/results/clientpositive/join2.q.out  |    8 +-
 ql/src/test/results/clientpositive/join20.q.out |    8 +-
 ql/src/test/results/clientpositive/join21.q.out |    8 +-
 ql/src/test/results/clientpositive/join23.q.out |    8 +-
 ql/src/test/results/clientpositive/join25.q.out |    8 +-
 ql/src/test/results/clientpositive/join26.q.out |   18 +-
 ql/src/test/results/clientpositive/join27.q.out |    8 +-
 ql/src/test/results/clientpositive/join28.q.out |   16 +-
 ql/src/test/results/clientpositive/join29.q.out |   16 +-
 ql/src/test/results/clientpositive/join3.q.out  |    8 +-
 ql/src/test/results/clientpositive/join30.q.out |    8 +-
 ql/src/test/results/clientpositive/join31.q.out |  204 +-
 ql/src/test/results/clientpositive/join32.q.out |   24 +-
 ql/src/test/results/clientpositive/join33.q.out |   24 +-
 ql/src/test/results/clientpositive/join34.q.out |   23 +-
 ql/src/test/results/clientpositive/join35.q.out |   31 +-
 ql/src/test/results/clientpositive/join36.q.out |    8 +-
 ql/src/test/results/clientpositive/join37.q.out |    8 +-
 ql/src/test/results/clientpositive/join39.q.out |    8 +-
 ql/src/test/results/clientpositive/join4.q.out  |    8 +-
 ql/src/test/results/clientpositive/join40.q.out |    8 +-
 ql/src/test/results/clientpositive/join41.q.out |    6 +-
 ql/src/test/results/clientpositive/join42.q.out |   10 +-
 ql/src/test/results/clientpositive/join43.q.out |   32 -
 ql/src/test/results/clientpositive/join44.q.out |    8 +-
 ql/src/test/results/clientpositive/join45.q.out |   84 +-
 ql/src/test/results/clientpositive/join46.q.out | 2004 ++++
 ql/src/test/results/clientpositive/join5.q.out  |    8 +-
 ql/src/test/results/clientpositive/join6.q.out  |    8 +-
 ql/src/test/results/clientpositive/join7.q.out  |    8 +-
 ql/src/test/results/clientpositive/join8.q.out  |    8 +-
 ql/src/test/results/clientpositive/join9.q.out  |   14 +-
 .../test/results/clientpositive/join_1to1.q.out |    8 +-
 .../clientpositive/join_acid_non_acid.q.out     |    4 -
 .../results/clientpositive/join_array.q.out     |    8 +-
 .../clientpositive/join_casesensitive.q.out     |    8 +-
 .../join_cond_pushdown_unqual5.q.out            |   10 +-
 .../clientpositive/join_emit_interval.q.out     |  223 +
 .../clientpositive/join_filters_overlap.q.out   |   50 +-
 .../results/clientpositive/join_literals.q.out  |    8 +-
 .../results/clientpositive/join_map_ppr.q.out   |   28 +-
 .../join_merge_multi_expressions.q.out          |    6 +-
 .../clientpositive/join_on_varchar.q.out        |    8 +-
 .../test/results/clientpositive/join_rc.q.out   |    8 +-
 .../results/clientpositive/join_reorder.q.out   |    8 +-
 .../results/clientpositive/join_thrift.q.out    |    8 +-
 .../test/results/clientpositive/join_vc.q.out   |   12 +-
 .../test/results/clientpositive/join_view.q.out |   11 +-
 .../test/results/clientpositive/keyword_1.q.out |    8 +-
 .../clientpositive/lateral_view_cp.q.out        |   12 +-
 .../clientpositive/lateral_view_noalias.q.out   |   14 +-
 .../clientpositive/lateral_view_onview.q.out    |   28 +-
 .../clientpositive/lateral_view_outer.q.out     |   12 +-
 .../clientpositive/lateral_view_ppd.q.out       |    6 +-
 .../results/clientpositive/lb_fs_stats.q.out    |   12 +-
 .../test/results/clientpositive/leadlag.q.out   |   72 +-
 .../clientpositive/leadlag_queries.q.out        |   30 +-
 .../results/clientpositive/leftsemijoin.q.out   |    8 +-
 .../limit_partition_metadataonly.q.out          |    8 +-
 .../clientpositive/limit_pushdown2.q.out        |  260 +-
 .../limit_pushdown_negative.q.out               |   24 +-
 .../test/results/clientpositive/lineage2.q.out  |    2 -
 .../clientpositive/list_bucket_dml_1.q.out      |   40 +-
 .../clientpositive/list_bucket_dml_11.q.out     |   36 +-
 .../clientpositive/list_bucket_dml_12.q.out     |   36 +-
 .../clientpositive/list_bucket_dml_13.q.out     |   34 +-
 .../clientpositive/list_bucket_dml_14.q.out     |   38 +-
 .../clientpositive/list_bucket_dml_2.q.out      |   74 +-
 .../clientpositive/list_bucket_dml_3.q.out      |   40 +-
 .../clientpositive/list_bucket_dml_4.q.out      |   90 +-
 .../clientpositive/list_bucket_dml_5.q.out      |   44 +-
 .../clientpositive/list_bucket_dml_6.q.out      |  138 +-
 .../clientpositive/list_bucket_dml_7.q.out      |   86 +-
 .../clientpositive/list_bucket_dml_8.q.out      |  124 +-
 .../clientpositive/list_bucket_dml_9.q.out      |   90 +-
 .../list_bucket_query_multiskew_1.q.out         |   96 +-
 .../list_bucket_query_multiskew_2.q.out         |   86 +-
 .../list_bucket_query_multiskew_3.q.out         |   76 +-
 .../list_bucket_query_oneskew_1.q.out           |   89 +-
 .../list_bucket_query_oneskew_2.q.out           |  121 +-
 .../list_bucket_query_oneskew_3.q.out           |   79 +-
 .../llap/acid_bucket_pruning.q.out              |   36 +-
 .../clientpositive/llap/acid_globallimit.q.out  |    6 +-
 .../llap/acid_vectorization.q.out               |    2 -
 .../clientpositive/llap/authorization_2.q.out   |   34 +-
 .../clientpositive/llap/auto_join0.q.out        |   10 +-
 .../clientpositive/llap/auto_join1.q.out        |    8 +-
 .../clientpositive/llap/auto_join21.q.out       |    8 +-
 .../clientpositive/llap/auto_join29.q.out       |    8 +-
 .../clientpositive/llap/auto_join30.q.out       |   16 +-
 .../llap/auto_smb_mapjoin_14.q.out              |  246 +-
 .../llap/auto_sortmerge_join_1.q.out            |   38 +-
 .../llap/auto_sortmerge_join_10.q.out           |   16 +-
 .../llap/auto_sortmerge_join_11.q.out           |   68 +-
 .../llap/auto_sortmerge_join_12.q.out           |   20 +-
 .../llap/auto_sortmerge_join_13.q.out           |  140 +-
 .../llap/auto_sortmerge_join_14.q.out           |   16 +-
 .../llap/auto_sortmerge_join_15.q.out           |    4 +-
 .../llap/auto_sortmerge_join_16.q.out           |    8 +-
 .../llap/auto_sortmerge_join_2.q.out            |   34 +-
 .../llap/auto_sortmerge_join_3.q.out            |   36 +-
 .../llap/auto_sortmerge_join_4.q.out            |   36 +-
 .../llap/auto_sortmerge_join_5.q.out            |   36 +-
 .../llap/auto_sortmerge_join_6.q.out            |  100 +-
 .../llap/auto_sortmerge_join_7.q.out            |   42 +-
 .../llap/auto_sortmerge_join_8.q.out            |   48 +-
 .../llap/auto_sortmerge_join_9.q.out            |  242 +-
 .../results/clientpositive/llap/bucket2.q.out   |   14 +-
 .../results/clientpositive/llap/bucket3.q.out   |   14 +-
 .../results/clientpositive/llap/bucket4.q.out   |    4 +
 .../results/clientpositive/llap/bucket5.q.out   |   34 +-
 .../clientpositive/llap/bucket_groupby.q.out    |   42 +-
 .../clientpositive/llap/bucket_many.q.out       |   10 +-
 .../llap/bucket_map_join_tez1.q.out             |   36 +-
 .../llap/bucketizedhiveinputformat.q.out        |   24 +-
 .../clientpositive/llap/bucketmapjoin1.q.out    |   18 +-
 .../clientpositive/llap/bucketmapjoin2.q.out    |   26 +-
 .../clientpositive/llap/bucketmapjoin3.q.out    |   12 +
 .../clientpositive/llap/bucketmapjoin4.q.out    |   12 +
 .../clientpositive/llap/bucketmapjoin6.q.out    |    8 +-
 .../clientpositive/llap/bucketmapjoin7.q.out    |   12 +-
 .../clientpositive/llap/bucketpruning1.q.out    |   46 +-
 .../llap/bucketsortoptimize_insert_2.q.out      |   48 +-
 .../llap/bucketsortoptimize_insert_6.q.out      |   62 +-
 .../llap/bucketsortoptimize_insert_7.q.out      |   26 +-
 .../results/clientpositive/llap/cbo_gby.q.out   |   10 +-
 .../clientpositive/llap/cbo_gby_empty.q.out     |    6 +-
 .../results/clientpositive/llap/cbo_join.q.out  |   14 +-
 .../results/clientpositive/llap/cbo_limit.q.out |    6 +-
 .../clientpositive/llap/cbo_rp_gby.q.out        |   10 +-
 .../clientpositive/llap/cbo_rp_join.q.out       |   14 +-
 .../clientpositive/llap/cbo_rp_limit.q.out      |    6 +-
 .../clientpositive/llap/cbo_rp_lineage2.q.out   |    2 -
 .../clientpositive/llap/cbo_rp_semijoin.q.out   |    6 +-
 .../clientpositive/llap/cbo_rp_subq_in.q.out    |   48 +-
 .../llap/cbo_rp_subq_not_in.q.out               |   48 +-
 .../clientpositive/llap/cbo_rp_udf_udaf.q.out   |   10 +-
 .../llap/cbo_rp_udf_udaf_stats_opt.q.out        |   10 +-
 .../llap/cbo_rp_unionDistinct_2.q.out           |   20 +-
 .../clientpositive/llap/cbo_rp_views.q.out      |   15 +-
 .../llap/cbo_rp_windowing_2.q.out               |  640 +-
 .../clientpositive/llap/cbo_semijoin.q.out      |    6 +-
 .../clientpositive/llap/cbo_simple_select.q.out |   36 +-
 .../results/clientpositive/llap/cbo_stats.q.out |    6 +-
 .../clientpositive/llap/cbo_subq_exists.q.out   |   36 +-
 .../clientpositive/llap/cbo_subq_in.q.out       |   48 +-
 .../clientpositive/llap/cbo_subq_not_in.q.out   |   82 +-
 .../clientpositive/llap/cbo_udf_udaf.q.out      |   10 +-
 .../results/clientpositive/llap/cbo_union.q.out |   10 +-
 .../results/clientpositive/llap/cbo_views.q.out |   15 +-
 .../clientpositive/llap/cbo_windowing.q.out     |   10 +-
 .../columnStatsUpdateForStatsOptimizer_1.q.out  |   20 +-
 .../llap/column_access_stats.q.out              |   32 +-
 ...names_with_leading_and_trailing_spaces.q.out |    4 -
 .../llap/columnstats_part_coltype.q.out         |   24 +-
 .../clientpositive/llap/constprog_dpp.q.out     |    4 +-
 .../llap/constprog_semijoin.q.out               |    6 -
 .../llap/correlationoptimizer1.q.out            |  148 +-
 .../llap/correlationoptimizer2.q.out            |   80 +-
 .../llap/correlationoptimizer3.q.out            |   42 +-
 .../llap/correlationoptimizer4.q.out            |   84 +-
 .../llap/correlationoptimizer6.q.out            |  102 +-
 .../results/clientpositive/llap/count.q.out     |   30 +-
 .../clientpositive/llap/cross_join.q.out        |   22 +-
 .../llap/cross_product_check_1.q.out            |   20 +-
 .../llap/cross_product_check_2.q.out            |    8 +-
 .../test/results/clientpositive/llap/ctas.q.out |   10 +-
 .../results/clientpositive/llap/cte_1.q.out     |   18 +-
 .../results/clientpositive/llap/cte_2.q.out     |   42 +-
 .../results/clientpositive/llap/cte_3.q.out     |   12 +-
 .../results/clientpositive/llap/cte_4.q.out     |   38 +-
 .../results/clientpositive/llap/cte_5.q.out     |   12 +-
 .../results/clientpositive/llap/cte_mat_1.q.out |   10 +-
 .../results/clientpositive/llap/cte_mat_2.q.out |   10 +-
 .../results/clientpositive/llap/cte_mat_4.q.out |    2 -
 .../results/clientpositive/llap/cte_mat_5.q.out |    2 -
 .../llap/current_date_timestamp.q.out           |   48 +-
 .../llap/custom_input_output_format.q.out       |    8 +-
 .../results/clientpositive/llap/database.q.out  |  242 +-
 .../clientpositive/llap/deleteAnalyze.q.out     |    2 -
 .../llap/disable_merge_for_bucketing.q.out      |    6 +-
 .../llap/drop_partition_with_stats.q.out        |    8 +-
 .../llap/dynamic_partition_pruning.q.out        |  682 +-
 .../llap/dynamic_partition_pruning_2.q.out      |   10 +-
 .../llap/dynamic_semijoin_reduction.q.out       | 1809 ++++
 .../llap/dynpart_sort_opt_vectorization.q.out   |   54 +-
 .../llap/dynpart_sort_optimization.q.out        |   56 +-
 .../llap/dynpart_sort_optimization2.q.out       |   28 +-
 .../llap/dynpart_sort_optimization_acid.q.out   |   58 +-
 .../results/clientpositive/llap/escape1.q.out   |  Bin 54831 -> 44317 bytes
 .../results/clientpositive/llap/escape2.q.out   |  Bin 78516 -> 60186 bytes
 .../clientpositive/llap/except_distinct.q.out   |    8 -
 .../clientpositive/llap/explainuser_1.q.out     | 1400 ++-
 .../clientpositive/llap/explainuser_2.q.out     | 1347 +--
 .../clientpositive/llap/explainuser_4.q.out     |   61 +-
 .../extrapolate_part_stats_partial_ndv.q.out    |   38 +
 .../llap/filter_join_breaktask.q.out            |   14 +-
 .../llap/filter_join_breaktask2.q.out           |    8 +-
 .../clientpositive/llap/global_limit.q.out      |   48 +-
 .../results/clientpositive/llap/groupby1.q.out  |    8 +-
 .../results/clientpositive/llap/groupby2.q.out  |    8 +-
 .../results/clientpositive/llap/groupby3.q.out  |    2 +-
 .../llap/groupby_grouping_id2.q.out             |    8 +-
 .../llap/groupby_resolution.q.out               |   30 +-
 .../results/clientpositive/llap/having.q.out    |    6 +-
 .../llap/hybridgrace_hashjoin_1.q.out           |  116 +-
 .../llap/hybridgrace_hashjoin_2.q.out           |   52 +-
 .../llap/infer_bucket_sort_bucketed_table.q.out |   24 +-
 .../clientpositive/llap/input16_cc.q.out        |   10 +-
 .../results/clientpositive/llap/insert1.q.out   |   20 +-
 .../clientpositive/llap/insert_dir_distcp.q.out |    5 -
 .../clientpositive/llap/insert_into1.q.out      |   12 +-
 .../clientpositive/llap/insert_into2.q.out      |    4 +-
 .../llap/insert_into_with_schema.q.out          |  114 +-
 .../llap/insert_values_acid_not_bucketed.q.out  |    2 -
 .../insert_values_dynamic_partitioned.q.out     |    2 -
 .../llap/insert_values_non_partitioned.q.out    |    2 -
 .../llap/insert_values_orig_table.q.out         |    2 -
 .../llap/insert_values_partitioned.q.out        |    2 -
 .../llap/insert_values_tmp_table.q.out          |    2 -
 .../clientpositive/llap/intersect_all.q.out     |    4 -
 .../llap/intersect_distinct.q.out               |    4 -
 .../clientpositive/llap/intersect_merge.q.out   |    4 -
 .../results/clientpositive/llap/join0.q.out     |   10 +-
 .../results/clientpositive/llap/join1.q.out     |    8 +-
 .../clientpositive/llap/join32_lessSize.q.out   |   52 +-
 .../results/clientpositive/llap/join43.q.out    |   32 -
 .../results/clientpositive/llap/join46.q.out    | 2260 +++++
 .../llap/join_acid_non_acid.q.out               |    4 -
 .../llap/join_emit_interval.q.out               |  251 +
 .../clientpositive/llap/join_filters.q.out      |    8 +-
 .../clientpositive/llap/join_nulls.q.out        |    8 +-
 .../clientpositive/llap/join_nullsafe.q.out     |   44 +-
 .../clientpositive/llap/lateral_view.q.out      |   24 +-
 .../clientpositive/llap/leftsemijoin.q.out      |    8 +-
 .../clientpositive/llap/leftsemijoin_mr.q.out   |    8 +-
 .../llap/limit_join_transpose.q.out             |   16 +-
 .../clientpositive/llap/limit_pushdown.q.out    |   68 +-
 .../clientpositive/llap/limit_pushdown3.q.out   |   54 +-
 .../results/clientpositive/llap/lineage2.q.out  |   28 +-
 .../results/clientpositive/llap/lineage3.q.out  |   24 +-
 .../llap/list_bucket_dml_10.q.out               |   48 +-
 .../clientpositive/llap/llap_nullscan.q.out     |    8 +-
 .../clientpositive/llap/llap_partitioned.q.out  |    2 +-
 .../clientpositive/llap/llap_stats.q.out        |  192 +
 .../results/clientpositive/llap/llap_udf.q.out  |   26 +-
 .../clientpositive/llap/llapdecider.q.out       |   14 +-
 .../clientpositive/llap/load_dyn_part1.q.out    |    8 +-
 .../clientpositive/llap/load_dyn_part2.q.out    |   10 +-
 .../clientpositive/llap/load_dyn_part3.q.out    |    8 +-
 .../results/clientpositive/llap/load_fs2.q.out  |   10 +-
 .../clientpositive/llap/lvj_mapjoin.q.out       |    8 +-
 .../results/clientpositive/llap/mapjoin2.q.out  |    4 -
 .../results/clientpositive/llap/mapjoin3.q.out  |  200 +
 .../results/clientpositive/llap/mapjoin46.q.out | 2061 ++++
 .../clientpositive/llap/mapjoin_decimal.q.out   |    8 +-
 .../llap/mapjoin_emit_interval.q.out            |  239 +
 .../clientpositive/llap/mapjoin_mapjoin.q.out   |   24 +-
 .../clientpositive/llap/mapreduce2.q.out        |    2 +-
 .../results/clientpositive/llap/merge1.q.out    |    8 +-
 .../results/clientpositive/llap/merge2.q.out    |    8 +-
 .../results/clientpositive/llap/mergejoin.q.out |  551 +-
 .../llap/metadata_only_queries.q.out            |   10 +-
 .../clientpositive/llap/metadataonly1.q.out     |   92 +-
 .../test/results/clientpositive/llap/mrr.q.out  |   34 +-
 .../clientpositive/llap/multiMapJoin1.q.out     |   66 +-
 .../clientpositive/llap/multiMapJoin2.q.out     |  324 +-
 .../clientpositive/llap/multi_column_in.q.out   |    5 +-
 .../llap/multi_column_in_single.q.out           |    5 +-
 .../llap/multi_count_distinct_null.q.out        |  312 +
 .../clientpositive/llap/multi_insert.q.out      |    8 +-
 .../llap/multi_insert_lateral_view.q.out        |   74 +-
 .../llap/nonmr_fetch_threshold.q.out            |   24 +-
 .../llap/offset_limit_ppd_optimizer.q.out       |   73 +-
 .../clientpositive/llap/optimize_nullscan.q.out |   66 +-
 .../clientpositive/llap/orc_analyze.q.out       |   52 +-
 .../clientpositive/llap/orc_create.q.out        |   38 +-
 .../results/clientpositive/llap/orc_llap.q.out  |  138 +-
 .../clientpositive/llap/orc_llap_counters.q.out |  250 +-
 .../llap/orc_llap_counters1.q.out               |   21 +-
 .../clientpositive/llap/orc_merge1.q.out        |   32 +-
 .../clientpositive/llap/orc_merge10.q.out       |   44 +-
 .../clientpositive/llap/orc_merge11.q.out       |    6 +-
 .../clientpositive/llap/orc_merge5.q.out        |   38 +-
 .../clientpositive/llap/orc_merge6.q.out        |   40 +-
 .../clientpositive/llap/orc_merge7.q.out        |   42 +-
 .../clientpositive/llap/orc_merge9.q.out        |    8 +-
 .../clientpositive/llap/orc_merge_diff_fs.q.out |   32 +-
 .../llap/orc_merge_incompat1.q.out              |   26 +-
 .../llap/orc_merge_incompat2.q.out              |   12 +-
 .../clientpositive/llap/orc_ppd_basic.q.out     |  474 +-
 .../clientpositive/llap/orc_ppd_date.q.out      |    6 +-
 .../clientpositive/llap/orc_ppd_decimal.q.out   |    6 +-
 .../llap/orc_ppd_schema_evol_3a.q.out           |  302 +-
 .../clientpositive/llap/orc_ppd_timestamp.q.out |    6 +-
 .../clientpositive/llap/orc_ppd_varchar.q.out   |    6 +-
 .../llap/orc_predicate_pushdown.q.out           |  148 +-
 .../llap/orc_split_elimination.q.out            |  256 +-
 .../clientpositive/llap/order_null.q.out        |   12 -
 .../results/clientpositive/llap/parallel.q.out  |    8 +-
 .../llap/parquet_predicate_pushdown.q.out       |   30 +-
 .../clientpositive/llap/parquet_types.q.out     |    8 +-
 .../llap/partition_multilevels.q.out            |   72 +-
 .../clientpositive/llap/ppd_union_view.q.out    |   16 +-
 .../test/results/clientpositive/llap/ptf.q.out  |  429 +-
 .../clientpositive/llap/ptf_matchpath.q.out     |   22 +-
 .../clientpositive/llap/ptf_streaming.q.out     |   96 +-
 .../llap/reduce_deduplicate.q.out               |    6 +
 .../llap/reduce_deduplicate_extended.q.out      |   68 +-
 .../results/clientpositive/llap/sample1.q.out   |   10 +-
 .../results/clientpositive/llap/sample10.q.out  |   16 +-
 .../schema_evol_orc_acid_mapwork_part.q.out     |  122 -
 .../schema_evol_orc_acid_mapwork_table.q.out    |  122 -
 .../llap/schema_evol_orc_acid_part.q.out        |  272 +-
 .../llap/schema_evol_orc_acid_part_update.q.out |  110 +-
 .../llap/schema_evol_orc_acid_table.q.out       |  274 +-
 .../schema_evol_orc_acid_table_update.q.out     |   96 +-
 .../schema_evol_orc_acidvec_mapwork_part.q.out  |  122 -
 .../schema_evol_orc_acidvec_mapwork_table.q.out |  122 -
 .../llap/schema_evol_orc_acidvec_part.q.out     |  272 +-
 .../schema_evol_orc_acidvec_part_update.q.out   |   96 +-
 .../llap/schema_evol_orc_acidvec_table.q.out    |  274 +-
 .../schema_evol_orc_acidvec_table_update.q.out  |   96 +-
 .../schema_evol_orc_nonvec_fetchwork_part.q.out |  104 -
 ...schema_evol_orc_nonvec_fetchwork_table.q.out |  104 -
 .../schema_evol_orc_nonvec_mapwork_part.q.out   |  104 -
 ...ol_orc_nonvec_mapwork_part_all_complex.q.out |    2 -
 ..._orc_nonvec_mapwork_part_all_primitive.q.out |   90 -
 .../schema_evol_orc_nonvec_mapwork_table.q.out  |  104 -
 .../llap/schema_evol_orc_nonvec_part.q.out      |  268 +-
 ...chema_evol_orc_nonvec_part_all_complex.q.out |   66 +-
 ...ema_evol_orc_nonvec_part_all_primitive.q.out |  122 +-
 .../llap/schema_evol_orc_nonvec_table.q.out     |  290 +-
 .../llap/schema_evol_orc_vec_mapwork_part.q.out |  104 -
 ..._evol_orc_vec_mapwork_part_all_complex.q.out |    2 -
 ...vol_orc_vec_mapwork_part_all_primitive.q.out |   90 -
 .../schema_evol_orc_vec_mapwork_table.q.out     |  104 -
 .../llap/schema_evol_orc_vec_part.q.out         |  268 +-
 .../schema_evol_orc_vec_part_all_complex.q.out  |   66 +-
 ...schema_evol_orc_vec_part_all_primitive.q.out |  122 +-
 .../llap/schema_evol_orc_vec_table.q.out        |  290 +-
 .../clientpositive/llap/schema_evol_stats.q.out |   20 +-
 .../schema_evol_text_nonvec_mapwork_part.q.out  |  104 -
 ...l_text_nonvec_mapwork_part_all_complex.q.out |    2 -
 ...text_nonvec_mapwork_part_all_primitive.q.out |   90 -
 .../schema_evol_text_nonvec_mapwork_table.q.out |  104 -
 .../llap/schema_evol_text_nonvec_part.q.out     |  268 +-
 ...hema_evol_text_nonvec_part_all_complex.q.out |   66 +-
 ...ma_evol_text_nonvec_part_all_primitive.q.out |  126 +-
 .../llap/schema_evol_text_nonvec_table.q.out    |  290 +-
 .../schema_evol_text_vec_mapwork_part.q.out     |  104 -
 ...evol_text_vec_mapwork_part_all_complex.q.out |    2 -
 ...ol_text_vec_mapwork_part_all_primitive.q.out |   90 -
 .../schema_evol_text_vec_mapwork_table.q.out    |  104 -
 .../llap/schema_evol_text_vec_part.q.out        |  282 +-
 .../schema_evol_text_vec_part_all_complex.q.out |   70 +-
 ...chema_evol_text_vec_part_all_primitive.q.out |  140 +-
 .../llap/schema_evol_text_vec_table.q.out       |  304 +-
 .../schema_evol_text_vecrow_mapwork_part.q.out  |  104 -
 ...l_text_vecrow_mapwork_part_all_complex.q.out |    2 -
 ...text_vecrow_mapwork_part_all_primitive.q.out |   90 -
 .../schema_evol_text_vecrow_mapwork_table.q.out |  104 -
 .../llap/schema_evol_text_vecrow_part.q.out     |  282 +-
 ...hema_evol_text_vecrow_part_all_complex.q.out |   72 +-
 ...ma_evol_text_vecrow_part_all_primitive.q.out |  140 +-
 .../llap/schema_evol_text_vecrow_table.q.out    |  304 +-
 .../clientpositive/llap/script_env_var1.q.out   |    8 +-
 .../clientpositive/llap/script_env_var2.q.out   |    6 +-
 .../clientpositive/llap/script_pipe.q.out       |   12 +-
 .../llap/selectDistinctStar.q.out               |   24 +-
 .../llap/select_dummy_source.q.out              |   18 +-
 .../results/clientpositive/llap/semijoin.q.out  |    8 +-
 .../results/clientpositive/llap/skewjoin.q.out  |   18 +-
 .../clientpositive/llap/skewjoinopt15.q.out     |   42 +-
 .../clientpositive/llap/skiphf_aggr.q.out       |   12 -
 .../clientpositive/llap/smb_mapjoin_14.q.out    |  116 +-
 .../clientpositive/llap/smb_mapjoin_15.q.out    |   62 +-
 .../clientpositive/llap/smb_mapjoin_17.q.out    |   32 +-
 .../clientpositive/llap/smb_mapjoin_18.q.out    |   24 +-
 .../clientpositive/llap/smb_mapjoin_19.q.out    |   14 +-
 .../clientpositive/llap/smb_mapjoin_4.q.out     |    8 +-
 .../clientpositive/llap/smb_mapjoin_5.q.out     |    8 +-
 .../llap/special_character_in_tabnames_1.q.out  |  371 +-
 .../results/clientpositive/llap/sqlmerge.q.out  |  268 +
 .../results/clientpositive/llap/stats11.q.out   |   12 +
 .../llap/stats_based_fetch_decision.q.out       |   44 +-
 .../clientpositive/llap/stats_noscan_1.q.out    |   28 +-
 .../clientpositive/llap/stats_only_null.q.out   |    4 +-
 .../clientpositive/llap/subquery_exists.q.out   | 1017 +-
 .../clientpositive/llap/subquery_in.q.out       | 6621 +++++++++++-
 .../clientpositive/llap/subquery_multi.q.out    | 5623 +++++++++++
 .../llap/subquery_nested_subquery.q.out         |   38 +
 .../clientpositive/llap/subquery_notin.q.out    | 9482 +++++++++++++++++-
 .../clientpositive/llap/subquery_null_agg.q.out |  200 +
 .../clientpositive/llap/subquery_scalar.q.out   | 7304 ++++++++++++++
 .../llap/subquery_shared_alias.q.out            |   23 +
 .../clientpositive/llap/subquery_views.q.out    |  666 +-
 .../llap/table_access_keys_stats.q.out          |   71 +-
 .../llap/table_nonprintable.q.out               |    2 +
 .../llap/temp_table_external.q.out              |    6 +-
 .../results/clientpositive/llap/tez_dml.q.out   |   34 +-
 .../llap/tez_dynpart_hashjoin_1.q.out           |   16 +-
 .../llap/tez_dynpart_hashjoin_2.q.out           |   22 +-
 .../llap/tez_dynpart_hashjoin_3.q.out           |    4 +-
 .../clientpositive/llap/tez_join_hash.q.out     |   10 +-
 .../llap/tez_join_result_complex.q.out          |   24 +-
 .../clientpositive/llap/tez_join_tests.q.out    |    8 +-
 .../clientpositive/llap/tez_joins_explain.q.out |    6 +-
 .../clientpositive/llap/tez_multi_union.q.out   |    6 +-
 .../clientpositive/llap/tez_nway_join.q.out     |  501 +
 .../llap/tez_schema_evolution.q.out             |    8 +-
 .../clientpositive/llap/tez_self_join.q.out     |    6 +-
 .../results/clientpositive/llap/tez_smb_1.q.out |  169 +-
 .../clientpositive/llap/tez_smb_empty.q.out     |   18 +-
 .../clientpositive/llap/tez_smb_main.q.out      |   20 +-
 .../results/clientpositive/llap/tez_union.q.out |    4 +-
 .../llap/tez_union_dynamic_partition.q.out      |    2 -
 .../llap/tez_union_multiinsert.q.out            |  236 +-
 .../llap/tez_vector_dynpart_hashjoin_1.q.out    |   16 +-
 .../llap/tez_vector_dynpart_hashjoin_2.q.out    |   22 +-
 .../clientpositive/llap/transform2.q.out        |    6 +-
 .../clientpositive/llap/transform_ppr1.q.out    |    8 +-
 .../clientpositive/llap/transform_ppr2.q.out    |    8 +-
 .../clientpositive/llap/uber_reduce.q.out       |   10 +-
 .../llap/udaf_collect_set_2.q.out               |  128 +-
 .../results/clientpositive/llap/union2.q.out    |   12 +-
 .../results/clientpositive/llap/union3.q.out    |   16 +-
 .../results/clientpositive/llap/union4.q.out    |   18 +-
 .../results/clientpositive/llap/union5.q.out    |   14 +-
 .../results/clientpositive/llap/union6.q.out    |   14 +-
 .../results/clientpositive/llap/union7.q.out    |   12 +-
 .../results/clientpositive/llap/union8.q.out    |   10 +-
 .../results/clientpositive/llap/union9.q.out    |   12 +-
 .../clientpositive/llap/unionDistinct_1.q.out   |  624 +-
 .../clientpositive/llap/unionDistinct_2.q.out   |   20 +-
 .../clientpositive/llap/union_remove_26.q.out   |   44 +-
 .../clientpositive/llap/union_stats.q.out       |    4 +
 .../clientpositive/llap/union_top_level.q.out   |  107 +-
 .../llap/update_after_multiple_inserts.q.out    |   12 +-
 .../clientpositive/llap/update_all_types.q.out  |    8 +-
 .../clientpositive/llap/varchar_udf1.q.out      |   18 +-
 .../clientpositive/llap/vector_acid3.q.out      |    2 -
 .../llap/vector_adaptor_usage_mode.q.out        |   10 +-
 .../llap/vector_aggregate_9.q.out               |   10 +-
 .../llap/vector_aggregate_without_gby.q.out     |    8 +-
 .../llap/vector_auto_smb_mapjoin_14.q.out       |  248 +-
 .../llap/vector_between_columns.q.out           |   12 +-
 .../clientpositive/llap/vector_between_in.q.out |  110 +-
 .../llap/vector_binary_join_groupby.q.out       |   20 +-
 .../clientpositive/llap/vector_bround.q.out     |    2 -
 .../clientpositive/llap/vector_bucket.q.out     |    4 +-
 .../llap/vector_cast_constant.q.out             |    6 +-
 .../clientpositive/llap/vector_char_2.q.out     |   12 +-
 .../clientpositive/llap/vector_char_cast.q.out  |    2 -
 .../llap/vector_char_mapjoin1.q.out             |   42 +-
 .../llap/vector_char_simple.q.out               |   24 +-
 .../clientpositive/llap/vector_coalesce.q.out   |   12 +-
 .../clientpositive/llap/vector_coalesce_2.q.out |    2 -
 .../clientpositive/llap/vector_coalesce_3.q.out |  123 +
 .../llap/vector_complex_all.q.out               |    8 +-
 .../llap/vector_complex_join.q.out              |   14 +-
 .../clientpositive/llap/vector_count.q.out      |    8 +-
 .../llap/vector_count_distinct.q.out            |   18 +-
 .../clientpositive/llap/vector_data_types.q.out |    6 +-
 .../clientpositive/llap/vector_date_1.q.out     |   30 +-
 .../clientpositive/llap/vector_decimal_2.q.out  |   26 +-
 .../llap/vector_decimal_aggregate.q.out         |   16 +-
 .../llap/vector_decimal_expressions.q.out       |   34 +-
 .../llap/vector_decimal_mapjoin.q.out           |    8 +-
 .../llap/vector_decimal_math_funcs.q.out        |   24 +-
 .../llap/vector_decimal_precision.q.out         |  250 +-
 .../llap/vector_decimal_round.q.out             |    6 -
 .../llap/vector_decimal_round_2.q.out           |   30 +-
 .../llap/vector_decimal_udf.q.out               |  384 +-
 .../clientpositive/llap/vector_distinct_2.q.out |    8 +-
 .../clientpositive/llap/vector_groupby4.q.out   |    8 +-
 .../clientpositive/llap/vector_groupby6.q.out   |    8 +-
 .../clientpositive/llap/vector_groupby_3.q.out  |    8 +-
 .../llap/vector_groupby_mapjoin.q.out           |   76 +-
 .../llap/vector_grouping_sets.q.out             |   36 +-
 .../llap/vector_include_no_sel.q.out            |   24 +-
 .../clientpositive/llap/vector_inner_join.q.out |    8 -
 .../clientpositive/llap/vector_interval_1.q.out |   46 +-
 .../clientpositive/llap/vector_interval_2.q.out |   20 +-
 .../llap/vector_interval_arithmetic.q.out       |   26 +-
 .../clientpositive/llap/vector_join30.q.out     |   32 +-
 .../llap/vector_join_filters.q.out              |    8 +-
 .../clientpositive/llap/vector_join_nulls.q.out |    8 +-
 .../llap/vector_join_part_col_char.q.out        |    2 -
 .../llap/vector_left_outer_join.q.out           |    2 +-
 .../llap/vector_left_outer_join2.q.out          |    8 +-
 .../llap/vector_leftsemi_mapjoin.q.out          |    8 +-
 .../llap/vector_mapjoin_reduce.q.out            |  347 +-
 .../llap/vector_mr_diff_schema_alias.q.out      |   10 +-
 .../llap/vector_null_projection.q.out           |   18 +-
 .../llap/vector_nullsafe_join.q.out             |   62 +-
 .../llap/vector_number_compare_projection.q.out |  172 +-
 .../llap/vector_outer_join0.q.out               |   20 +-
 .../llap/vector_outer_join1.q.out               |   32 +-
 .../llap/vector_outer_join2.q.out               |   16 +-
 .../llap/vector_outer_join3.q.out               |   36 +-
 .../llap/vector_outer_join4.q.out               |   32 +-
 .../llap/vector_outer_join5.q.out               |   28 +-
 .../llap/vector_outer_join6.q.out               |    8 +-
 .../llap/vector_partition_diff_num_cols.q.out   |   46 +-
 .../llap/vector_partitioned_date_time.q.out     |   16 +-
 .../clientpositive/llap/vector_reduce1.q.out    |    8 +-
 .../clientpositive/llap/vector_reduce2.q.out    |    8 +-
 .../clientpositive/llap/vector_reduce3.q.out    |    8 +-
 .../llap/vector_string_concat.q.out             |   14 +-
 .../clientpositive/llap/vector_struct_in.q.out  |   36 +-
 .../clientpositive/llap/vector_udf1.q.out       |  494 +-
 .../llap/vector_varchar_mapjoin1.q.out          |   18 +-
 .../llap/vector_varchar_simple.q.out            |   24 +-
 .../llap/vector_when_case_null.q.out            |   10 +-
 .../clientpositive/llap/vectorization_0.q.out   |   52 +-
 .../clientpositive/llap/vectorization_1.q.out   |    8 +-
 .../clientpositive/llap/vectorization_10.q.out  |    8 +-
 .../clientpositive/llap/vectorization_11.q.out  |    8 +-
 .../clientpositive/llap/vectorization_12.q.out  |    8 +-
 .../clientpositive/llap/vectorization_13.q.out  |   14 +-
 .../clientpositive/llap/vectorization_14.q.out  |    8 +-
 .../clientpositive/llap/vectorization_15.q.out  |    8 +-
 .../clientpositive/llap/vectorization_16.q.out  | 1054 +-
 .../clientpositive/llap/vectorization_17.q.out  |    8 +-
 .../clientpositive/llap/vectorization_2.q.out   |    8 +-
 .../clientpositive/llap/vectorization_3.q.out   |    8 +-
 .../clientpositive/llap/vectorization_4.q.out   |    8 +-
 .../clientpositive/llap/vectorization_5.q.out   |    8 +-
 .../clientpositive/llap/vectorization_6.q.out   |    8 +-
 .../clientpositive/llap/vectorization_7.q.out   |   14 +-
 .../clientpositive/llap/vectorization_8.q.out   |   14 +-
 .../clientpositive/llap/vectorization_9.q.out   | 1054 +-
 .../llap/vectorization_pushdown.q.out           |    2 +-
 .../llap/vectorization_short_regress.q.out      |  664 +-
 .../llap/vectorized_bucketmapjoin1.q.out        |   14 +-
 .../clientpositive/llap/vectorized_casts.q.out  |   74 +-
 .../llap/vectorized_date_funcs.q.out            | 1005 +-
 .../llap/vectorized_distinct_gby.q.out          |    4 +-
 .../vectorized_dynamic_partition_pruning.q.out  |  664 +-
 .../vectorized_dynamic_semijoin_reduction.q.out |  932 ++
 .../clientpositive/llap/vectorized_join46.q.out | 1829 ++++
 .../llap/vectorized_mapjoin.q.out               |   10 +-
 .../llap/vectorized_math_funcs.q.out            |   56 +-
 .../llap/vectorized_nested_mapjoin.q.out        |   10 +-
 .../llap/vectorized_parquet_types.q.out         |   12 +-
 .../clientpositive/llap/vectorized_ptf.q.out    |  533 +-
 .../llap/vectorized_rcfile_columnar.q.out       |   10 +-
 .../llap/vectorized_shufflejoin.q.out           |   10 +-
 .../llap/vectorized_string_funcs.q.out          |   24 +-
 .../llap/vectorized_timestamp.q.out             |   14 +-
 .../llap/vectorized_timestamp_funcs.q.out       |   38 +-
 .../llap/vectorized_timestamp_ints_casts.q.out  |   32 +-
 .../results/clientpositive/llap/windowing.q.out |  640 +-
 .../llap/windowing_windowspec2.q.out            |   42 +-
 .../test/results/clientpositive/llap_acid.q.out |    2 -
 .../test/results/clientpositive/llap_text.q.out | 1082 ++
 .../clientpositive/load_binary_data.q.out       |  Bin 2604 -> 2262 bytes
 .../results/clientpositive/load_dyn_part1.q.out |    8 +-
 .../clientpositive/load_dyn_part10.q.out        |    8 +-
 .../clientpositive/load_dyn_part14.q.out        |   14 +-
 .../results/clientpositive/load_dyn_part2.q.out |    8 +-
 .../results/clientpositive/load_dyn_part3.q.out |    8 +-
 .../results/clientpositive/load_dyn_part4.q.out |    8 +-
 .../results/clientpositive/load_dyn_part8.q.out |   20 +-
 .../results/clientpositive/load_dyn_part9.q.out |    8 +-
 .../load_file_with_space_in_the_name.q.out      |   10 +-
 .../clientpositive/load_fs_overwrite.q.out      |    8 +-
 .../clientpositive/louter_join_ppr.q.out        |   36 +-
 .../test/results/clientpositive/macro_1.q.out   |    2 -
 .../clientpositive/macro_duplicate.q.out        |    4 -
 .../test/results/clientpositive/mapjoin1.q.out  |   18 +-
 .../test/results/clientpositive/mapjoin2.q.out  |    4 -
 .../test/results/clientpositive/mapjoin3.q.out  |  196 +
 .../test/results/clientpositive/mapjoin46.q.out | 1962 ++++
 .../mapjoin_filter_on_outerjoin.q.out           |   12 +-
 .../clientpositive/mapjoin_mapjoin.q.out        |   24 +-
 .../clientpositive/mapjoin_memcheck.q.out       |    8 +-
 .../clientpositive/mapjoin_subquery.q.out       |   10 +-
 .../clientpositive/mapjoin_subquery2.q.out      |    8 +-
 .../clientpositive/mapjoin_test_outer.q.out     |   12 +-
 .../test/results/clientpositive/masking_2.q.out |    2 +
 .../test/results/clientpositive/masking_3.q.out | 1042 +-
 .../test/results/clientpositive/masking_4.q.out |  167 +-
 .../test/results/clientpositive/masking_6.q.out |   15 +
 .../test/results/clientpositive/masking_7.q.out |   17 +
 .../test/results/clientpositive/masking_8.q.out |   50 +-
 .../clientpositive/masking_disablecbo_2.q.out   |    2 +
 .../clientpositive/masking_disablecbo_4.q.out   |   24 +-
 ...materialized_view_authorization_sqlstd.q.out |    2 -
 .../materialized_view_create.q.out              |    6 +-
 .../materialized_view_create_rewrite.q.out      |  322 +
 ...erialized_view_create_rewrite_multi_db.q.out |  157 +
 .../materialized_view_describe.q.out            |   22 +-
 ql/src/test/results/clientpositive/merge1.q.out |    8 +-
 ql/src/test/results/clientpositive/merge2.q.out |    8 +-
 ql/src/test/results/clientpositive/merge3.q.out |   34 +-
 ql/src/test/results/clientpositive/merge4.q.out |    8 +-
 .../merge_dynamic_partition.q.out               |    8 +-
 .../merge_dynamic_partition3.q.out              |    8 +-
 .../merge_dynamic_partition4.q.out              |   10 +-
 .../merge_dynamic_partition5.q.out              |    8 +-
 .../test/results/clientpositive/mergejoin.q.out |    8 +-
 .../results/clientpositive/mergejoins.q.out     |    6 +-
 .../clientpositive/mergejoins_mixed.q.out       |   32 +-
 .../clientpositive/metadata_empty_table.q.out   |   81 +
 ql/src/test/results/clientpositive/mi.q.out     |    8 +-
 .../results/clientpositive/msck_repair_0.q.out  |    8 +
 .../results/clientpositive/msck_repair_1.q.out  |    8 +
 .../results/clientpositive/msck_repair_2.q.out  |    8 +
 .../results/clientpositive/msck_repair_3.q.out  |    8 +
 .../clientpositive/msck_repair_batchsize.q.out  |    8 +
 .../clientpositive/multi_column_in.q.out        |    2 -
 .../clientpositive/multi_column_in_single.q.out |    2 -
 .../clientpositive/multi_insert_gby.q.out       |   10 +-
 .../clientpositive/multi_insert_gby2.q.out      |    6 +-
 .../clientpositive/multi_insert_gby3.q.out      |    6 +-
 .../clientpositive/multi_insert_gby4.q.out      |  275 +
 .../clientpositive/multi_insert_mixed.q.out     |   10 +-
 ...i_insert_move_tasks_share_dependencies.q.out |    8 +-
 .../clientpositive/multi_insert_union_src.q.out |    4 +-
 .../clientpositive/multi_insert_with_join.q.out |    4 -
 .../multi_insert_with_join2.q.out               |  523 +-
 .../clientpositive/multi_join_union.q.out       |    8 +-
 .../clientpositive/nested_column_pruning.q.out  | 1584 +++
 .../test/results/clientpositive/newline.q.out   |    8 +-
 .../nomore_ambiguous_table_col.q.out            |    8 +-
 .../nonblock_op_deduplicate.q.out               |   24 +-
 .../results/clientpositive/nonmr_fetch.q.out    |  114 +-
 .../clientpositive/nonmr_fetch_threshold.q.out  |   24 +-
 .../results/clientpositive/nullformat.q.out     |   24 +-
 .../results/clientpositive/nullformatCTAS.q.out |   18 +-
 .../results/clientpositive/nullformatdir.q.out  |   12 +-
 .../offset_limit_global_optimizer.q.out         |   52 +
 .../orc_dictionary_threshold.q.out              |   46 +-
 .../clientpositive/orc_diff_part_cols.q.out     |   20 +-
 .../clientpositive/orc_diff_part_cols2.q.out    |   14 +-
 .../clientpositive/orc_empty_files.q.out        |   14 +-
 .../clientpositive/orc_empty_strings.q.out      |   24 +-
 .../clientpositive/orc_ends_with_nulls.q.out    |   12 +-
 .../results/clientpositive/orc_merge1.q.out     |   32 +-
 .../results/clientpositive/orc_merge10.q.out    |   44 +-
 .../results/clientpositive/orc_merge11.q.out    |    6 +-
 .../results/clientpositive/orc_merge5.q.out     |   38 +-
 .../results/clientpositive/orc_merge6.q.out     |   40 +-
 .../results/clientpositive/orc_merge9.q.out     |    8 +-
 .../clientpositive/orc_merge_diff_fs.q.out      |   32 +-
 .../clientpositive/orc_merge_incompat1.q.out    |   26 +-
 .../clientpositive/orc_merge_incompat2.q.out    |   12 +-
 .../clientpositive/orc_ppd_boolean.q.out        |    6 +-
 .../results/clientpositive/orc_ppd_char.q.out   |    6 +-
 .../clientpositive/orc_ppd_exception.q.out      |    2 -
 .../clientpositive/orc_ppd_str_conversion.q.out |    2 -
 .../clientpositive/orc_remove_cols.q.out        |    6 +-
 .../clientpositive/orc_schema_evolution.q.out   |   12 +-
 .../orc_schema_evolution_float.q.out            |    4 -
 .../clientpositive/orc_vectorization_ppd.q.out  |   80 +-
 .../results/clientpositive/order_null.q.out     |   12 -
 .../results/clientpositive/outer_join_ppr.q.out |   24 +-
 .../test/results/clientpositive/parallel.q.out  |    8 +-
 .../results/clientpositive/parallel_join0.q.out |    8 +-
 .../results/clientpositive/parallel_join1.q.out |    8 +-
 .../clientpositive/parallel_orderby.q.out       |    8 +-
 .../clientpositive/parquet_analyze.q.out        |   18 +-
 .../parquet_array_of_multi_field_struct.q.out   |   18 +-
 .../parquet_array_of_optional_elements.q.out    |    8 +-
 .../parquet_array_of_required_elements.q.out    |    8 +-
 .../parquet_array_of_single_field_struct.q.out  |   12 +-
 .../parquet_array_of_structs.q.out              |    8 +-
 .../parquet_array_of_unannotated_groups.q.out   |   10 +-
 ...arquet_array_of_unannotated_primitives.q.out |   10 +-
 .../parquet_avro_array_of_primitives.q.out      |    8 +-
 ...quet_avro_array_of_single_field_struct.q.out |   10 +-
 .../results/clientpositive/parquet_ctas.q.out   |   12 +-
 .../results/clientpositive/parquet_join.q.out   |   38 +-
 .../results/clientpositive/parquet_join2.q.out  |    6 -
 .../clientpositive/parquet_map_null.q.out       |    8 +-
 .../parquet_map_of_arrays_of_ints.q.out         |   10 +-
 .../clientpositive/parquet_map_of_maps.q.out    |    8 +-
 .../parquet_mixed_partition_formats.q.out       |   14 +-
 .../clientpositive/parquet_nested_complex.q.out |   16 +-
 .../clientpositive/parquet_partitioned.q.out    |    8 +-
 .../clientpositive/parquet_ppd_char.q.out       |    6 +-
 .../clientpositive/parquet_ppd_date.q.out       |    6 +-
 .../clientpositive/parquet_ppd_decimal.q.out    |    6 +-
 .../clientpositive/parquet_ppd_partition.q.out  |    8 +-
 .../clientpositive/parquet_ppd_timestamp.q.out  |    6 +-
 .../clientpositive/parquet_ppd_varchar.q.out    |    6 +-
 ...parquet_read_backward_compatible_files.q.out |   10 +-
 .../parquet_schema_evolution.q.out              |   38 +-
 .../results/clientpositive/parquet_serde.q.out  |   16 +-
 .../parquet_table_with_subschema.q.out          |   18 +-
 .../parquet_thrift_array_of_primitives.q.out    |    8 +-
 ...et_thrift_array_of_single_field_struct.q.out |   10 +-
 .../clientpositive/parquet_type_promotion.q.out |   26 +-
 ..._non_dictionary_encoding_vectorization.q.out |    8 +-
 .../parquet_types_vectorization.q.out           |    8 +-
 ...arquet_write_correct_definition_levels.q.out |   12 +-
 .../test/results/clientpositive/partInit.q.out  |   13 +-
 .../clientpositive/part_inherit_tbl_props.q.out |    8 +-
 .../part_inherit_tbl_props_with_star.q.out      |    8 +-
 .../clientpositive/partial_column_stats.q.out   |   74 +
 .../clientpositive/partition_boolexpr.q.out     |   12 +-
 .../partition_coltype_literals.q.out            |   82 +-
 .../results/clientpositive/partition_date.q.out |   98 +-
 .../clientpositive/partition_date2.q.out        |   64 +-
 .../clientpositive/partition_timestamp.q.out    |  106 +-
 .../clientpositive/partition_timestamp2.q.out   |   67 +-
 .../clientpositive/partition_type_check.q.out   |   18 +-
 .../clientpositive/partition_type_in_plan.q.out |   20 +-
 .../clientpositive/partition_varchar1.q.out     |   70 +-
 .../partition_wise_fileformat10.q.out           |    6 +-
 .../partition_wise_fileformat11.q.out           |    6 +-
 .../partition_wise_fileformat12.q.out           |    6 +-
 .../partition_wise_fileformat13.q.out           |    6 +-
 .../partition_wise_fileformat14.q.out           |   34 +-
 .../partition_wise_fileformat15.q.out           |    6 +-
 .../partition_wise_fileformat16.q.out           |    6 +-
 .../partition_wise_fileformat17.q.out           |   42 +-
 .../partition_wise_fileformat18.q.out           |   32 +-
 .../partition_wise_fileformat2.q.out            |    8 +-
 .../partition_wise_fileformat8.q.out            |    8 +-
 .../partition_wise_fileformat9.q.out            |    8 +-
 ql/src/test/results/clientpositive/pcr.q.out    |  152 +-
 ql/src/test/results/clientpositive/pcs.q.out    |   38 +
 .../results/clientpositive/perf/query1.q.out    |  249 +
 .../results/clientpositive/perf/query12.q.out   |   26 +-
 .../results/clientpositive/perf/query13.q.out   |    6 +-
 .../results/clientpositive/perf/query14.q.out   | 1568 +++
 .../results/clientpositive/perf/query16.q.out   |  276 +
 .../results/clientpositive/perf/query18.q.out   |    2 +-
 .../results/clientpositive/perf/query21.q.out   |   30 +-
 .../results/clientpositive/perf/query22.q.out   |   46 +-
 .../results/clientpositive/perf/query23.q.out   |  657 ++
 .../results/clientpositive/perf/query27.q.out   |  198 +-
 .../results/clientpositive/perf/query28.q.out   |   26 +-
 .../results/clientpositive/perf/query30.q.out   |  308 +
 .../results/clientpositive/perf/query32.q.out   |    6 +-
 .../results/clientpositive/perf/query33.q.out   |  435 +
 .../results/clientpositive/perf/query36.q.out   |  149 +
 .../results/clientpositive/perf/query37.q.out   |  103 +
 .../results/clientpositive/perf/query38.q.out   |  232 +
 .../results/clientpositive/perf/query40.q.out   |   56 +-
 .../results/clientpositive/perf/query45.q.out   |  120 +-
 .../results/clientpositive/perf/query48.q.out   |    6 +-
 .../results/clientpositive/perf/query5.q.out    |  489 +
 .../results/clientpositive/perf/query56.q.out   |  421 +
 .../results/clientpositive/perf/query6.q.out    |  332 +
 .../results/clientpositive/perf/query60.q.out   |  441 +
 .../results/clientpositive/perf/query67.q.out   |   28 +-
 .../results/clientpositive/perf/query69.q.out   |  495 +
 .../results/clientpositive/perf/query70.q.out   |  222 +-
 .../results/clientpositive/perf/query72.q.out   |   60 +-
 .../results/clientpositive/perf/query8.q.out    |  360 +
 .../results/clientpositive/perf/query80.q.out   |  202 +-
 .../results/clientpositive/perf/query81.q.out   |  308 +
 .../results/clientpositive/perf/query82.q.out   |   34 +-
 .../results/clientpositive/perf/query83.q.out   |  438 +
 .../results/clientpositive/perf/query86.q.out   |  126 +
 .../results/clientpositive/perf/query87.q.out   |  414 +-
 .../results/clientpositive/perf/query88.q.out   |   82 +-
 .../results/clientpositive/perf/query90.q.out   |   22 +-
 .../results/clientpositive/perf/query92.q.out   |    6 +-
 .../results/clientpositive/perf/query96.q.out   |    6 +-
 .../results/clientpositive/perf/query97.q.out   |    6 +-
 .../results/clientpositive/perf/query98.q.out   |   16 +-
 .../test/results/clientpositive/plan_json.q.out |   10 +-
 .../results/clientpositive/pointlookup2.q.out   |   36 +
 .../results/clientpositive/pointlookup3.q.out   |   27 +
 .../results/clientpositive/pointlookup4.q.out   |    8 +
 .../clientpositive/ppd_constant_where.q.out     |    8 +-
 .../clientpositive/ppd_field_garbage.q.out      |   15 +-
 .../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 +-
 .../clientpositive/ppd_join_filter.q.out        |   28 +
 .../clientpositive/ppd_multi_insert.q.out       |    8 +-
 .../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_repeated_alias.q.out     |   24 +-
 .../results/clientpositive/ppd_transform.q.out  |   16 +-
 ql/src/test/results/clientpositive/ppd_vc.q.out |   29 +-
 .../results/clientpositive/ppd_windowing1.q.out |   42 +-
 .../results/clientpositive/ppd_windowing2.q.out |   46 +-
 .../clientpositive/ppr_allchildsarenull.q.out   |   12 +
 .../results/clientpositive/print_header.q.out   |    2 +-
 ql/src/test/results/clientpositive/ptf.q.out    |  286 +-
 .../results/clientpositive/ptf_decimal.q.out    |   36 +-
 .../clientpositive/ptf_general_queries.q.out    |   22 +-
 .../results/clientpositive/ptf_matchpath.q.out  |   22 +-
 .../results/clientpositive/ptf_rcfile.q.out     |   10 +-
 .../clientpositive/ptf_register_tblfn.q.out     |   10 +-
 .../results/clientpositive/ptf_seqfile.q.out    |   10 +-
 .../results/clientpositive/ptf_streaming.q.out  |   20 +-
 .../results/clientpositive/ptfgroupbyjoin.q.out |    6 -
 .../test/results/clientpositive/push_or.q.out   |    4 +
 .../clientpositive/query_with_semi.q.out        |    4 +-
 .../results/clientpositive/quotedid_alter.q.out |    6 +-
 .../results/clientpositive/quotedid_basic.q.out |   26 +-
 .../results/clientpositive/quotedid_skew.q.out  |   10 +-
 .../clientpositive/rand_partitionpruner1.q.out  |    8 +-
 .../clientpositive/rand_partitionpruner2.q.out  |   20 +-
 .../clientpositive/rand_partitionpruner3.q.out  |   18 +-
 .../results/clientpositive/recursive_dir.q.out  |    8 +-
 .../reduce_deduplicate_extended2.q.out          |   36 +-
 .../results/clientpositive/regexp_extract.q.out |    4 +
 .../clientpositive/remove_exprs_stats.q.out     |   96 +-
 .../results/clientpositive/rename_column.q.out  |    6 +-
 .../rename_partition_location.q.out             |   10 +-
 .../clientpositive/rename_table_location.q.out  |   15 +-
 ql/src/test/results/clientpositive/repair.q.out |    8 +
 .../results/clientpositive/repl_1_drop.q.out    |   56 +-
 .../clientpositive/repl_2_exim_basic.q.out      |   32 +-
 .../clientpositive/repl_3_exim_metadata.q.out   |    6 +-
 .../clientpositive/router_join_ppr.q.out        |   36 +-
 .../test/results/clientpositive/row__id.q.out   |  156 +
 .../runtime_skewjoin_mapjoin_spark.q.out        |    8 +-
 .../test/results/clientpositive/sample1.q.out   |   16 +-
 .../test/results/clientpositive/sample2.q.out   |  924 +-
 .../test/results/clientpositive/sample3.q.out   |   10 +-
 .../test/results/clientpositive/sample4.q.out   |  924 +-
 .../test/results/clientpositive/sample5.q.out   |   28 +-
 .../test/results/clientpositive/sample6.q.out   |  466 +-
 .../test/results/clientpositive/sample7.q.out   |  356 +-
 .../test/results/clientpositive/sample8.q.out   |   18 +-
 .../test/results/clientpositive/sample9.q.out   |  908 +-
 .../sample_islocalmode_hook.q.out               |   25 +-
 .../sample_islocalmode_hook_use_metadata.q.out  |   20 +-
 .../schema_evol_orc_acid_mapwork_part.q.out     |  122 -
 .../schema_evol_orc_acid_mapwork_table.q.out    |  122 -
 .../schema_evol_orc_acidvec_mapwork_part.q.out  |  122 -
 .../schema_evol_orc_acidvec_mapwork_table.q.out |  122 -
 .../schema_evol_orc_nonvec_fetchwork_part.q.out |  104 -
 ...schema_evol_orc_nonvec_fetchwork_table.q.out |  104 -
 .../schema_evol_orc_nonvec_mapwork_part.q.out   |  104 -
 ...ol_orc_nonvec_mapwork_part_all_complex.q.out |    2 -
 ..._orc_nonvec_mapwork_part_all_primitive.q.out |   90 -
 .../schema_evol_orc_nonvec_mapwork_table.q.out  |  104 -
 .../schema_evol_orc_vec_mapwork_part.q.out      |  104 -
 ..._evol_orc_vec_mapwork_part_all_complex.q.out |    2 -
 ...vol_orc_vec_mapwork_part_all_primitive.q.out |   90 -
 .../schema_evol_orc_vec_mapwork_table.q.out     |  104 -
 .../clientpositive/schema_evol_stats.q.out      |    8 -
 .../schema_evol_text_nonvec_mapwork_part.q.out  |  104 -
 ...l_text_nonvec_mapwork_part_all_complex.q.out |    2 -
 ...text_nonvec_mapwork_part_all_primitive.q.out |   90 -
 .../schema_evol_text_nonvec_mapwork_table.q.out |  104 -
 .../schema_evol_text_vec_mapwork_part.q.out     |  104 -
 ...evol_text_vec_mapwork_part_all_complex.q.out |    2 -
 ...ol_text_vec_mapwork_part_all_primitive.q.out |   90 -
 .../schema_evol_text_vec_mapwork_table.q.out    |  104 -
 .../schema_evol_text_vecrow_mapwork_part.q.out  |  104 -
 ...l_text_vecrow_mapwork_part_all_complex.q.out |    2 -
 ...text_vecrow_mapwork_part_all_primitive.q.out |   90 -
 .../schema_evol_text_vecrow_mapwork_table.q.out |  104 -
 .../clientpositive/script_env_var1.q.out        |    8 +-
 .../clientpositive/script_env_var2.q.out        |    6 +-
 .../results/clientpositive/script_pipe.q.out    |   12 +-
 .../results/clientpositive/scriptfile1.q.out    |   16 +-
 .../clientpositive/select_dummy_source.q.out    |   18 +-
 .../clientpositive/select_same_col.q.out        |    8 +-
 .../results/clientpositive/selectindate.q.out   |    8 -
 .../test/results/clientpositive/semicolon.q.out |   10 +-
 .../test/results/clientpositive/semijoin4.q.out |  140 +-
 .../test/results/clientpositive/semijoin5.q.out |  261 +-
 .../results/clientpositive/serde_opencsv.q.out  |    8 +-
 .../clientpositive/serde_user_properties.q.out  |   14 +-
 .../clientpositive/setop_no_distinct.q.out      |    8 -
 .../results/clientpositive/setop_subq.q.out     |  569 ++
 .../results/clientpositive/show_columns.q.out   |   18 +-
 .../show_create_table_alter.q.out               |   32 +-
 .../show_create_table_db_table.q.out            |  113 +-
 .../show_create_table_delimited.q.out           |    8 +-
 .../show_create_table_partitioned.q.out         |    8 +-
 .../show_create_table_serde.q.out               |   26 +-
 .../clientpositive/show_create_table_view.q.out |   10 +-
 .../results/clientpositive/show_functions.q.out |    6 +
 .../clientpositive/show_partitions.q.out        |   18 +-
 .../results/clientpositive/show_tables.q.out    |   24 +-
 .../clientpositive/show_tblproperties.q.out     |   23 +-
 .../results/clientpositive/show_views.q.out     |   28 +-
 .../test/results/clientpositive/skewjoin.q.out  |    8 +-
 .../clientpositive/skewjoin_mapjoin1.q.out      |   30 +-
 .../clientpositive/skewjoin_mapjoin10.q.out     |   42 +-
 .../clientpositive/skewjoin_mapjoin11.q.out     |   18 +-
 .../clientpositive/skewjoin_mapjoin2.q.out      |   26 +-
 .../clientpositive/skewjoin_mapjoin3.q.out      |   18 +-
 .../clientpositive/skewjoin_mapjoin4.q.out      |   18 +-
 .../clientpositive/skewjoin_mapjoin5.q.out      |   22 +-
 .../clientpositive/skewjoin_mapjoin6.q.out      |   14 +-
 .../clientpositive/skewjoin_mapjoin7.q.out      |   18 +-
 .../clientpositive/skewjoin_mapjoin8.q.out      |   22 +-
 .../clientpositive/skewjoin_mapjoin9.q.out      |   24 +-
 .../clientpositive/skewjoin_onesideskew.q.out   |   10 -
 .../skewjoin_union_remove_1.q.out               |   36 +-
 .../skewjoin_union_remove_2.q.out               |   20 +-
 .../results/clientpositive/skewjoinopt1.q.out   |   26 +-
 .../results/clientpositive/skewjoinopt10.q.out  |   10 +-
 .../results/clientpositive/skewjoinopt11.q.out  |   14 +-
 .../results/clientpositive/skewjoinopt12.q.out  |   12 +-
 .../results/clientpositive/skewjoinopt13.q.out  |   18 +-
 .../results/clientpositive/skewjoinopt14.q.out  |   20 +-
 .../results/clientpositive/skewjoinopt16.q.out  |   12 +-
 .../results/clientpositive/skewjoinopt17.q.out  |   28 +-
 .../results/clientpositive/skewjoinopt18.q.out  |   30 +-
 .../results/clientpositive/skewjoinopt19.q.out  |   14 +-
 .../results/clientpositive/skewjoinopt2.q.out   |   40 +-
 .../results/clientpositive/skewjoinopt20.q.out  |   14 +-
 .../results/clientpositive/skewjoinopt21.q.out  |   10 +-
 .../results/clientpositive/skewjoinopt3.q.out   |   22 +-
 .../results/clientpositive/skewjoinopt4.q.out   |   18 +-
 .../results/clientpositive/skewjoinopt5.q.out   |   12 +-
 .../results/clientpositive/skewjoinopt6.q.out   |   14 +-
 .../results/clientpositive/skewjoinopt7.q.out   |   14 +-
 .../results/clientpositive/skewjoinopt8.q.out   |   14 +-
 .../results/clientpositive/skewjoinopt9.q.out   |   18 +-
 .../results/clientpositive/skiphf_aggr.q.out    |   12 -
 .../clientpositive/smb_join_partition_key.q.out |    4 -
 .../results/clientpositive/smb_mapjoin9.q.out   |    6 +-
 .../results/clientpositive/smb_mapjoin_1.q.out  |    8 +-
 .../results/clientpositive/smb_mapjoin_10.q.out |    8 +-
 .../results/clientpositive/smb_mapjoin_11.q.out |   36 +-
 .../results/clientpositive/smb_mapjoin_12.q.out |   42 +-
 .../results/clientpositive/smb_mapjoin_13.q.out |   30 +-
 .../results/clientpositive/smb_mapjoin_16.q.out |   12 +-
 .../results/clientpositive/smb_mapjoin_2.q.out  |    8 +-
 .../results/clientpositive/smb_mapjoin_20.q.out |   30 +-
 .../results/clientpositive/smb_mapjoin_21.q.out |   54 +-
 .../results/clientpositive/smb_mapjoin_22.q.out |   22 +-
 .../results/clientpositive/smb_mapjoin_25.q.out |   14 +-
 .../results/clientpositive/smb_mapjoin_3.q.out  |   12 +-
 .../results/clientpositive/smb_mapjoin_46.q.out | 1657 +++
 ql/src/test/results/clientpositive/sort.q.out   |    8 +-
 .../clientpositive/sort_merge_join_desc_1.q.out |   10 +-
 .../clientpositive/sort_merge_join_desc_2.q.out |   12 +-
 .../clientpositive/sort_merge_join_desc_3.q.out |   12 +-
 .../clientpositive/sort_merge_join_desc_4.q.out |   10 +-
 .../clientpositive/sort_merge_join_desc_5.q.out |   10 +-
 .../clientpositive/sort_merge_join_desc_6.q.out |   12 +-
 .../clientpositive/sort_merge_join_desc_7.q.out |   16 +-
 .../clientpositive/sort_merge_join_desc_8.q.out |   16 +-
 .../spark/add_part_multiple.q.out               |    8 +-
 .../spark/annotate_stats_join.q.out             |   98 +-
 .../clientpositive/spark/auto_join0.q.out       |    8 +-
 .../clientpositive/spark/auto_join1.q.out       |    8 +-
 .../clientpositive/spark/auto_join14.q.out      |    8 +-
 .../clientpositive/spark/auto_join21.q.out      |    8 +-
 .../clientpositive/spark/auto_join23.q.out      |    8 +-
 .../clientpositive/spark/auto_join26.q.out      |    8 +-
 .../clientpositive/spark/auto_join29.q.out      |    8 +-
 .../spark/auto_join_reordering_values.q.out     |   18 +-
 .../clientpositive/spark/auto_join_stats.q.out  |   10 +-
 .../clientpositive/spark/auto_join_stats2.q.out |   10 +-
 .../spark/auto_join_without_localtask.q.out     |    6 +-
 .../spark/auto_smb_mapjoin_14.q.out             |  218 +-
 .../spark/auto_sortmerge_join_1.q.out           |   28 +-
 .../spark/auto_sortmerge_join_10.q.out          |   12 +-
 .../spark/auto_sortmerge_join_12.q.out          |   18 +-
 .../spark/auto_sortmerge_join_13.q.out          |  102 +-
 .../spark/auto_sortmerge_join_14.q.out          |   12 +-
 .../spark/auto_sortmerge_join_16.q.out          |    8 +-
 .../spark/auto_sortmerge_join_3.q.out           |   22 +-
 .../spark/auto_sortmerge_join_4.q.out           |   22 +-
 .../spark/auto_sortmerge_join_5.q.out           |   26 +-
 .../spark/auto_sortmerge_join_6.q.out           |   80 +-
 .../spark/auto_sortmerge_join_7.q.out           |   28 +-
 .../spark/auto_sortmerge_join_8.q.out           |   34 +-
 .../spark/auto_sortmerge_join_9.q.out           |  200 +-
 .../spark/avro_compression_enabled_native.q.out |    8 +-
 .../clientpositive/spark/avro_joins.q.out       |   12 +-
 .../spark/avro_joins_native.q.out               |   12 +-
 .../results/clientpositive/spark/bucket2.q.out  |   12 +-
 .../results/clientpositive/spark/bucket3.q.out  |   12 +-
 .../results/clientpositive/spark/bucket4.q.out  |    4 +
 .../results/clientpositive/spark/bucket5.q.out  |   30 +-
 .../spark/bucket_map_join_1.q.out               |   16 +-
 .../spark/bucket_map_join_2.q.out               |   16 +-
 .../spark/bucket_map_join_spark1.q.out          |   12 +
 .../spark/bucket_map_join_spark2.q.out          |   12 +
 .../spark/bucket_map_join_spark3.q.out          |   12 +
 .../spark/bucket_map_join_spark4.q.out          |   20 +-
 .../spark/bucket_map_join_tez1.q.out            |   26 +-
 .../spark/bucketizedhiveinputformat.q.out       |   24 +-
 .../clientpositive/spark/bucketmapjoin1.q.out   |   18 +-
 .../clientpositive/spark/bucketmapjoin10.q.out  |   16 +-
 .../clientpositive/spark/bucketmapjoin11.q.out  |   26 +-
 .../clientpositive/spark/bucketmapjoin12.q.out  |   24 +-
 .../clientpositive/spark/bucketmapjoin13.q.out  |   70 +-
 .../clientpositive/spark/bucketmapjoin2.q.out   |   26 +-
 .../clientpositive/spark/bucketmapjoin3.q.out   |   12 +
 .../clientpositive/spark/bucketmapjoin4.q.out   |   12 +
 .../clientpositive/spark/bucketmapjoin5.q.out   |   16 +
 .../clientpositive/spark/bucketmapjoin6.q.out   |    8 +-
 .../clientpositive/spark/bucketmapjoin7.q.out   |   12 +-
 .../clientpositive/spark/bucketmapjoin8.q.out   |   24 +-
 .../clientpositive/spark/bucketmapjoin9.q.out   |   24 +-
 .../spark/bucketmapjoin_negative.q.out          |    6 +
 .../spark/bucketmapjoin_negative2.q.out         |    8 +
 .../spark/bucketmapjoin_negative3.q.out         |   48 +-
 .../spark/bucketsortoptimize_insert_2.q.out     |   48 +-
 .../spark/bucketsortoptimize_insert_4.q.out     |   22 +-
 .../spark/bucketsortoptimize_insert_6.q.out     |   62 +-
 .../spark/bucketsortoptimize_insert_7.q.out     |   26 +-
 .../spark/bucketsortoptimize_insert_8.q.out     |   22 +-
 .../results/clientpositive/spark/cbo_gby.q.out  |   10 +-
 .../clientpositive/spark/cbo_gby_empty.q.out    |    6 +-
 .../clientpositive/spark/cbo_limit.q.out        |    6 +-
 .../clientpositive/spark/cbo_semijoin.q.out     |    6 +-
 .../spark/cbo_simple_select.q.out               |   36 +-
 .../clientpositive/spark/cbo_stats.q.out        |    6 +-
 .../clientpositive/spark/cbo_subq_in.q.out      |   48 +-
 .../clientpositive/spark/cbo_subq_not_in.q.out  |   82 +-
 .../clientpositive/spark/cbo_udf_udaf.q.out     |   10 +-
 .../clientpositive/spark/cbo_union.q.out        |   10 +-
 .../spark/column_access_stats.q.out             |   32 +-
 .../spark/constprog_partitioner.q.out           |   96 +-
 .../spark/constprog_semijoin.q.out              |    6 -
 .../results/clientpositive/spark/count.q.out    |   30 +-
 .../clientpositive/spark/cross_join.q.out       |   18 +-
 .../spark/cross_product_check_1.q.out           |    8 +-
 .../spark/cross_product_check_2.q.out           |    8 +-
 .../results/clientpositive/spark/ctas.q.out     |   10 +-
 .../spark/custom_input_output_format.q.out      |    8 +-
 .../clientpositive/spark/date_join1.q.out       |   14 +-
 .../results/clientpositive/spark/date_udf.q.out |   58 +-
 .../clientpositive/spark/decimal_join.q.out     |   10 +-
 .../spark/disable_merge_for_bucketing.q.out     |    4 +
 .../spark/dynamic_rdd_cache.q.out               |   24 +-
 .../spark/escape_clusterby1.q.out               |    6 +-
 .../spark/escape_distributeby1.q.out            |    6 +-
 .../clientpositive/spark/escape_orderby1.q.out  |    6 +-
 .../clientpositive/spark/escape_sortby1.q.out   |    6 +-
 .../spark/filter_join_breaktask.q.out           |   14 +-
 .../spark/filter_join_breaktask2.q.out          |    8 +-
 .../results/clientpositive/spark/groupby1.q.out |    8 +-
 .../clientpositive/spark/groupby10.q.out        |   16 +-
 .../clientpositive/spark/groupby11.q.out        |    8 +-
 .../clientpositive/spark/groupby1_map.q.out     |    8 +-
 .../spark/groupby1_map_nomap.q.out              |    8 +-
 .../spark/groupby1_map_skew.q.out               |    8 +-
 .../clientpositive/spark/groupby1_noskew.q.out  |    8 +-
 .../results/clientpositive/spark/groupby2.q.out |    8 +-
 .../clientpositive/spark/groupby2_map.q.out     |    8 +-
 .../spark/groupby2_map_multi_distinct.q.out     |   16 +-
 .../clientpositive/spark/groupby2_noskew.q.out  |    8 +-
 .../spark/groupby2_noskew_multi_distinct.q.out  |    8 +-
 .../results/clientpositive/spark/groupby4.q.out |    8 +-
 .../clientpositive/spark/groupby4_noskew.q.out  |    8 +-
 .../results/clientpositive/spark/groupby5.q.out |    8 +-
 .../clientpositive/spark/groupby5_noskew.q.out  |    8 +-
 .../results/clientpositive/spark/groupby6.q.out |    8 +-
 .../clientpositive/spark/groupby6_map.q.out     |    8 +-
 .../spark/groupby6_map_skew.q.out               |    8 +-
 .../clientpositive/spark/groupby6_noskew.q.out  |    8 +-
 .../results/clientpositive/spark/groupby7.q.out |    8 +-
 .../clientpositive/spark/groupby7_map.q.out     |    8 +-
 .../groupby7_map_multi_single_reducer.q.out     |    8 +-
 .../spark/groupby7_map_skew.q.out               |    8 +-
 .../clientpositive/spark/groupby7_noskew.q.out  |    8 +-
 .../groupby7_noskew_multi_single_reducer.q.out  |    8 +-
 .../results/clientpositive/spark/groupby8.q.out |    8 +-
 .../clientpositive/spark/groupby8_map.q.out     |    8 +-
 .../spark/groupby8_map_skew.q.out               |    8 +-
 .../clientpositive/spark/groupby8_noskew.q.out  |    8 +-
 .../results/clientpositive/spark/groupby9.q.out |    8 +-
 .../spark/groupby_complex_types.q.out           |    8 +-
 ...pby_complex_types_multi_single_reducer.q.out |    8 +-
 .../clientpositive/spark/groupby_cube1.q.out    |   82 +-
 .../spark/groupby_grouping_id2.q.out            |    8 +-
 .../clientpositive/spark/groupby_map_ppr.q.out  |   14 +-
 .../spark/groupby_map_ppr_multi_distinct.q.out  |   14 +-
 .../groupby_multi_insert_common_distinct.q.out  |    8 +-
 .../spark/groupby_multi_single_reducer.q.out    |    8 +-
 .../spark/groupby_multi_single_reducer2.q.out   |    8 +-
 .../spark/groupby_multi_single_reducer3.q.out   |   12 +-
 .../clientpositive/spark/groupby_position.q.out |   16 +-
 .../clientpositive/spark/groupby_ppr.q.out      |   14 +-
 .../spark/groupby_ppr_multi_distinct.q.out      |   20 +-
 .../spark/groupby_resolution.q.out              |   30 +-
 .../clientpositive/spark/groupby_rollup1.q.out  |   64 +-
 .../spark/groupby_sort_1_23.q.out               |  222 +-
 .../spark/groupby_sort_skew_1_23.q.out          |  222 +-
 .../results/clientpositive/spark/having.q.out   |    6 +-
 .../spark/index_auto_self_join.q.out            |   10 +-
 .../clientpositive/spark/index_bitmap3.q.out    |    8 +-
 .../spark/index_bitmap_auto.q.out               |   24 +-
 .../infer_bucket_sort_bucketed_table.q.out      |   24 +-
 .../spark/infer_bucket_sort_map_operators.q.out |   36 +-
 .../spark/infer_bucket_sort_merge.q.out         |   24 +-
 .../spark/infer_bucket_sort_num_buckets.q.out   |   30 +-
 .../infer_bucket_sort_reducers_power_two.q.out  |   50 +-
 .../clientpositive/spark/innerjoin.q.out        |   16 +-
 .../results/clientpositive/spark/input12.q.out  |    8 +-
 .../results/clientpositive/spark/input14.q.out  |    8 +-
 .../clientpositive/spark/input16_cc.q.out       |   10 +-
 .../results/clientpositive/spark/input17.q.out  |    8 +-
 .../results/clientpositive/spark/input18.q.out  |    8 +-
 .../clientpositive/spark/input1_limit.q.out     |    8 +-
 .../clientpositive/spark/input_part2.q.out      |   16 +-
 .../clientpositive/spark/insert_into1.q.out     |   10 +-
 .../clientpositive/spark/insert_into2.q.out     |    2 -
 .../results/clientpositive/spark/join0.q.out    |    8 +-
 .../results/clientpositive/spark/join1.q.out    |    8 +-
 .../results/clientpositive/spark/join10.q.out   |    8 +-
 .../results/clientpositive/spark/join11.q.out   |    8 +-
 .../results/clientpositive/spark/join12.q.out   |    8 +-
 .../results/clientpositive/spark/join13.q.out   |    8 +-
 .../results/clientpositive/spark/join14.q.out   |   10 +-
 .../results/clientpositive/spark/join15.q.out   |    8 +-
 .../results/clientpositive/spark/join17.q.out   |   14 +-
 .../results/clientpositive/spark/join18.q.out   |    8 +-
 .../spark/join18_multi_distinct.q.out           |    8 +-
 .../results/clientpositive/spark/join19.q.out   |    8 +-
 .../results/clientpositive/spark/join2.q.out    |    8 +-
 .../results/clientpositive/spark/join20.q.out   |    8 +-
 .../results/clientpositive/spark/join21.q.out   |    8 +-
 .../results/clientpositive/spark/join23.q.out   |    8 +-
 .../results/clientpositive/spark/join25.q.out   |    8 +-
 .../results/clientpositive/spark/join26.q.out   |   16 +-
 .../results/clientpositive/spark/join27.q.out   |    8 +-
 .../results/clientpositive/spark/join28.q.out   |   16 +-
 .../results/clientpositive/spark/join29.q.out   |   16 +-
 .../results/clientpositive/spark/join3.q.out    |    8 +-
 .../results/clientpositive/spark/join30.q.out   |    8 +-
 .../results/clientpositive/spark/join31.q.out   |   96 +-
 .../results/clientpositive/spark/join32.q.out   |   24 +-
 .../clientpositive/spark/join32_lessSize.q.out  |   50 +-
 .../results/clientpositive/spark/join33.q.out   |   24 +-
 .../results/clientpositive/spark/join34.q.out   |   24 +-
 .../results/clientpositive/spark/join35.q.out   |   24 +-
 .../results/clientpositive/spark/join36.q.out   |    8 +-
 .../results/clientpositive/spark/join37.q.out   |    8 +-
 .../results/clientpositive/spark/join39.q.out   |    8 +-
 .../results/clientpositive/spark/join4.q.out    |    8 +-
 .../results/clientpositive/spark/join41.q.out   |    6 +-
 .../results/clientpositive/spark/join5.q.out    |    8 +-
 .../results/clientpositive/spark/join6.q.out    |    8 +-
 .../results/clientpositive/spark/join7.q.out    |    8 +-
 .../results/clientpositive/spark/join8.q.out    |    8 +-
 .../results/clientpositive/spark/join9.q.out    |   14 +-
 .../clientpositive/spark/join_1to1.q.out        |    8 +-
 .../clientpositive/spark/join_array.q.out       |    8 +-
 .../spark/join_casesensitive.q.out              |    8 +-
 .../spark/join_filters_overlap.q.out            |   74 +-
 .../clientpositive/spark/join_literals.q.out    |    8 +-
 .../clientpositive/spark/join_map_ppr.q.out     |   24 +-
 .../spark/join_merge_multi_expressions.q.out    |    6 +-
 .../clientpositive/spark/join_nullsafe.q.out    |   44 +-
 .../results/clientpositive/spark/join_rc.q.out  |    8 +-
 .../clientpositive/spark/join_reorder.q.out     |    8 +-
 .../clientpositive/spark/join_thrift.q.out      |    8 +-
 .../results/clientpositive/spark/join_vc.q.out  |   12 +-
 .../clientpositive/spark/join_view.q.out        |   11 +-
 .../spark/lateral_view_explode2.q.out           |    2 +-
 .../clientpositive/spark/leftsemijoin.q.out     |    8 +-
 .../clientpositive/spark/leftsemijoin_mr.q.out  |    8 +-
 .../spark/limit_partition_metadataonly.q.out    |    8 +-
 .../clientpositive/spark/limit_pushdown.q.out   |   66 +-
 .../clientpositive/spark/limit_pushdown2.q.out  | 1137 +++
 .../spark/list_bucket_dml_10.q.out              |   48 +-
 .../spark/list_bucket_dml_2.q.out               |   74 +-
 .../clientpositive/spark/load_dyn_part1.q.out   |    8 +-
 .../clientpositive/spark/load_dyn_part10.q.out  |    8 +-
 .../clientpositive/spark/load_dyn_part14.q.out  |   14 +-
 .../clientpositive/spark/load_dyn_part2.q.out   |    8 +-
 .../clientpositive/spark/load_dyn_part3.q.out   |    8 +-
 .../clientpositive/spark/load_dyn_part4.q.out   |    8 +-
 .../clientpositive/spark/load_dyn_part8.q.out   |   20 +-
 .../clientpositive/spark/load_dyn_part9.q.out   |    8 +-
 .../results/clientpositive/spark/load_fs2.q.out |   10 +-
 .../clientpositive/spark/louter_join_ppr.q.out  |   36 +-
 .../results/clientpositive/spark/mapjoin1.q.out |   18 +-
 .../clientpositive/spark/mapjoin_decimal.q.out  |    8 +-
 .../spark/mapjoin_filter_on_outerjoin.q.out     |   12 +-
 .../clientpositive/spark/mapjoin_mapjoin.q.out  |   24 +-
 .../clientpositive/spark/mapjoin_memcheck.q.out |    8 +-
 .../clientpositive/spark/mapjoin_subquery.q.out |   10 +-
 .../spark/mapjoin_subquery2.q.out               |    8 +-
 .../spark/mapjoin_test_outer.q.out              |   12 +-
 .../results/clientpositive/spark/merge1.q.out   |    8 +-
 .../results/clientpositive/spark/merge2.q.out   |    8 +-
 .../clientpositive/spark/mergejoins.q.out       |    6 +-
 .../clientpositive/spark/mergejoins_mixed.q.out |   32 +-
 .../clientpositive/spark/multi_insert.q.out     |    8 +-
 .../clientpositive/spark/multi_insert_gby.q.out |   10 +-
 .../spark/multi_insert_gby2.q.out               |    6 +-
 .../spark/multi_insert_gby3.q.out               |    6 +-
 .../spark/multi_insert_lateral_view.q.out       |   74 +-
 .../spark/multi_insert_mixed.q.out              |   10 +-
 ...i_insert_move_tasks_share_dependencies.q.out |    8 +-
 .../spark/multi_insert_with_join.q.out          |    4 -
 .../spark/multi_insert_with_join2.q.out         | 1006 ++
 .../clientpositive/spark/multi_join_union.q.out |    8 +-
 .../spark/optimize_nullscan.q.out               |   54 +-
 .../clientpositive/spark/orc_merge1.q.out       |   32 +-
 .../clientpositive/spark/orc_merge5.q.out       |   38 +-
 .../clientpositive/spark/orc_merge6.q.out       |   40 +-
 .../clientpositive/spark/orc_merge7.q.out       |   42 +-
 .../clientpositive/spark/orc_merge9.q.out       |    8 +-
 .../spark/orc_merge_diff_fs.q.out               |   32 +-
 .../spark/orc_merge_incompat1.q.out             |   26 +-
 .../spark/orc_merge_incompat2.q.out             |   12 +-
 .../clientpositive/spark/outer_join_ppr.q.out   |   24 +-
 .../results/clientpositive/spark/parallel.q.out |    8 +-
 .../clientpositive/spark/parallel_join0.q.out   |    8 +-
 .../clientpositive/spark/parallel_join1.q.out   |    8 +-
 .../clientpositive/spark/parallel_orderby.q.out |    8 +-
 .../clientpositive/spark/parquet_join.q.out     |   38 +-
 .../test/results/clientpositive/spark/pcr.q.out |  124 +-
 .../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_join_filter.q.out  |   16 +
 .../clientpositive/spark/ppd_multi_insert.q.out |    8 +-
 .../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_transform.q.out    |   16 +-
 .../test/results/clientpositive/spark/ptf.q.out |  429 +-
 .../clientpositive/spark/ptf_decimal.q.out      |   36 +-
 .../spark/ptf_general_queries.q.out             |   22 +-
 .../clientpositive/spark/ptf_matchpath.q.out    |   22 +-
 .../clientpositive/spark/ptf_rcfile.q.out       |   10 +-
 .../spark/ptf_register_tblfn.q.out              |   10 +-
 .../clientpositive/spark/ptf_seqfile.q.out      |   10 +-
 .../clientpositive/spark/ptf_streaming.q.out    |   96 +-
 .../spark/reduce_deduplicate.q.out              |    6 +
 .../clientpositive/spark/router_join_ppr.q.out  |   36 +-
 .../spark/runtime_skewjoin_mapjoin_spark.q.out  |    8 +-
 .../results/clientpositive/spark/sample1.q.out  |   10 +-
 .../results/clientpositive/spark/sample10.q.out |   16 +-
 .../results/clientpositive/spark/sample2.q.out  |  914 +-
 .../results/clientpositive/spark/sample3.q.out  |   10 +-
 .../results/clientpositive/spark/sample4.q.out  |  914 +-
 .../results/clientpositive/spark/sample5.q.out  |   22 +-
 .../results/clientpositive/spark/sample6.q.out  |  462 +-
 .../results/clientpositive/spark/sample7.q.out  |  354 +-
 .../results/clientpositive/spark/sample8.q.out  |   20 +-
 .../results/clientpositive/spark/sample9.q.out  |  902 +-
 .../clientpositive/spark/script_env_var1.q.out  |    8 +-
 .../clientpositive/spark/script_env_var2.q.out  |    6 +-
 .../clientpositive/spark/script_pipe.q.out      |   12 +-
 .../clientpositive/spark/scriptfile1.q.out      |   16 +-
 .../results/clientpositive/spark/semijoin.q.out |    8 +-
 .../results/clientpositive/spark/skewjoin.q.out |    8 +-
 .../spark/skewjoin_union_remove_1.q.out         |   36 +-
 .../spark/skewjoin_union_remove_2.q.out         |   20 +-
 .../clientpositive/spark/skewjoinopt1.q.out     |   26 +-
 .../clientpositive/spark/skewjoinopt10.q.out    |   10 +-
 .../clientpositive/spark/skewjoinopt11.q.out    |   14 +-
 .../clientpositive/spark/skewjoinopt12.q.out    |   12 +-
 .../clientpositive/spark/skewjoinopt13.q.out    |   18 +-
 .../clientpositive/spark/skewjoinopt14.q.out    |   20 +-
 .../clientpositive/spark/skewjoinopt15.q.out    |   38 +-
 .../clientpositive/spark/skewjoinopt16.q.out    |   12 +-
 .../clientpositive/spark/skewjoinopt17.q.out    |   28 +-
 .../clientpositive/spark/skewjoinopt18.q.out    |   30 +-
 .../clientpositive/spark/skewjoinopt19.q.out    |   14 +-
 .../clientpositive/spark/skewjoinopt2.q.out     |   40 +-
 .../clientpositive/spark/skewjoinopt20.q.out    |   14 +-
 .../clientpositive/spark/skewjoinopt3.q.out     |   22 +-
 .../clientpositive/spark/skewjoinopt4.q.out     |   18 +-
 .../clientpositive/spark/skewjoinopt5.q.out     |   12 +-
 .../clientpositive/spark/skewjoinopt6.q.out     |   14 +-
 .../clientpositive/spark/skewjoinopt7.q.out     |   14 +-
 .../clientpositive/spark/skewjoinopt8.q.out     |   14 +-
 .../clientpositive/spark/skewjoinopt9.q.out     |   18 +-
 .../clientpositive/spark/smb_mapjoin_1.q.out    |    8 +-
 .../clientpositive/spark/smb_mapjoin_10.q.out   |    8 +-
 .../clientpositive/spark/smb_mapjoin_11.q.out   |   36 +-
 .../clientpositive/spark/smb_mapjoin_12.q.out   |   42 +-
 .../clientpositive/spark/smb_mapjoin_13.q.out   |   32 +-
 .../clientpositive/spark/smb_mapjoin_14.q.out   |   94 +-
 .../clientpositive/spark/smb_mapjoin_15.q.out   |   56 +-
 .../clientpositive/spark/smb_mapjoin_16.q.out   |   12 +-
 .../clientpositive/spark/smb_mapjoin_17.q.out   |   26 +-
 .../clientpositive/spark/smb_mapjoin_18.q.out   |   24 +-
 .../clientpositive/spark/smb_mapjoin_19.q.out   |   14 +-
 .../clientpositive/spark/smb_mapjoin_2.q.out    |    8 +-
 .../clientpositive/spark/smb_mapjoin_20.q.out   |   30 +-
 .../clientpositive/spark/smb_mapjoin_21.q.out   |   54 +-
 .../clientpositive/spark/smb_mapjoin_22.q.out   |   22 +-
 .../clientpositive/spark/smb_mapjoin_25.q.out   |   14 +-
 .../clientpositive/spark/smb_mapjoin_3.q.out    |   12 +-
 .../clientpositive/spark/smb_mapjoin_4.q.out    |    8 +-
 .../clientpositive/spark/smb_mapjoin_5.q.out    |    8 +-
 .../clientpositive/spark/smb_mapjoin_8.q.out    |    8 +-
 .../results/clientpositive/spark/sort.q.out     |    8 +-
 .../spark/spark_combine_equivalent_work.q.out   |  113 +
 .../spark/spark_dynamic_partition_pruning.q.out | 1650 ++-
 .../spark_dynamic_partition_pruning_2.q.out     |  506 +-
 ...k_vectorized_dynamic_partition_pruning.q.out | 1507 ++-
 .../results/clientpositive/spark/stats0.q.out   |    8 +
 .../results/clientpositive/spark/stats1.q.out   |   18 +-
 .../results/clientpositive/spark/stats12.q.out  |    4 +
 .../results/clientpositive/spark/stats13.q.out  |    2 +
 .../results/clientpositive/spark/stats18.q.out  |   10 +-
 .../results/clientpositive/spark/stats3.q.out   |    1 +
 .../clientpositive/spark/stats_noscan_1.q.out   |   28 +-
 .../clientpositive/spark/stats_noscan_2.q.out   |   20 +-
 .../spark/stats_partscan_1_23.q.out             |   32 +-
 .../results/clientpositive/spark/statsfs.q.out  |   42 +-
 .../clientpositive/spark/subquery_exists.q.out  |  997 +-
 .../clientpositive/spark/subquery_in.q.out      | 6133 ++++++++++-
 .../spark/subquery_multiinsert.q.out            |    8 +-
 .../spark/table_access_keys_stats.q.out         |   71 +-
 .../spark/temp_table_external.q.out             |    6 +-
 .../clientpositive/spark/temp_table_gb1.q.out   |   18 +-
 .../clientpositive/spark/temp_table_join1.q.out |   26 +-
 .../clientpositive/spark/tez_join_tests.q.out   |    8 +-
 .../spark/tez_joins_explain.q.out               |    6 +-
 .../clientpositive/spark/timestamp_udf.q.out    |   12 +-
 .../clientpositive/spark/transform2.q.out       |    6 +-
 .../clientpositive/spark/transform_ppr1.q.out   |   16 +-
 .../clientpositive/spark/transform_ppr2.q.out   |   12 +-
 .../spark/truncate_column_buckets.q.out         |   28 +-
 .../clientpositive/spark/uber_reduce.q.out      |   10 +-
 .../clientpositive/spark/udaf_collect_set.q.out |    4 +
 .../results/clientpositive/spark/udf_max.q.out  |    2 +
 .../results/clientpositive/spark/udf_min.q.out  |    2 +
 .../clientpositive/spark/udf_percentile.q.out   |   28 +-
 .../results/clientpositive/spark/union.q.out    |   10 +-
 .../results/clientpositive/spark/union10.q.out  |   12 +-
 .../results/clientpositive/spark/union11.q.out  |   10 +-
 .../results/clientpositive/spark/union12.q.out  |   12 +-
 .../results/clientpositive/spark/union13.q.out  |   10 +-
 .../results/clientpositive/spark/union14.q.out  |   26 +-
 .../results/clientpositive/spark/union15.q.out  |   10 +-
 .../results/clientpositive/spark/union16.q.out  |    6 +-
 .../results/clientpositive/spark/union17.q.out  |   16 +-
 .../results/clientpositive/spark/union18.q.out  |   18 +-
 .../results/clientpositive/spark/union19.q.out  |   22 +-
 .../results/clientpositive/spark/union2.q.out   |   10 +-
 .../results/clientpositive/spark/union20.q.out  |   10 +-
 .../results/clientpositive/spark/union21.q.out  |   10 +-
 .../results/clientpositive/spark/union22.q.out  |   25 +-
 .../results/clientpositive/spark/union24.q.out  |   32 +-
 .../results/clientpositive/spark/union26.q.out  |    8 +-
 .../results/clientpositive/spark/union27.q.out  |    6 +-
 .../results/clientpositive/spark/union3.q.out   |    8 +-
 .../results/clientpositive/spark/union31.q.out  |   20 +-
 .../results/clientpositive/spark/union32.q.out  |   44 +-
 .../results/clientpositive/spark/union33.q.out  |   12 +-
 .../results/clientpositive/spark/union34.q.out  |   26 +-
 .../results/clientpositive/spark/union4.q.out   |   14 +-
 .../results/clientpositive/spark/union5.q.out   |   10 +-
 .../results/clientpositive/spark/union6.q.out   |   12 +-
 .../results/clientpositive/spark/union7.q.out   |   24 +-
 .../results/clientpositive/spark/union8.q.out   |   10 +-
 .../results/clientpositive/spark/union9.q.out   |   10 +-
 .../clientpositive/spark/union_date.q.out       |    8 +-
 .../clientpositive/spark/union_date_trim.q.out  |    6 +-
 .../clientpositive/spark/union_null.q.out       |   26 +-
 .../clientpositive/spark/union_ppr.q.out        |   16 +-
 .../clientpositive/spark/union_remove_1.q.out   |   26 +-
 .../clientpositive/spark/union_remove_10.q.out  |   34 +-
 .../clientpositive/spark/union_remove_11.q.out  |   34 +-
 .../clientpositive/spark/union_remove_12.q.out  |   32 +-
 .../clientpositive/spark/union_remove_13.q.out  |   32 +-
 .../clientpositive/spark/union_remove_14.q.out  |   34 +-
 .../clientpositive/spark/union_remove_15.q.out  |   32 +-
 .../clientpositive/spark/union_remove_16.q.out  |   30 +-
 .../clientpositive/spark/union_remove_17.q.out  |   26 +-
 .../clientpositive/spark/union_remove_18.q.out  |   30 +-
 .../clientpositive/spark/union_remove_19.q.out  |   42 +-
 .../clientpositive/spark/union_remove_2.q.out   |   28 +-
 .../clientpositive/spark/union_remove_20.q.out  |   28 +-
 .../clientpositive/spark/union_remove_21.q.out  |   28 +-
 .../clientpositive/spark/union_remove_22.q.out  |   28 +-
 .../clientpositive/spark/union_remove_23.q.out  |   28 +-
 .../clientpositive/spark/union_remove_24.q.out  |   24 +-
 .../clientpositive/spark/union_remove_25.q.out  |   28 +-
 .../clientpositive/spark/union_remove_3.q.out   |   28 +-
 .../clientpositive/spark/union_remove_4.q.out   |   26 +-
 .../clientpositive/spark/union_remove_5.q.out   |   30 +-
 .../clientpositive/spark/union_remove_6.q.out   |   24 +-
 .../spark/union_remove_6_subq.q.out             |   34 +-
 .../clientpositive/spark/union_remove_7.q.out   |   30 +-
 .../clientpositive/spark/union_remove_8.q.out   |   32 +-
 .../clientpositive/spark/union_remove_9.q.out   |   30 +-
 .../clientpositive/spark/union_script.q.out     |    6 +-
 .../clientpositive/spark/union_top_level.q.out  |   93 +-
 .../clientpositive/spark/uniquejoin.q.out       |    8 +-
 .../clientpositive/spark/varchar_join1.q.out    |   18 +-
 .../spark/vector_between_in.q.out               |  104 +-
 .../spark/vector_cast_constant.q.out            |    6 +-
 .../spark/vector_count_distinct.q.out           |   16 +-
 .../spark/vector_data_types.q.out               |    6 +-
 .../spark/vector_decimal_aggregate.q.out        |   16 +-
 .../spark/vector_decimal_mapjoin.q.out          |    8 +-
 .../spark/vector_distinct_2.q.out               |    8 +-
 .../clientpositive/spark/vector_groupby_3.q.out |    8 +-
 .../spark/vector_inner_join.q.out               |    8 -
 .../spark/vector_mapjoin_reduce.q.out           |  407 +-
 .../spark/vector_outer_join0.q.out              |   20 +-
 .../spark/vector_outer_join1.q.out              |   30 +-
 .../spark/vector_outer_join2.q.out              |   14 +-
 .../spark/vector_outer_join3.q.out              |   30 +-
 .../spark/vector_outer_join4.q.out              |   30 +-
 .../spark/vector_outer_join5.q.out              |   48 +-
 .../spark/vector_string_concat.q.out            |   14 +-
 .../clientpositive/spark/vectorization_0.q.out  |   30 +-
 .../clientpositive/spark/vectorization_1.q.out  |    8 +-
 .../clientpositive/spark/vectorization_10.q.out |    8 +-
 .../clientpositive/spark/vectorization_11.q.out |    8 +-
 .../clientpositive/spark/vectorization_12.q.out |    8 +-
 .../clientpositive/spark/vectorization_13.q.out |   14 +-
 .../clientpositive/spark/vectorization_14.q.out |    8 +-
 .../clientpositive/spark/vectorization_15.q.out |    8 +-
 .../clientpositive/spark/vectorization_16.q.out | 1054 +-
 .../clientpositive/spark/vectorization_17.q.out |    8 +-
 .../clientpositive/spark/vectorization_2.q.out  |    8 +-
 .../clientpositive/spark/vectorization_3.q.out  |    8 +-
 .../clientpositive/spark/vectorization_4.q.out  |    8 +-
 .../clientpositive/spark/vectorization_5.q.out  |    8 +-
 .../clientpositive/spark/vectorization_6.q.out  |    8 +-
 .../clientpositive/spark/vectorization_9.q.out  | 1054 +-
 .../spark/vectorization_div0.q.out              |   24 +-
 .../spark/vectorization_short_regress.q.out     |  640 +-
 .../spark/vectorized_mapjoin.q.out              |    8 +-
 .../spark/vectorized_math_funcs.q.out           |   56 +-
 .../spark/vectorized_nested_mapjoin.q.out       |    8 +-
 .../clientpositive/spark/vectorized_ptf.q.out   |  533 +-
 .../spark/vectorized_rcfile_columnar.q.out      |   10 +-
 .../spark/vectorized_shufflejoin.q.out          |    8 +-
 .../spark/vectorized_string_funcs.q.out         |   24 +-
 .../spark/vectorized_timestamp_funcs.q.out      |   32 +-
 .../clientpositive/spark/windowing.q.out        |  640 +-
 .../results/clientpositive/specialChar.q.out    |   96 +
 .../special_character_in_tabnames_1.q.out       |    4 -
 .../special_character_in_tabnames_2.q.out       |   25 +-
 ql/src/test/results/clientpositive/stats0.q.out |   14 +
 ql/src/test/results/clientpositive/stats1.q.out |   18 +-
 .../test/results/clientpositive/stats12.q.out   |    4 +
 .../test/results/clientpositive/stats13.q.out   |    2 +
 .../test/results/clientpositive/stats18.q.out   |   10 +-
 ql/src/test/results/clientpositive/stats3.q.out |    1 +
 ql/src/test/results/clientpositive/stats4.q.out |    8 +-
 .../stats_aggregator_error_1.q.out              |   16 +-
 .../clientpositive/stats_empty_dyn_part.q.out   |   12 +-
 .../clientpositive/stats_empty_partition.q.out  |   10 +-
 .../clientpositive/stats_invalidation.q.out     |    1 +
 .../clientpositive/stats_list_bucket.q.out      |   28 +-
 .../clientpositive/stats_missing_warning.q.out  |  159 +
 .../results/clientpositive/stats_noscan_1.q.out |   28 +-
 .../results/clientpositive/stats_noscan_2.q.out |   20 +-
 .../clientpositive/stats_partial_size.q.out     |    2 -
 .../clientpositive/stats_partscan_1_23.q.out    |   32 +-
 .../results/clientpositive/stats_ppr_all.q.out  |    6 -
 .../stats_publisher_error_1.q.out               |   16 +-
 .../test/results/clientpositive/statsfs.q.out   |   42 +-
 .../results/clientpositive/str_to_map.q.out     |    4 +-
 .../results/clientpositive/struct_in_view.q.out |    6 +
 .../subq_where_serialization.q.out              |   98 +-
 .../clientpositive/subquery_exists.q.out        | 1057 +-
 .../subquery_exists_explain_rewrite.q.out       |   12 +-
 .../clientpositive/subquery_exists_having.q.out |  287 +-
 .../subquery_in_explain_rewrite.q.out           |   48 +-
 .../clientpositive/subquery_in_having.q.out     | 3038 ++++--
 .../clientpositive/subquery_multiinsert.q.out   |    8 +-
 .../clientpositive/subquery_notexists.q.out     | 1407 ++-
 .../subquery_notexists_having.q.out             |  292 +-
 .../clientpositive/subquery_notin_having.q.out  | 1674 +++-
 .../subquery_unqualcolumnrefs.q.out             | 1186 ++-
 .../results/clientpositive/subquery_views.q.out |    6 +-
 .../temp_table_display_colstats_tbllvl.q.out    |   14 +-
 .../results/clientpositive/temp_table_gb1.q.out |    6 +-
 .../clientpositive/temp_table_join1.q.out       |   26 +-
 .../clientpositive/temp_table_names.q.out       |    6 +-
 .../clientpositive/temp_table_options1.q.out    |   70 +-
 .../clientpositive/temp_table_precedence.q.out  |   36 +-
 .../clientpositive/temp_table_subquery1.q.out   |   12 +-
 .../temp_table_windowing_expressions.q.out      |    6 +-
 .../clientpositive/tez/explainanalyze_1.q.out   |  128 +-
 .../clientpositive/tez/explainanalyze_2.q.out   | 1966 ++--
 .../clientpositive/tez/explainanalyze_3.q.out   |  149 +-
 .../clientpositive/tez/explainanalyze_4.q.out   |  228 +-
 .../clientpositive/tez/explainanalyze_5.q.out   |  108 +-
 .../clientpositive/tez/explainuser_3.q.out      |  148 +-
 .../tez/hybridgrace_hashjoin_1.q.out            |  116 +-
 .../tez/hybridgrace_hashjoin_2.q.out            |   52 +-
 .../tez/multi_count_distinct.q.out              |   18 +-
 .../tez/orc_vectorization_ppd.q.out             |   80 +-
 .../clientpositive/tez/tez_union_with_udf.q.out |    6 +-
 .../clientpositive/tez/unionDistinct_2.q.out    |   20 +-
 .../clientpositive/tez/update_orig_table.q.out  |    8 +-
 .../tez/vector_join_part_col_char.q.out         |    2 -
 .../clientpositive/tez/vectorization_div0.q.out |   24 +-
 .../tez/vectorization_limit.q.out               |   32 +-
 .../results/clientpositive/tez_join_hash.q.out  |    8 +-
 .../test/results/clientpositive/timestamp.q.out |    8 +-
 .../clientpositive/timestamp_comparison2.q.out  |   12 +-
 .../clientpositive/timestamp_date_only.q.out    |   27 +
 .../clientpositive/timestamp_formats.q.out      |   12 +-
 .../clientpositive/timestamp_ints_casts.q.out   |   32 +-
 .../results/clientpositive/timestamp_udf.q.out  |   12 +-
 .../results/clientpositive/transform2.q.out     |    6 +-
 .../results/clientpositive/transform_acid.q.out |    8 +-
 .../results/clientpositive/transform_ppr1.q.out |   16 +-
 .../results/clientpositive/transform_ppr2.q.out |   12 +-
 .../clientpositive/truncate_column.q.out        |   86 +-
 .../truncate_column_buckets.q.out               |   28 +-
 .../truncate_column_list_bucket.q.out           |   26 +-
 .../clientpositive/truncate_column_merge.q.out  |   26 +-
 .../results/clientpositive/truncate_table.q.out |   24 +-
 .../clientpositive/type_conversions_1.q.out     |   12 +-
 .../results/clientpositive/type_widening.q.out  |    6 +-
 .../clientpositive/udaf_collect_set.q.out       |    4 +
 .../test/results/clientpositive/udaf_corr.q.out |    2 +
 .../results/clientpositive/udaf_covar_pop.q.out |    2 +
 .../clientpositive/udaf_covar_samp.q.out        |    2 +
 .../udaf_percentile_approx_23.q.out             |   34 +-
 .../results/clientpositive/udaf_sum_list.q.out  |   10 +-
 ql/src/test/results/clientpositive/udf_E.q.out  |    4 +
 ql/src/test/results/clientpositive/udf_PI.q.out |    4 +
 .../test/results/clientpositive/udf_abs.q.out   |    2 +
 .../test/results/clientpositive/udf_acos.q.out  |    2 +
 .../test/results/clientpositive/udf_add.q.out   |    2 +
 .../results/clientpositive/udf_add_months.q.out |    2 +
 .../clientpositive/udf_aes_decrypt.q.out        |    8 +-
 .../clientpositive/udf_aes_encrypt.q.out        |    8 +-
 .../test/results/clientpositive/udf_array.q.out |    2 +
 .../clientpositive/udf_array_contains.q.out     |   14 +-
 .../test/results/clientpositive/udf_ascii.q.out |    2 +
 .../test/results/clientpositive/udf_asin.q.out  |    2 +
 .../test/results/clientpositive/udf_atan.q.out  |    4 +
 .../test/results/clientpositive/udf_avg.q.out   |    2 +
 .../results/clientpositive/udf_between.q.out    |    2 +
 .../results/clientpositive/udf_bigint.q.out     |    2 +
 .../test/results/clientpositive/udf_bin.q.out   |    8 +-
 .../clientpositive/udf_bitwise_and.q.out        |    2 +
 .../clientpositive/udf_bitwise_not.q.out        |    2 +
 .../results/clientpositive/udf_bitwise_or.q.out |    2 +
 .../clientpositive/udf_bitwise_shiftleft.q.out  |    2 +
 .../clientpositive/udf_bitwise_shiftright.q.out |    2 +
 .../udf_bitwise_shiftrightunsigned.q.out        |    2 +
 .../clientpositive/udf_bitwise_xor.q.out        |    2 +
 .../results/clientpositive/udf_boolean.q.out    |    2 +
 .../results/clientpositive/udf_bround.q.out     |    2 +
 .../test/results/clientpositive/udf_case.q.out  |   16 +-
 .../test/results/clientpositive/udf_cbrt.q.out  |    2 +
 .../test/results/clientpositive/udf_ceil.q.out  |    2 +
 .../results/clientpositive/udf_ceiling.q.out    |    2 +
 .../test/results/clientpositive/udf_chr.q.out   |  Bin 1476 -> 1550 bytes
 .../clientpositive/udf_classloader.q.out        |    8 +-
 ...ssloader_dynamic_dependency_resolution.q.out |    8 +-
 .../results/clientpositive/udf_coalesce.q.out   |    2 +
 .../results/clientpositive/udf_concat.q.out     |    8 +-
 .../results/clientpositive/udf_concat_ws.q.out  |    8 +-
 .../test/results/clientpositive/udf_conv.q.out  |   54 +-
 .../test/results/clientpositive/udf_cos.q.out   |    2 +
 .../test/results/clientpositive/udf_count.q.out |    2 +
 .../test/results/clientpositive/udf_crc32.q.out |    2 +
 .../clientpositive/udf_current_user.q.out       |    2 +
 .../results/clientpositive/udf_date_add.q.out   |    8 +-
 .../clientpositive/udf_date_format.q.out        |   32 +-
 .../results/clientpositive/udf_date_sub.q.out   |    8 +-
 .../results/clientpositive/udf_datediff.q.out   |    2 +
 .../test/results/clientpositive/udf_day.q.out   |    2 +
 .../results/clientpositive/udf_dayofmonth.q.out |    2 +
 .../results/clientpositive/udf_decode.q.out     |    2 +
 .../results/clientpositive/udf_degrees.q.out    |    4 +
 .../test/results/clientpositive/udf_div.q.out   |    2 +
 .../results/clientpositive/udf_divide.q.out     |    2 +
 .../results/clientpositive/udf_double.q.out     |    2 +
 .../test/results/clientpositive/udf_elt.q.out   |    2 +
 .../test/results/clientpositive/udf_equal.q.out |    6 +
 .../test/results/clientpositive/udf_exp.q.out   |    2 +
 .../results/clientpositive/udf_explode.q.out    |    6 +
 .../results/clientpositive/udf_factorial.q.out  |    2 +
 .../test/results/clientpositive/udf_field.q.out |    2 +
 .../clientpositive/udf_find_in_set.q.out        |    2 +
 .../test/results/clientpositive/udf_float.q.out |    2 +
 .../test/results/clientpositive/udf_floor.q.out |    2 +
 .../clientpositive/udf_folder_constants.q.out   |    4 -
 .../clientpositive/udf_format_number.q.out      |   74 +-
 .../clientpositive/udf_from_unixtime.q.out      |    2 +
 .../clientpositive/udf_from_utc_timestamp.q.out |    2 +
 .../clientpositive/udf_get_json_object.q.out    |   22 +-
 .../clientpositive/udf_greaterthan.q.out        |    2 +
 .../clientpositive/udf_greaterthanorequal.q.out |    2 +
 .../results/clientpositive/udf_greatest.q.out   |    2 +
 .../test/results/clientpositive/udf_hash.q.out  |    2 +
 .../test/results/clientpositive/udf_hex.q.out   |   22 +-
 .../test/results/clientpositive/udf_hour.q.out  |    2 +
 ql/src/test/results/clientpositive/udf_if.q.out |    8 +-
 .../results/clientpositive/udf_initcap.q.out    |    2 +
 .../results/clientpositive/udf_inline.q.out     |    6 +-
 .../test/results/clientpositive/udf_instr.q.out |    2 +
 .../test/results/clientpositive/udf_int.q.out   |    2 +
 .../results/clientpositive/udf_isnotnull.q.out  |    2 +
 .../results/clientpositive/udf_isnull.q.out     |    2 +
 .../clientpositive/udf_isnull_isnotnull.q.out   |    4 +
 .../clientpositive/udf_java_method.q.out        |   10 +-
 .../results/clientpositive/udf_last_day.q.out   |    2 +
 .../test/results/clientpositive/udf_lcase.q.out |    2 +
 .../test/results/clientpositive/udf_least.q.out |    2 +
 .../results/clientpositive/udf_length.q.out     |    8 +-
 .../results/clientpositive/udf_lessthan.q.out   |    2 +
 .../clientpositive/udf_lessthanorequal.q.out    |    2 +
 .../clientpositive/udf_levenshtein.q.out        |    2 +
 .../test/results/clientpositive/udf_like.q.out  |    2 +
 ql/src/test/results/clientpositive/udf_ln.q.out |    2 +
 .../results/clientpositive/udf_locate.q.out     |    2 +
 .../test/results/clientpositive/udf_log.q.out   |    2 +
 .../test/results/clientpositive/udf_log10.q.out |    2 +
 .../test/results/clientpositive/udf_log2.q.out  |    2 +
 .../clientpositive/udf_logged_in_user.q.out     |    2 +
 .../test/results/clientpositive/udf_lower.q.out |    2 +
 .../test/results/clientpositive/udf_lpad.q.out  |    2 +
 .../test/results/clientpositive/udf_ltrim.q.out |    2 +
 .../test/results/clientpositive/udf_map.q.out   |    2 +
 .../results/clientpositive/udf_map_keys.q.out   |   22 +-
 .../results/clientpositive/udf_map_values.q.out |   22 +-
 .../test/results/clientpositive/udf_mask.q.out  |    2 +
 .../clientpositive/udf_mask_first_n.q.out       |    2 +
 .../results/clientpositive/udf_mask_hash.q.out  |    2 +
 .../clientpositive/udf_mask_last_n.q.out        |    2 +
 .../clientpositive/udf_mask_show_first_n.q.out  |    2 +
 .../clientpositive/udf_mask_show_last_n.q.out   |    2 +
 .../test/results/clientpositive/udf_max.q.out   |    2 +
 .../test/results/clientpositive/udf_md5.q.out   |    2 +
 .../test/results/clientpositive/udf_min.q.out   |    2 +
 .../results/clientpositive/udf_minute.q.out     |    2 +
 .../results/clientpositive/udf_modulo.q.out     |    2 +
 .../test/results/clientpositive/udf_month.q.out |    2 +
 .../clientpositive/udf_months_between.q.out     |   32 +-
 .../clientpositive/udf_named_struct.q.out       |    2 +
 .../results/clientpositive/udf_negative.q.out   |   10 +-
 .../results/clientpositive/udf_next_day.q.out   |    2 +
 .../test/results/clientpositive/udf_not.q.out   |   10 +-
 .../results/clientpositive/udf_notequal.q.out   |    4 +
 .../results/clientpositive/udf_nullif.q.out     |    2 +
 .../test/results/clientpositive/udf_nvl.q.out   |    2 +
 ql/src/test/results/clientpositive/udf_or.q.out |    2 +
 .../results/clientpositive/udf_parse_url.q.out  |    2 +
 .../results/clientpositive/udf_percentile.q.out |   28 +-
 .../test/results/clientpositive/udf_pmod.q.out  |    2 +
 .../results/clientpositive/udf_positive.q.out   |   10 +-
 .../test/results/clientpositive/udf_pow.q.out   |    2 +
 .../test/results/clientpositive/udf_power.q.out |    2 +
 .../results/clientpositive/udf_printf.q.out     |   34 +-
 .../results/clientpositive/udf_quarter.q.out    |   66 +-
 .../results/clientpositive/udf_radians.q.out    |    4 +
 .../test/results/clientpositive/udf_rand.q.out  |    2 +
 .../results/clientpositive/udf_reflect.q.out    |    2 +
 .../results/clientpositive/udf_reflect2.q.out   |    2 +
 .../results/clientpositive/udf_regexp.q.out     |    2 +
 .../clientpositive/udf_regexp_extract.q.out     |    2 +
 .../clientpositive/udf_regexp_replace.q.out     |    2 +
 .../results/clientpositive/udf_repeat.q.out     |    2 +
 .../results/clientpositive/udf_replace.q.out    |    2 +
 .../results/clientpositive/udf_reverse.q.out    |   12 +-
 .../test/results/clientpositive/udf_rlike.q.out |    2 +
 .../test/results/clientpositive/udf_round.q.out |    2 +
 .../results/clientpositive/udf_round_2.q.out    |   12 +-
 .../results/clientpositive/udf_round_3.q.out    |   30 +-
 .../test/results/clientpositive/udf_rpad.q.out  |    2 +
 .../test/results/clientpositive/udf_rtrim.q.out |    2 +
 .../results/clientpositive/udf_second.q.out     |    2 +
 .../results/clientpositive/udf_sentences.q.out  |    4 +-
 .../test/results/clientpositive/udf_sha1.q.out  |    2 +
 .../test/results/clientpositive/udf_sha2.q.out  |    8 +-
 .../test/results/clientpositive/udf_sign.q.out  |    4 +
 .../test/results/clientpositive/udf_sin.q.out   |    2 +
 .../test/results/clientpositive/udf_size.q.out  |    2 +
 .../results/clientpositive/udf_smallint.q.out   |    2 +
 .../results/clientpositive/udf_sort_array.q.out |   52 +-
 .../clientpositive/udf_sort_array_by.q.out      |   88 +-
 .../results/clientpositive/udf_soundex.q.out    |    2 +
 .../test/results/clientpositive/udf_space.q.out |    2 +
 .../test/results/clientpositive/udf_split.q.out |    2 +
 .../test/results/clientpositive/udf_sqrt.q.out  |    2 +
 .../test/results/clientpositive/udf_std.q.out   |    2 +
 .../results/clientpositive/udf_stddev.q.out     |    2 +
 .../clientpositive/udf_stddev_samp.q.out        |    4 +
 .../results/clientpositive/udf_string.q.out     |    2 +
 .../results/clientpositive/udf_struct.q.out     |    2 +
 .../results/clientpositive/udf_substr.q.out     |   20 +-
 .../results/clientpositive/udf_substring.q.out  |    8 +-
 .../clientpositive/udf_substring_index.q.out    |   28 +-
 .../results/clientpositive/udf_subtract.q.out   |    2 +
 .../test/results/clientpositive/udf_sum.q.out   |    4 +
 .../test/results/clientpositive/udf_tan.q.out   |    4 +
 .../results/clientpositive/udf_tinyint.q.out    |    2 +
 .../results/clientpositive/udf_to_boolean.q.out |   22 +-
 .../results/clientpositive/udf_to_byte.q.out    |    6 +-
 .../results/clientpositive/udf_to_date.q.out    |    2 +
 .../results/clientpositive/udf_to_double.q.out  |    6 +-
 .../results/clientpositive/udf_to_float.q.out   |    6 +-
 .../results/clientpositive/udf_to_long.q.out    |    6 +-
 .../results/clientpositive/udf_to_short.q.out   |    6 +-
 .../results/clientpositive/udf_to_string.q.out  |    6 +-
 .../clientpositive/udf_to_unix_timestamp.q.out  |    8 +-
 .../clientpositive/udf_to_utc_timestamp.q.out   |    2 +
 .../results/clientpositive/udf_translate.q.out  |   56 +-
 .../test/results/clientpositive/udf_trim.q.out  |    2 +
 .../test/results/clientpositive/udf_trunc.q.out |   66 +-
 .../clientpositive/udf_trunc_number.q.out       |  350 +
 .../test/results/clientpositive/udf_ucase.q.out |    2 +
 .../test/results/clientpositive/udf_unhex.q.out |   16 +-
 .../test/results/clientpositive/udf_union.q.out |    2 +
 .../clientpositive/udf_unix_timestamp.q.out     |    2 +
 .../test/results/clientpositive/udf_upper.q.out |    2 +
 .../results/clientpositive/udf_var_pop.q.out    |    2 +
 .../results/clientpositive/udf_var_samp.q.out   |    4 +
 .../results/clientpositive/udf_variance.q.out   |    8 +
 .../results/clientpositive/udf_version.q.out    |    6 +-
 .../results/clientpositive/udf_weekofyear.q.out |    2 +
 .../test/results/clientpositive/udf_when.q.out  |    8 +-
 .../test/results/clientpositive/udf_xpath.q.out |    2 +
 .../clientpositive/udf_xpath_boolean.q.out      |    2 +
 .../clientpositive/udf_xpath_double.q.out       |    4 +
 .../clientpositive/udf_xpath_float.q.out        |    2 +
 .../results/clientpositive/udf_xpath_int.q.out  |    2 +
 .../results/clientpositive/udf_xpath_long.q.out |    2 +
 .../clientpositive/udf_xpath_short.q.out        |    2 +
 .../clientpositive/udf_xpath_string.q.out       |    2 +
 .../results/clientpositive/udtf_explode.q.out   |   18 +-
 .../clientpositive/udtf_json_tuple.q.out        |    8 +-
 .../clientpositive/udtf_nofetchtask.q.out       |   12 +-
 .../clientpositive/udtf_parse_url_tuple.q.out   |    8 +-
 .../clientpositive/udtf_replicate_rows.q.out    |    4 +-
 .../clientpositive/unicode_comments.q.out       |    2 +
 .../clientpositive/unicode_notation.q.out       |    8 +-
 ql/src/test/results/clientpositive/union.q.out  |   10 +-
 .../test/results/clientpositive/union10.q.out   |   12 +-
 .../test/results/clientpositive/union11.q.out   |   10 +-
 .../test/results/clientpositive/union12.q.out   |   12 +-
 .../test/results/clientpositive/union13.q.out   |   10 +-
 .../test/results/clientpositive/union14.q.out   |   10 +-
 .../test/results/clientpositive/union15.q.out   |   10 +-
 .../test/results/clientpositive/union16.q.out   |    6 +-
 .../test/results/clientpositive/union17.q.out   |   16 +-
 .../test/results/clientpositive/union18.q.out   |   18 +-
 .../test/results/clientpositive/union19.q.out   |   22 +-
 ql/src/test/results/clientpositive/union2.q.out |   10 +-
 .../test/results/clientpositive/union20.q.out   |   10 +-
 .../test/results/clientpositive/union21.q.out   |   10 +-
 .../test/results/clientpositive/union22.q.out   |   35 +-
 .../test/results/clientpositive/union24.q.out   |   44 +-
 .../test/results/clientpositive/union26.q.out   |    8 +-
 .../test/results/clientpositive/union27.q.out   |    6 +-
 ql/src/test/results/clientpositive/union3.q.out |    8 +-
 .../test/results/clientpositive/union31.q.out   |   20 +-
 .../test/results/clientpositive/union32.q.out   |   44 +-
 .../test/results/clientpositive/union33.q.out   |   12 +-
 .../test/results/clientpositive/union34.q.out   |   26 +-
 .../test/results/clientpositive/union36.q.out   |    6 +-
 .../test/results/clientpositive/union37.q.out   |    4 -
 ql/src/test/results/clientpositive/union4.q.out |   14 +-
 ql/src/test/results/clientpositive/union5.q.out |   10 +-
 ql/src/test/results/clientpositive/union6.q.out |   12 +-
 ql/src/test/results/clientpositive/union7.q.out |   10 +-
 ql/src/test/results/clientpositive/union8.q.out |   10 +-
 ql/src/test/results/clientpositive/union9.q.out |   10 +-
 .../results/clientpositive/union_date.q.out     |    8 +-
 .../clientpositive/union_date_trim.q.out        |    6 +-
 .../results/clientpositive/union_null.q.out     |   16 +-
 .../results/clientpositive/union_paren.q.out    |   14 +-
 .../test/results/clientpositive/union_ppr.q.out |   12 +-
 .../results/clientpositive/union_remove_1.q.out |   26 +-
 .../clientpositive/union_remove_10.q.out        |   34 +-
 .../clientpositive/union_remove_11.q.out        |   34 +-
 .../clientpositive/union_remove_12.q.out        |   32 +-
 .../clientpositive/union_remove_13.q.out        |   32 +-
 .../clientpositive/union_remove_14.q.out        |   34 +-
 .../clientpositive/union_remove_15.q.out        |   32 +-
 .../clientpositive/union_remove_16.q.out        |   30 +-
 .../clientpositive/union_remove_17.q.out        |   26 +-
 .../clientpositive/union_remove_18.q.out        |   30 +-
 .../clientpositive/union_remove_19.q.out        |   42 +-
 .../results/clientpositive/union_remove_2.q.out |   28 +-
 .../clientpositive/union_remove_20.q.out        |   28 +-
 .../clientpositive/union_remove_21.q.out        |   28 +-
 .../clientpositive/union_remove_22.q.out        |   28 +-
 .../clientpositive/union_remove_23.q.out        |   28 +-
 .../clientpositive/union_remove_24.q.out        |   24 +-
 .../clientpositive/union_remove_25.q.out        |   26 +-
 .../results/clientpositive/union_remove_3.q.out |   28 +-
 .../results/clientpositive/union_remove_4.q.out |   26 +-
 .../results/clientpositive/union_remove_5.q.out |   30 +-
 .../results/clientpositive/union_remove_6.q.out |   28 +-
 .../clientpositive/union_remove_6_subq.q.out    |   38 +-
 .../results/clientpositive/union_remove_7.q.out |   30 +-
 .../results/clientpositive/union_remove_8.q.out |   32 +-
 .../results/clientpositive/union_remove_9.q.out |   30 +-
 .../results/clientpositive/union_script.q.out   |    6 +-
 .../results/clientpositive/union_stats.q.out    |    2 +
 .../unionall_join_nullconstant.q.out            |    2 +
 .../clientpositive/unionall_unbalancedppd.q.out |   18 +-
 .../results/clientpositive/uniquejoin.q.out     |    8 +-
 .../unset_table_view_property.q.out             |   81 +-
 .../clientpositive/updateBasicStats.q.out       |    2 -
 .../update_after_multiple_inserts.q.out         |   12 +-
 ...er_multiple_inserts_special_characters.q.out |   12 +-
 .../clientpositive/update_all_types.q.out       |    8 +-
 .../clientpositive/update_orig_table.q.out      |    8 +-
 .../test/results/clientpositive/varchar_1.q.out |   30 +-
 .../test/results/clientpositive/varchar_2.q.out |   12 +-
 .../results/clientpositive/varchar_cast.q.out   |   18 +-
 .../clientpositive/varchar_comparison.q.out     |   30 +-
 .../results/clientpositive/varchar_join1.q.out  |   18 +-
 .../clientpositive/varchar_nested_types.q.out   |   30 +-
 .../results/clientpositive/varchar_serde.q.out  |   60 +-
 .../results/clientpositive/varchar_union1.q.out |   18 +-
 .../results/clientpositive/vector_acid3.q.out   |    2 -
 .../vector_adaptor_usage_mode.q.out             |    2 -
 .../clientpositive/vector_aggregate_9.q.out     |    8 +-
 .../vector_aggregate_without_gby.q.out          |    2 -
 .../clientpositive/vector_between_columns.q.out |   12 +-
 .../vector_binary_join_groupby.q.out            |   15 +-
 .../results/clientpositive/vector_bround.q.out  |    2 -
 .../results/clientpositive/vector_bucket.q.out  |    2 -
 .../clientpositive/vector_cast_constant.q.out   |    6 +-
 .../results/clientpositive/vector_char_2.q.out  |   12 +-
 .../clientpositive/vector_char_cast.q.out       |    2 -
 .../clientpositive/vector_char_mapjoin1.q.out   |   42 +-
 .../clientpositive/vector_char_simple.q.out     |   18 +-
 .../clientpositive/vector_coalesce.q.out        |    8 +-
 .../clientpositive/vector_coalesce_2.q.out      |    2 -
 .../clientpositive/vector_coalesce_3.q.out      |  120 +
 .../clientpositive/vector_complex_all.q.out     |    8 +-
 .../clientpositive/vector_complex_join.q.out    |   14 +-
 .../results/clientpositive/vector_const.q.out   |    2 -
 .../results/clientpositive/vector_count.q.out   |    8 +-
 .../vector_custom_udf_configure.q.out           |    2 -
 .../clientpositive/vector_data_types.q.out      |    6 +-
 .../results/clientpositive/vector_date_1.q.out  |   28 +-
 .../vector_decimal_aggregate.q.out              |   16 +-
 .../vector_decimal_expressions.q.out            |   34 +-
 .../clientpositive/vector_decimal_mapjoin.q.out |    8 +-
 .../vector_decimal_math_funcs.q.out             |   24 +-
 .../vector_decimal_precision.q.out              |  248 +-
 .../clientpositive/vector_decimal_round.q.out   |    6 -
 .../clientpositive/vector_decimal_round_2.q.out |   30 +-
 .../clientpositive/vector_distinct_2.q.out      |    8 +-
 .../clientpositive/vector_empty_where.q.out     |    6 +-
 .../clientpositive/vector_groupby4.q.out        |    8 +-
 .../clientpositive/vector_groupby6.q.out        |    8 +-
 .../clientpositive/vector_groupby_3.q.out       |    8 +-
 .../clientpositive/vector_groupby_mapjoin.q.out |  255 +-
 .../clientpositive/vector_grouping_sets.q.out   |   36 +-
 .../clientpositive/vector_include_no_sel.q.out  |   22 +-
 .../clientpositive/vector_inner_join.q.out      |    8 -
 .../clientpositive/vector_interval_1.q.out      |   46 +-
 .../vector_interval_arithmetic.q.out            |   26 +-
 .../vector_join_part_col_char.q.out             |    2 -
 .../vector_left_outer_join2.q.out               |    8 +-
 .../clientpositive/vector_mapjoin_reduce.q.out  |  476 +-
 .../vector_mr_diff_schema_alias.q.out           |   10 +-
 .../clientpositive/vector_null_projection.q.out |   18 +-
 .../vector_number_compare_projection.q.out      |    2 -
 .../clientpositive/vector_outer_join0.q.out     |   20 +-
 .../clientpositive/vector_outer_join1.q.out     |   30 +-
 .../clientpositive/vector_outer_join2.q.out     |   14 +-
 .../clientpositive/vector_outer_join3.q.out     |   30 +-
 .../clientpositive/vector_outer_join4.q.out     |   30 +-
 .../clientpositive/vector_outer_join6.q.out     |    8 +-
 .../results/clientpositive/vector_reduce1.q.out |    8 +-
 .../results/clientpositive/vector_reduce2.q.out |    8 +-
 .../results/clientpositive/vector_reduce3.q.out |    8 +-
 .../clientpositive/vector_string_concat.q.out   |   14 +-
 .../clientpositive/vector_string_decimal.q.out  |    2 -
 .../clientpositive/vector_struct_in.q.out       |   36 +-
 .../vector_tablesample_rows.q.out               |    8 +-
 .../results/clientpositive/vector_udf2.q.out    |    4 -
 .../vector_varchar_mapjoin1.q.out               |   18 +-
 .../clientpositive/vector_varchar_simple.q.out  |   18 +-
 .../clientpositive/vector_when_case_null.q.out  |   10 +-
 .../clientpositive/vectorization_1.q.out        |    8 +-
 .../clientpositive/vectorization_10.q.out       |    8 +-
 .../clientpositive/vectorization_11.q.out       |    8 +-
 .../clientpositive/vectorization_12.q.out       |    8 +-
 .../clientpositive/vectorization_13.q.out       |   14 +-
 .../clientpositive/vectorization_14.q.out       |    8 +-
 .../clientpositive/vectorization_15.q.out       |    8 +-
 .../clientpositive/vectorization_16.q.out       | 1054 +-
 .../clientpositive/vectorization_17.q.out       |    8 +-
 .../clientpositive/vectorization_2.q.out        |    8 +-
 .../clientpositive/vectorization_3.q.out        |    8 +-
 .../clientpositive/vectorization_4.q.out        |    8 +-
 .../clientpositive/vectorization_5.q.out        |    8 +-
 .../clientpositive/vectorization_6.q.out        |    8 +-
 .../clientpositive/vectorization_7.q.out        |   14 +-
 .../clientpositive/vectorization_8.q.out        |   14 +-
 .../clientpositive/vectorization_9.q.out        | 1054 +-
 .../clientpositive/vectorization_div0.q.out     |   24 +-
 .../clientpositive/vectorization_limit.q.out    |   32 +-
 .../vectorized_bucketmapjoin1.q.out             |   14 +-
 .../clientpositive/vectorized_casts.q.out       |   70 +-
 .../clientpositive/vectorized_date_funcs.q.out  | 1003 +-
 .../clientpositive/vectorized_mapjoin.q.out     |    8 +-
 .../clientpositive/vectorized_mapjoin2.q.out    |    4 -
 .../clientpositive/vectorized_math_funcs.q.out  |   56 +-
 .../vectorized_parquet_types.q.out              |   12 +-
 .../results/clientpositive/vectorized_ptf.q.out |  286 +-
 .../vectorized_rcfile_columnar.q.out            |   10 +-
 .../clientpositive/vectorized_shufflejoin.q.out |    8 +-
 .../vectorized_string_funcs.q.out               |   24 +-
 .../clientpositive/vectorized_timestamp.q.out   |    2 -
 .../vectorized_timestamp_funcs.q.out            |   32 +-
 .../vectorized_timestamp_ints_casts.q.out       |   32 +-
 ql/src/test/results/clientpositive/view.q.out   |   64 +-
 .../results/clientpositive/view_alias.q.out     |   25 +
 .../view_authorization_sqlstd.q.out             |   51 +-
 .../test/results/clientpositive/view_cast.q.out |   16 +
 .../results/clientpositive/view_inputs.q.out    |   12 +-
 .../test/results/clientpositive/windowing.q.out |  461 +-
 .../windowing_columnPruning.q.out               |   18 +-
 .../clientpositive/windowing_distinct.q.out     |   18 +-
 .../clientpositive/windowing_expressions.q.out  |    6 +-
 .../results/clientpositive/windowing_gby2.q.out |    2 +-
 .../results/clientpositive/windowing_rank.q.out |    8 +-
 .../clientpositive/windowing_streaming.q.out    |   12 +-
 .../clientpositive/windowing_udaf2.q.out        |    6 +-
 .../clientpositive/windowing_windowspec.q.out   |    6 +-
 .../clientpositive/windowing_windowspec3.q.out  |   38 +-
 .../clientpositive/windowing_windowspec4.q.out  |   10 +-
 serde/if/serde.thrift                           |    1 +
 .../src/gen/thrift/gen-cpp/serde_constants.cpp  |    2 +
 serde/src/gen/thrift/gen-cpp/serde_constants.h  |    1 +
 .../hadoop/hive/serde/serdeConstants.java       |    2 +
 .../org/apache/hadoop/hive/serde/Types.php      |    5 +
 .../org_apache_hadoop_hive_serde/constants.py   |    1 +
 serde/src/gen/thrift/gen-rb/serde_constants.rb  |    2 +
 .../hive/serde2/ColumnProjectionUtils.java      |   18 +-
 .../serde2/MetadataTypedColumnsetSerDe.java     |    4 +-
 .../apache/hadoop/hive/serde2/RegexSerDe.java   |    5 +-
 .../apache/hadoop/hive/serde2/SerDeUtils.java   |    4 +-
 .../hadoop/hive/serde2/avro/AvroSerDe.java      |    7 +-
 .../hadoop/hive/serde2/avro/AvroSerdeUtils.java |   10 +-
 .../binarysortable/BinarySortableSerDe.java     |  143 +-
 .../fast/BinarySortableDeserializeRead.java     |   35 +-
 .../fast/BinarySortableSerializeWrite.java      |   26 +-
 .../hadoop/hive/serde2/fast/SerializeWrite.java |    5 +
 .../hive/serde2/lazy/LazyHiveDecimal.java       |   72 +-
 .../hive/serde2/lazy/LazySerDeParameters.java   |    6 +-
 .../lazy/fast/LazySimpleDeserializeRead.java    |   27 +-
 .../lazy/fast/LazySimpleSerializeWrite.java     |   26 +-
 .../LazyHiveDecimalObjectInspector.java         |    9 +-
 .../lazybinary/LazyBinaryHiveDecimal.java       |    6 +-
 .../hive/serde2/lazybinary/LazyBinarySerDe.java |   79 +-
 .../hive/serde2/lazybinary/LazyBinaryUtils.java |    4 +-
 .../fast/LazyBinaryDeserializeRead.java         |   28 +-
 .../fast/LazyBinarySerializeWrite.java          |   84 +-
 .../objectinspector/ObjectInspectorUtils.java   |    2 +
 .../PrimitiveObjectInspectorUtils.java          |   61 +-
 ...tableConstantHiveDecimalObjectInspector.java |   17 +-
 .../hadoop/hive/serde2/thrift/ColumnBuffer.java |   47 +-
 .../serde2/thrift/ThriftJDBCBinarySerDe.java    |    5 +-
 .../hive/serde2/typeinfo/HiveDecimalUtils.java  |    5 +-
 .../hive/serde2/SerdeRandomRowSource.java       |   28 +-
 .../apache/hadoop/hive/serde2/VerifyFast.java   |    2 +-
 .../hive/serde2/avro/TestAvroSerializer.java    |    8 +-
 .../binarysortable/MyTestPrimitiveClass.java    |   16 +-
 .../binarysortable/TestBinarySortableFast.java  |   43 +-
 .../hive/serde2/io/TestHiveDecimalWritable.java |  250 -
 .../TestPrimitiveObjectInspectorUtils.java      |    6 +
 .../hive/serde2/thrift/TestColumnBuffer.java    |  271 +
 .../apache/hive/service/AbstractService.java    |    2 +-
 .../hive/service/auth/ldap/DirSearch.java       |   17 +
 .../service/auth/ldap/GroupFilterFactory.java   |   76 +-
 .../hive/service/auth/ldap/LdapSearch.java      |   17 +
 .../apache/hive/service/auth/ldap/Query.java    |   11 +
 .../hive/service/auth/ldap/QueryFactory.java    |   42 +-
 .../org/apache/hive/service/cli/CLIService.java |    1 -
 .../apache/hive/service/cli/ColumnBasedSet.java |    2 +-
 .../cli/operation/GetColumnsOperation.java      |   14 +-
 .../service/cli/operation/SQLOperation.java     |   15 +-
 .../service/cli/session/HiveSessionImpl.java    |    6 -
 .../cli/session/HiveSessionImplwithUGI.java     |    5 -
 .../apache/hive/service/server/HiveServer2.java |   11 +
 .../hive-webapps/hiveserver2/hiveserver2.jsp    |    2 +-
 .../auth/TestLdapAtnProviderWithMiniDS.java     |  147 +-
 .../TestLdapAuthenticationProviderImpl.java     |   74 +-
 .../auth/ldap/LdapAuthenticationTestCase.java   |   10 +-
 .../hive/service/auth/ldap/TestGroupFilter.java |   68 +-
 .../hive/service/auth/ldap/TestLdapSearch.java  |   84 +
 .../service/auth/ldap/TestQueryFactory.java     |   24 +
 .../apache/hive/service/cli/CLIServiceTest.java |    5 +-
 .../org/apache/hive/service/cli/TestColumn.java |  131 -
 .../session/TestPluggableHiveSessionImpl.java   |  106 +-
 .../hive/service/server/TestHS2HttpServer.java  |   24 +-
 .../src/test/resources/ldap/ad.example.com.ldif |  133 +
 .../test/resources/ldap/microsoft.schema.ldif   |   45 +
 .../apache/hadoop/hive/shims/Jetty23Shims.java  |   56 -
 shims/common/pom.xml                            |    6 +
 .../apache/hadoop/fs/ProxyLocalFileSystem.java  |  119 +-
 .../org/apache/hadoop/hive/io/HdfsUtils.java    |  123 +-
 .../hadoop/hive/shims/HadoopShimsSecure.java    |    6 +-
 .../apache/hadoop/hive/shims/ShimLoader.java    |   22 -
 .../apache/hadoop/hive/io/TestHdfsUtils.java    |  184 +
 .../org/apache/hive/spark/client/JobHandle.java |    5 +
 .../apache/hive/spark/client/JobHandleImpl.java |    5 +
 .../hive/spark/client/SparkClientImpl.java      |   48 +-
 .../hive/spark/client/SparkClientUtilities.java |   29 +
 .../hive/spark/client/TestSparkClient.java      |    1 -
 storage-api/pom.xml                             |   82 +-
 .../org/apache/hadoop/hive/common/Pool.java     |    8 +-
 .../apache/hadoop/hive/common/io/Allocator.java |   16 +-
 .../apache/hadoop/hive/common/io/DataCache.java |    7 +-
 .../hadoop/hive/common/io/DiskRangeList.java    |   29 +-
 .../common/io/encoded/EncodedColumnBatch.java   |   17 +
 .../hive/common/io/encoded/MemoryBuffer.java    |    6 +-
 .../hive/common/type/FastHiveDecimal.java       |  741 ++
 .../hive/common/type/FastHiveDecimalImpl.java   | 9388 +++++++++++++++++
 .../hadoop/hive/common/type/HiveDecimal.java    | 1491 ++-
 .../hadoop/hive/common/type/HiveDecimalV1.java  |  386 +
 .../hive/common/type/HiveDecimalVersionV1.java  |   33 +
 .../hive/common/type/HiveDecimalVersionV2.java  |   33 +
 .../hadoop/hive/common/type/RandomTypeUtil.java |   27 +-
 .../hive/ql/exec/vector/BytesColumnVector.java  |    2 +-
 .../hive/ql/exec/vector/ColumnVector.java       |    6 +-
 .../ql/exec/vector/DecimalColumnVector.java     |   35 +-
 .../ql/exec/vector/TimestampColumnVector.java   |    2 +-
 .../hive/ql/exec/vector/VectorizedRowBatch.java |    6 +-
 .../hadoop/hive/ql/io/sarg/LiteralDelegate.java |   31 +
 .../hive/ql/io/sarg/SearchArgumentFactory.java  |    9 +-
 .../hive/ql/io/sarg/SearchArgumentImpl.java     |   65 +-
 .../hadoop/hive/ql/util/TimestampUtils.java     |   83 +-
 .../hive/serde2/io/HiveDecimalWritable.java     |  956 +-
 .../hive/serde2/io/HiveDecimalWritableV1.java   |  191 +
 .../serde2/io/HiveDecimalWritableVersionV1.java |   33 +
 .../serde2/io/HiveDecimalWritableVersionV2.java |   33 +
 .../apache/hive/common/util/BloomFilter.java    |   87 +
 .../org/apache/hadoop/hive/VersionTestBase.java |  322 +
 .../hive/common/type/HiveDecimalTestBase.java   |  558 ++
 .../hive/common/type/TestHiveDecimal.java       | 3404 +++++++
 .../common/type/TestHiveDecimalVersion.java     |   67 +
 .../ql/exec/vector/TestStructColumnVector.java  |   36 +
 .../hive/serde2/io/TestHiveDecimalWritable.java |   52 +
 .../io/TestHiveDecimalWritableVersion.java      |   71 +
 .../hive/common/util/TestBloomFilter.java       |  589 ++
 testutils/metastore/dataload.properties         |    6 +
 testutils/metastore/dbs/derby/validate.sh       |   81 +
 testutils/metastore/dbs/mysql/validate.sh       |   76 +
 testutils/metastore/dbs/postgres/validate.sh    |   75 +
 testutils/metastore/metastore-upgrade-test.sh   |   31 +
 .../metastore/metastore-validation-test.sh      | 1442 +++
 testutils/ptest2/pom.xml                        |   29 +-
 ...tScripts.testAlternativeTestJVM.approved.txt |    4 +-
 .../TestScripts.testBatch.approved.txt          |    4 +-
 .../TestScripts.testPrepGit.approved.txt        |    2 +-
 .../TestScripts.testPrepHadoop1.approved.txt    |    2 +-
 .../TestScripts.testPrepNone.approved.txt       |    2 +-
 .../TestScripts.testPrepSvn.approved.txt        |    2 +-
 3880 files changed, 214501 insertions(+), 86785 deletions(-)
----------------------------------------------------------------------