You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ga...@apache.org on 2018/07/09 20:26:58 UTC
hive git commit: HIVE-19806 Several tests do not properly sort their
output (Alan Gates, reviewed by Vineet Garg)
Repository: hive
Updated Branches:
refs/heads/master 601dd05b5 -> 5016d6f05
HIVE-19806 Several tests do not properly sort their output (Alan Gates, reviewed by Vineet Garg)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/5016d6f0
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/5016d6f0
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/5016d6f0
Branch: refs/heads/master
Commit: 5016d6f0564eb11090d9c3ad3b7cda3672e2f79e
Parents: 601dd05
Author: Alan Gates <ga...@hortonworks.com>
Authored: Mon Jul 9 13:25:53 2018 -0700
Committer: Alan Gates <ga...@hortonworks.com>
Committed: Mon Jul 9 13:25:53 2018 -0700
----------------------------------------------------------------------
.../insert_into_dynamic_partitions.q | 3 ++-
.../clientpositive/insert_overwrite_directory.q | 3 ++-
.../insert_overwrite_dynamic_partitions.q | 3 ++-
.../insert_into_dynamic_partitions.q.out | 8 +++---
.../insert_overwrite_dynamic_partitions.q.out | 12 ++++-----
.../hive/metastore/TestMetaStoreMetrics.java | 5 ++--
.../test/resources/testconfiguration.properties | 9 -------
.../apache/hadoop/hive/ql/TestTxnCommands2.java | 4 +--
.../test/queries/clientpositive/explainuser_4.q | 1 +
.../clientpositive/orc_schema_evolution_float.q | 1 +
.../clientpositive/parquet_ppd_multifiles.q | 1 +
.../test/queries/clientpositive/selectindate.q | 1 +
ql/src/test/queries/clientpositive/union38.q | 1 +
.../test/queries/clientpositive/vector_bround.q | 1 +
.../queries/clientpositive/vector_case_when_1.q | 3 +--
.../queries/clientpositive/vector_coalesce_2.q | 1 +
.../queries/clientpositive/vector_coalesce_3.q | 1 +
.../queries/clientpositive/vector_interval_1.q | 1 +
.../clientpositive/vectorized_parquet_types.q | 1 +
.../clientpositive/llap/explainuser_4.q.out | 28 ++++++++++----------
.../clientpositive/llap/vector_bround.q.out | 4 +--
.../clientpositive/llap/vector_coalesce_2.q.out | 8 +++---
.../clientpositive/llap/vector_interval_1.q.out | 16 +++++------
.../llap/vectorized_parquet_types.q.out | 8 +++---
.../orc_schema_evolution_float.q.out | 12 ++++-----
.../test/results/clientpositive/union38.q.out | 14 +++++-----
.../results/clientpositive/vector_bround.q.out | 4 +--
.../clientpositive/vector_coalesce_2.q.out | 4 +--
.../clientpositive/vector_interval_1.q.out | 16 +++++------
.../vectorized_parquet_types.q.out | 8 +++---
30 files changed, 93 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/itests/hive-blobstore/src/test/queries/clientpositive/insert_into_dynamic_partitions.q
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/queries/clientpositive/insert_into_dynamic_partitions.q b/itests/hive-blobstore/src/test/queries/clientpositive/insert_into_dynamic_partitions.q
index 7269e29..dc269eb 100644
--- a/itests/hive-blobstore/src/test/queries/clientpositive/insert_into_dynamic_partitions.q
+++ b/itests/hive-blobstore/src/test/queries/clientpositive/insert_into_dynamic_partitions.q
@@ -1,3 +1,4 @@
+-- SORT_QUERY_RESULTS
SET hive.blobstore.optimizations.enabled=true;
SET hive.exec.dynamic.partition.mode=nonstrict;
@@ -21,4 +22,4 @@ INSERT INTO TABLE table2 PARTITION (country='MEX', state) VALUES ('Peter Mo', 87
SHOW PARTITIONS table2;
SELECT * FROM table2;
DROP TABLE table2;
-DROP TABLE table1;
\ No newline at end of file
+DROP TABLE table1;
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/itests/hive-blobstore/src/test/queries/clientpositive/insert_overwrite_directory.q
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/queries/clientpositive/insert_overwrite_directory.q b/itests/hive-blobstore/src/test/queries/clientpositive/insert_overwrite_directory.q
index f1b5a0b..8dc44b2 100644
--- a/itests/hive-blobstore/src/test/queries/clientpositive/insert_overwrite_directory.q
+++ b/itests/hive-blobstore/src/test/queries/clientpositive/insert_overwrite_directory.q
@@ -1,5 +1,6 @@
SET hive.blobstore.optimizations.enabled=true;
SET hive.blobstore.use.blobstore.as.scratchdir=true;
+-- SORT_BEFORE_DIFF
-- Create a simple source table;
DROP TABLE table1;
@@ -24,4 +25,4 @@ EXPLAIN EXTENDED INSERT OVERWRITE DIRECTORY '${hiveconf:test.blobstore.path.uniq
EXPLAIN EXTENDED FROM table1
INSERT OVERWRITE DIRECTORY '${hiveconf:test.blobstore.path.unique}/table1.dir/' SELECT id
- INSERT OVERWRITE DIRECTORY '${hiveconf:test.blobstore.path.unique}/table2.dir/' SELECT key;
\ No newline at end of file
+ INSERT OVERWRITE DIRECTORY '${hiveconf:test.blobstore.path.unique}/table2.dir/' SELECT key;
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/itests/hive-blobstore/src/test/queries/clientpositive/insert_overwrite_dynamic_partitions.q
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/queries/clientpositive/insert_overwrite_dynamic_partitions.q b/itests/hive-blobstore/src/test/queries/clientpositive/insert_overwrite_dynamic_partitions.q
index 0be4f16..a7129bd 100644
--- a/itests/hive-blobstore/src/test/queries/clientpositive/insert_overwrite_dynamic_partitions.q
+++ b/itests/hive-blobstore/src/test/queries/clientpositive/insert_overwrite_dynamic_partitions.q
@@ -1,5 +1,6 @@
SET hive.blobstore.optimizations.enabled=true;
SET hive.exec.dynamic.partition.mode=nonstrict;
+-- SORT_QUERY_RESULTS
-- Single partition with buckets
DROP TABLE table1;
@@ -27,4 +28,4 @@ INSERT OVERWRITE TABLE table2 PARTITION (country='MEX', state) VALUES ('Peter Mo
SHOW PARTITIONS table2;
SELECT * FROM table2;
DROP TABLE table2;
-DROP TABLE table1;
\ No newline at end of file
+DROP TABLE table1;
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
index a0ebed7..74a9a56 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
@@ -339,13 +339,13 @@ POSTHOOK: Input: default@table2@country=MEX/state=SON
POSTHOOK: Input: default@table2@country=USA/state=CA
POSTHOOK: Input: default@table2@country=USA/state=TX
#### A masked pattern was here ####
-Peter Mo 87 MEX SON
-Mirna Cage 37 USA CA
-Mark Cage 38 USA CA
+Bill Rose 52 USA TX
Jane Doe 22 USA CA
John Doe 23 USA CA
Maria Full 50 USA TX
-Bill Rose 52 USA TX
+Mark Cage 38 USA CA
+Mirna Cage 37 USA CA
+Peter Mo 87 MEX SON
PREHOOK: query: DROP TABLE table2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table2
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
----------------------------------------------------------------------
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
index 6dba301..ee02c36 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
@@ -344,12 +344,12 @@ POSTHOOK: Input: default@table2
POSTHOOK: Input: default@table2@country=USA/state=CA
POSTHOOK: Input: default@table2@country=USA/state=TX
#### A masked pattern was here ####
-Mirna Cage 37 USA CA
-Mark Cage 38 USA CA
+Bill Rose 52 USA TX
Jane Doe 22 USA CA
John Doe 23 USA CA
Maria Full 50 USA TX
-Bill Rose 52 USA TX
+Mark Cage 38 USA CA
+Mirna Cage 37 USA CA
PREHOOK: query: INSERT OVERWRITE TABLE table2 PARTITION (country, state) SELECT * FROM table1 WHERE age < 30
PREHOOK: type: QUERY
PREHOOK: Input: default@table1
@@ -384,10 +384,10 @@ POSTHOOK: Input: default@table2
POSTHOOK: Input: default@table2@country=USA/state=CA
POSTHOOK: Input: default@table2@country=USA/state=TX
#### A masked pattern was here ####
+Bill Rose 52 USA TX
Jane Doe 22 USA CA
John Doe 23 USA CA
Maria Full 50 USA TX
-Bill Rose 52 USA TX
PREHOOK: query: INSERT OVERWRITE TABLE table2 PARTITION (country='MEX', state) VALUES ('Peter Mo', 87, 'SON')
PREHOOK: type: QUERY
PREHOOK: Input: _dummy_database@_dummy_table
@@ -421,11 +421,11 @@ POSTHOOK: Input: default@table2@country=MEX/state=SON
POSTHOOK: Input: default@table2@country=USA/state=CA
POSTHOOK: Input: default@table2@country=USA/state=TX
#### A masked pattern was here ####
-Peter Mo 87 MEX SON
+Bill Rose 52 USA TX
Jane Doe 22 USA CA
John Doe 23 USA CA
Maria Full 50 USA TX
-Bill Rose 52 USA TX
+Peter Mo 87 MEX SON
PREHOOK: query: DROP TABLE table2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table2
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMetrics.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMetrics.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMetrics.java
index 3f7135c..03028a4 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMetrics.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreMetrics.java
@@ -132,6 +132,7 @@ public class TestMetaStoreMetrics {
@Test
public void testConnections() throws Exception {
+ Thread.sleep(2000); // TODO Evil! Need to figure out a way to remove this sleep.
//initial state is one connection
int initialCount =
(Integer)Metrics.getRegistry().getGauges().get(MetricsConstants.OPEN_CONNECTIONS).getValue();
@@ -145,13 +146,13 @@ public class TestMetaStoreMetrics {
//close one connection, verify still two left
msc.close();
- Thread.sleep(500); // TODO Evil! Need to figure out a way to remove this sleep.
+ Thread.sleep(2000); // TODO Evil! Need to figure out a way to remove this sleep.
Assert.assertEquals(initialCount + 1,
Metrics.getRegistry().getGauges().get(MetricsConstants.OPEN_CONNECTIONS).getValue());
//close one connection, verify still one left
msc2.close();
- Thread.sleep(500); // TODO Evil! Need to figure out a way to remove this sleep.
+ Thread.sleep(2000); // TODO Evil! Need to figure out a way to remove this sleep.
Assert.assertEquals(initialCount,
Metrics.getRegistry().getGauges().get(MetricsConstants.OPEN_CONNECTIONS).getValue());
}
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/itests/src/test/resources/testconfiguration.properties
----------------------------------------------------------------------
diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties
index a27ce5e..2795e3d 100644
--- a/itests/src/test/resources/testconfiguration.properties
+++ b/itests/src/test/resources/testconfiguration.properties
@@ -64,7 +64,6 @@ minillap.shared.query.files=insert_into1.q,\
parquet_map_type_vectorization.q,\
parquet_struct_type_vectorization.q,\
orc_struct_type_vectorization.q,\
- union_type_chk.q,\
cte_2.q,\
cte_4.q
@@ -313,7 +312,6 @@ minillaplocal.shared.query.files=alter_merge_2_orc.q,\
vector_reduce3.q,\
vector_reduce_groupby_decimal.q,\
vector_reduce_groupby_duplicate_cols.q,\
- vector_row__id.q,\
vector_string_concat.q,\
vector_struct_in.q,\
vector_udf_character_length.q,\
@@ -385,8 +383,6 @@ minillap.query.files=acid_bucket_pruning.q,\
reduce_deduplicate.q,\
reduce_deduplicate_distinct.q, \
remote_script.q,\
- tez_aggr_part_stats.q,\
- tez_union_view.q,\
file_with_header_footer.q,\
external_table_purge.q,\
external_table_with_space_in_location_path.q,\
@@ -421,7 +417,6 @@ minillaplocal.query.files=\
dec_str.q,\
dp_counter_non_mm.q,\
dp_counter_mm.q,\
- acid_export.q,\
acid_no_buckets.q, \
acid_globallimit.q,\
acid_vectorization_missing_cols.q,\
@@ -547,7 +542,6 @@ minillaplocal.query.files=\
llap_uncompressed.q,\
llap_decimal64_reader.q,\
llap_text.q,\
- load_data_acid_rename.q,\
load_data_using_job.q,\
load_dyn_part5.q,\
lvj_mapjoin.q,\
@@ -838,7 +832,6 @@ minillaplocal.query.files=\
dynpart_sort_optimization2.q,\
multi_column_in_single.q,\
join32_lessSize.q,\
- alter_table_invalidate_column_stats.q,\
bucketmapjoin1.q,\
ppr_pushdown.q,\
smb_mapjoin_14.q,\
@@ -914,7 +907,6 @@ encrypted.query.files=encryption_join_unencrypted_tbl.q,\
encryption_insert_values.q, \
encryption_drop_view.q, \
encryption_drop_partition.q, \
- encryption_with_trash.q, \
encryption_ctas.q, \
encryption_auto_purge_tables.q, \
encryption_drop_table_in_encrypted_db.q
@@ -1661,7 +1653,6 @@ miniSparkOnYarn.query.files=auto_sortmerge_join_16.q,\
schemeAuthority.q,\
schemeAuthority2.q,\
scriptfile1.q,\
- scriptfile1_win.q,\
temp_table_external.q,\
truncate_column_buckets.q,\
uber_reduce.q,\
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
index 3e98a09..c5589b9 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
@@ -511,7 +511,7 @@ public class TestTxnCommands2 {
FileStatus[] buckets = fs.listStatus(status[i].getPath(), FileUtils.HIDDEN_FILES_PATH_FILTER);
Arrays.sort(buckets);
Assert.assertEquals(2, buckets.length);
- Assert.assertTrue(buckets[0].getPath().getName().matches("bucket_00000"));
+ Assert.assertTrue(buckets[0].getPath().getName().matches("bucket_0000[01]"));
}
}
Assert.assertTrue(sawNewBase);
@@ -545,7 +545,7 @@ public class TestTxnCommands2 {
FileStatus[] buckets = fs.listStatus(status[0].getPath(), FileUtils.HIDDEN_FILES_PATH_FILTER);
Arrays.sort(buckets);
Assert.assertEquals(2, buckets.length);
- Assert.assertTrue(buckets[0].getPath().getName().matches("bucket_00000"));
+ Assert.assertTrue(buckets[0].getPath().getName().matches("bucket_0000[01]"));
rs = runStatementOnDriver("select a,b from " + Table.NONACIDORCTBL);
resultData = new int[][] {{3, 4}, {1, 2}};
Assert.assertEquals(stringifyValuesNoSort(resultData), rs);
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/queries/clientpositive/explainuser_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainuser_4.q b/ql/src/test/queries/clientpositive/explainuser_4.q
index a2c25bc..2125d09 100644
--- a/ql/src/test/queries/clientpositive/explainuser_4.q
+++ b/ql/src/test/queries/clientpositive/explainuser_4.q
@@ -1,3 +1,4 @@
+-- SORT_QUERY_RESULTS
--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
set hive.llap.memory.oversubscription.max.executors.per.query=0;
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/queries/clientpositive/orc_schema_evolution_float.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_schema_evolution_float.q b/ql/src/test/queries/clientpositive/orc_schema_evolution_float.q
index c2d9840..0b31902 100644
--- a/ql/src/test/queries/clientpositive/orc_schema_evolution_float.q
+++ b/ql/src/test/queries/clientpositive/orc_schema_evolution_float.q
@@ -1,6 +1,7 @@
set hive.vectorized.execution.enabled=false;
set hive.optimize.index.filter=false;
set hive.metastore.disallow.incompatible.col.type.changes=false;
+-- SORT_QUERY_RESULTS
drop table float_text;
create table float_text(f float);
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/queries/clientpositive/parquet_ppd_multifiles.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_ppd_multifiles.q b/ql/src/test/queries/clientpositive/parquet_ppd_multifiles.q
index 075e854..2edaefb 100644
--- a/ql/src/test/queries/clientpositive/parquet_ppd_multifiles.q
+++ b/ql/src/test/queries/clientpositive/parquet_ppd_multifiles.q
@@ -1,4 +1,5 @@
set hive.vectorized.execution.enabled=false;
+-- SORT_QUERY_RESULTS
CREATE TABLE parquet_ppd_multifiles (
name string,
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/queries/clientpositive/selectindate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/selectindate.q b/ql/src/test/queries/clientpositive/selectindate.q
index 00f6a5a..5ca6da1 100644
--- a/ql/src/test/queries/clientpositive/selectindate.q
+++ b/ql/src/test/queries/clientpositive/selectindate.q
@@ -1,3 +1,4 @@
+-- SORT_QUERY_RESULTS
drop table if exists datetest;
create table datetest(dValue date, iValue int);
insert into datetest values('2000-03-22', 1);
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/queries/clientpositive/union38.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union38.q b/ql/src/test/queries/clientpositive/union38.q
index 2ea02bf..156e60e 100644
--- a/ql/src/test/queries/clientpositive/union38.q
+++ b/ql/src/test/queries/clientpositive/union38.q
@@ -1,3 +1,4 @@
+-- SORT_QUERY_RESULTS
--create table union38_test1
create table union38_test1( name String, id int, address String);
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/queries/clientpositive/vector_bround.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_bround.q b/ql/src/test/queries/clientpositive/vector_bround.q
index 0bada68..3f84412 100644
--- a/ql/src/test/queries/clientpositive/vector_bround.q
+++ b/ql/src/test/queries/clientpositive/vector_bround.q
@@ -1,6 +1,7 @@
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
SET hive.fetch.task.conversion=none;
+-- SORT_QUERY_RESULTS
create table test_vector_bround(v0 double, v1 double) stored as orc;
insert into table test_vector_bround
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/queries/clientpositive/vector_case_when_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_case_when_1.q b/ql/src/test/queries/clientpositive/vector_case_when_1.q
index 8614087..d027524 100644
--- a/ql/src/test/queries/clientpositive/vector_case_when_1.q
+++ b/ql/src/test/queries/clientpositive/vector_case_when_1.q
@@ -1,3 +1,4 @@
+-- SORT_QUERY_RESULTS
--! qt:dataset:lineitem
set hive.cli.print.header=true;
set hive.mapred.mode=nonstrict;
@@ -5,8 +6,6 @@ set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.vectorized.execution.enabled=true;
--- SORT_QUERY_RESULTS
-
CREATE TABLE lineitem_test_txt (L_ORDERKEY INT,
L_PARTKEY INT,
L_SUPPKEY INT,
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/queries/clientpositive/vector_coalesce_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_coalesce_2.q b/ql/src/test/queries/clientpositive/vector_coalesce_2.q
index a264edd..43b71cf 100644
--- a/ql/src/test/queries/clientpositive/vector_coalesce_2.q
+++ b/ql/src/test/queries/clientpositive/vector_coalesce_2.q
@@ -1,3 +1,4 @@
+-- SORT_QUERY_RESULTS
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
SET hive.vectorized.execution.enabled=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/queries/clientpositive/vector_coalesce_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_coalesce_3.q b/ql/src/test/queries/clientpositive/vector_coalesce_3.q
index 9e00bdce..44e9301 100644
--- a/ql/src/test/queries/clientpositive/vector_coalesce_3.q
+++ b/ql/src/test/queries/clientpositive/vector_coalesce_3.q
@@ -1,3 +1,4 @@
+-- SORT_QUERY_RESULTS
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
SET hive.vectorized.execution.enabled=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/queries/clientpositive/vector_interval_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_interval_1.q b/ql/src/test/queries/clientpositive/vector_interval_1.q
index 4320c88..4e98ce6 100644
--- a/ql/src/test/queries/clientpositive/vector_interval_1.q
+++ b/ql/src/test/queries/clientpositive/vector_interval_1.q
@@ -1,3 +1,4 @@
+-- SORT_QUERY_RESULTS
--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/queries/clientpositive/vectorized_parquet_types.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_parquet_types.q b/ql/src/test/queries/clientpositive/vectorized_parquet_types.q
index f5d28c4..abcf955 100644
--- a/ql/src/test/queries/clientpositive/vectorized_parquet_types.q
+++ b/ql/src/test/queries/clientpositive/vectorized_parquet_types.q
@@ -1,3 +1,4 @@
+-- SORT_QUERY_RESULTS
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.llap.cache.allow.synthetic.fileid=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
index c7a7153..fe33072 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
@@ -69,16 +69,16 @@ order by a.cint
POSTHOOK: type: QUERY
POSTHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
+-51 NULL 2089466 -240556350 -51.0 NULL cXX24dH7tblSj46j2g C31eea0wrHHqvj 1969-12-31 16:00:08.451 NULL true true -51 NULL 2089466 -240556350 -51.0 NULL cXX24dH7tblSj46j2g C31eea0wrHHqvj 1969-12-31 16:00:08.451 NULL true true
+-51 NULL 2949963 -1580871111 -51.0 NULL 0K68k3bdl7jO7 TPPAu 1969-12-31 16:00:08.451 NULL true false -51 NULL 2949963 -1580871111 -51.0 NULL 0K68k3bdl7jO7 TPPAu 1969-12-31 16:00:08.451 NULL true false
11 NULL 1000828 1531084669 11.0 NULL wM316f6NqGIkoP388j3F6 poWQQo3Upvt3Wh 1969-12-31 16:00:02.351 NULL false true 11 NULL 1000828 1531084669 11.0 NULL wM316f6NqGIkoP388j3F6 poWQQo3Upvt3Wh 1969-12-31 16:00:02.351 NULL false true
-NULL -3799 1248059 1864027286 NULL -3799.0 Uhps6mMh3IfHB3j7yH62K 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:54.622 false true NULL -3799 1248059 1864027286 NULL -3799.0 Uhps6mMh3IfHB3j7yH62K 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:54.622 false true
-NULL 10782 1286921 1864027286 NULL 10782.0 ODLrXI8882q8LS8 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:52.138 true true NULL 10782 1286921 1864027286 NULL 10782.0 ODLrXI8882q8LS8 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:52.138 true true
-NULL -13036 1288927 -1645852809 NULL -13036.0 yinBY725P7V2 xH7445Rals48VOulSyR5F NULL 1969-12-31 16:00:00.763 true false NULL -13036 1288927 -1645852809 NULL -13036.0 yinBY725P7V2 xH7445Rals48VOulSyR5F NULL 1969-12-31 16:00:00.763 true false
11 NULL 1310786 -413875656 11.0 NULL W0rvA4H1xn0xMG4uk0 8yVVjG 1969-12-31 16:00:02.351 NULL false true 11 NULL 1310786 -413875656 11.0 NULL W0rvA4H1xn0xMG4uk0 8yVVjG 1969-12-31 16:00:02.351 NULL false true
--51 NULL 2089466 -240556350 -51.0 NULL cXX24dH7tblSj46j2g C31eea0wrHHqvj 1969-12-31 16:00:08.451 NULL true true -51 NULL 2089466 -240556350 -51.0 NULL cXX24dH7tblSj46j2g C31eea0wrHHqvj 1969-12-31 16:00:08.451 NULL true true
-NULL -8915 2101183 1864027286 NULL -8915.0 x7By66525 4KWs6gw7lv2WYd66P NULL 1969-12-31 16:00:05.831 false true NULL -8915 2101183 1864027286 NULL -8915.0 x7By66525 4KWs6gw7lv2WYd66P NULL 1969-12-31 16:00:05.831 false true
8 NULL 2229621 -381406148 8.0 NULL q7onkS7QRPh5ghOK oKb0bi 1969-12-31 16:00:15.892 NULL true false 8 NULL 2229621 -381406148 8.0 NULL q7onkS7QRPh5ghOK oKb0bi 1969-12-31 16:00:15.892 NULL true false
8 NULL 2433892 -1611863517 8.0 NULL 674ILv3V2TxFqXP6wSbL VLprkK2XfX 1969-12-31 16:00:15.892 NULL false true 8 NULL 2433892 -1611863517 8.0 NULL 674ILv3V2TxFqXP6wSbL VLprkK2XfX 1969-12-31 16:00:15.892 NULL false true
--51 NULL 2949963 -1580871111 -51.0 NULL 0K68k3bdl7jO7 TPPAu 1969-12-31 16:00:08.451 NULL true false -51 NULL 2949963 -1580871111 -51.0 NULL 0K68k3bdl7jO7 TPPAu 1969-12-31 16:00:08.451 NULL true false
+NULL -13036 1288927 -1645852809 NULL -13036.0 yinBY725P7V2 xH7445Rals48VOulSyR5F NULL 1969-12-31 16:00:00.763 true false NULL -13036 1288927 -1645852809 NULL -13036.0 yinBY725P7V2 xH7445Rals48VOulSyR5F NULL 1969-12-31 16:00:00.763 true false
+NULL -3799 1248059 1864027286 NULL -3799.0 Uhps6mMh3IfHB3j7yH62K 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:54.622 false true NULL -3799 1248059 1864027286 NULL -3799.0 Uhps6mMh3IfHB3j7yH62K 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:54.622 false true
+NULL -8915 2101183 1864027286 NULL -8915.0 x7By66525 4KWs6gw7lv2WYd66P NULL 1969-12-31 16:00:05.831 false true NULL -8915 2101183 1864027286 NULL -8915.0 x7By66525 4KWs6gw7lv2WYd66P NULL 1969-12-31 16:00:05.831 false true
+NULL 10782 1286921 1864027286 NULL 10782.0 ODLrXI8882q8LS8 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:52.138 true true NULL 10782 1286921 1864027286 NULL 10782.0 ODLrXI8882q8LS8 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:52.138 true true
PREHOOK: query: explain
select
count(*)
@@ -233,8 +233,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
-13036 1
--8915 1
-3799 1
+-8915 1
10782 1
NULL 6
PREHOOK: query: explain
@@ -308,16 +308,16 @@ order by a.cint
POSTHOOK: type: QUERY
POSTHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
+-51 NULL 2089466 -240556350 -51.0 NULL cXX24dH7tblSj46j2g C31eea0wrHHqvj 1969-12-31 16:00:08.451 NULL true true -51 NULL 2089466 -240556350 -51.0 NULL cXX24dH7tblSj46j2g C31eea0wrHHqvj 1969-12-31 16:00:08.451 NULL true true
+-51 NULL 2949963 -1580871111 -51.0 NULL 0K68k3bdl7jO7 TPPAu 1969-12-31 16:00:08.451 NULL true false -51 NULL 2949963 -1580871111 -51.0 NULL 0K68k3bdl7jO7 TPPAu 1969-12-31 16:00:08.451 NULL true false
11 NULL 1000828 1531084669 11.0 NULL wM316f6NqGIkoP388j3F6 poWQQo3Upvt3Wh 1969-12-31 16:00:02.351 NULL false true 11 NULL 1000828 1531084669 11.0 NULL wM316f6NqGIkoP388j3F6 poWQQo3Upvt3Wh 1969-12-31 16:00:02.351 NULL false true
-NULL -3799 1248059 1864027286 NULL -3799.0 Uhps6mMh3IfHB3j7yH62K 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:54.622 false true NULL -3799 1248059 1864027286 NULL -3799.0 Uhps6mMh3IfHB3j7yH62K 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:54.622 false true
-NULL 10782 1286921 1864027286 NULL 10782.0 ODLrXI8882q8LS8 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:52.138 true true NULL 10782 1286921 1864027286 NULL 10782.0 ODLrXI8882q8LS8 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:52.138 true true
-NULL -13036 1288927 -1645852809 NULL -13036.0 yinBY725P7V2 xH7445Rals48VOulSyR5F NULL 1969-12-31 16:00:00.763 true false NULL -13036 1288927 -1645852809 NULL -13036.0 yinBY725P7V2 xH7445Rals48VOulSyR5F NULL 1969-12-31 16:00:00.763 true false
11 NULL 1310786 -413875656 11.0 NULL W0rvA4H1xn0xMG4uk0 8yVVjG 1969-12-31 16:00:02.351 NULL false true 11 NULL 1310786 -413875656 11.0 NULL W0rvA4H1xn0xMG4uk0 8yVVjG 1969-12-31 16:00:02.351 NULL false true
--51 NULL 2089466 -240556350 -51.0 NULL cXX24dH7tblSj46j2g C31eea0wrHHqvj 1969-12-31 16:00:08.451 NULL true true -51 NULL 2089466 -240556350 -51.0 NULL cXX24dH7tblSj46j2g C31eea0wrHHqvj 1969-12-31 16:00:08.451 NULL true true
-NULL -8915 2101183 1864027286 NULL -8915.0 x7By66525 4KWs6gw7lv2WYd66P NULL 1969-12-31 16:00:05.831 false true NULL -8915 2101183 1864027286 NULL -8915.0 x7By66525 4KWs6gw7lv2WYd66P NULL 1969-12-31 16:00:05.831 false true
8 NULL 2229621 -381406148 8.0 NULL q7onkS7QRPh5ghOK oKb0bi 1969-12-31 16:00:15.892 NULL true false 8 NULL 2229621 -381406148 8.0 NULL q7onkS7QRPh5ghOK oKb0bi 1969-12-31 16:00:15.892 NULL true false
8 NULL 2433892 -1611863517 8.0 NULL 674ILv3V2TxFqXP6wSbL VLprkK2XfX 1969-12-31 16:00:15.892 NULL false true 8 NULL 2433892 -1611863517 8.0 NULL 674ILv3V2TxFqXP6wSbL VLprkK2XfX 1969-12-31 16:00:15.892 NULL false true
--51 NULL 2949963 -1580871111 -51.0 NULL 0K68k3bdl7jO7 TPPAu 1969-12-31 16:00:08.451 NULL true false -51 NULL 2949963 -1580871111 -51.0 NULL 0K68k3bdl7jO7 TPPAu 1969-12-31 16:00:08.451 NULL true false
+NULL -13036 1288927 -1645852809 NULL -13036.0 yinBY725P7V2 xH7445Rals48VOulSyR5F NULL 1969-12-31 16:00:00.763 true false NULL -13036 1288927 -1645852809 NULL -13036.0 yinBY725P7V2 xH7445Rals48VOulSyR5F NULL 1969-12-31 16:00:00.763 true false
+NULL -3799 1248059 1864027286 NULL -3799.0 Uhps6mMh3IfHB3j7yH62K 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:54.622 false true NULL -3799 1248059 1864027286 NULL -3799.0 Uhps6mMh3IfHB3j7yH62K 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:54.622 false true
+NULL -8915 2101183 1864027286 NULL -8915.0 x7By66525 4KWs6gw7lv2WYd66P NULL 1969-12-31 16:00:05.831 false true NULL -8915 2101183 1864027286 NULL -8915.0 x7By66525 4KWs6gw7lv2WYd66P NULL 1969-12-31 16:00:05.831 false true
+NULL 10782 1286921 1864027286 NULL 10782.0 ODLrXI8882q8LS8 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:52.138 true true NULL 10782 1286921 1864027286 NULL 10782.0 ODLrXI8882q8LS8 4KWs6gw7lv2WYd66P NULL 1969-12-31 15:59:52.138 true true
PREHOOK: query: explain
select
count(*)
@@ -472,8 +472,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
-13036 1
--8915 1
-3799 1
+-8915 1
10782 1
NULL 6
Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/results/clientpositive/llap/vector_bround.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_bround.q.out b/ql/src/test/results/clientpositive/llap/vector_bround.q.out
index 02770a2..3e9a370 100644
--- a/ql/src/test/results/clientpositive/llap/vector_bround.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_bround.q.out
@@ -122,12 +122,12 @@ POSTHOOK: query: select bround(v0), bround(v1, 1) from test_vector_bround
POSTHOOK: type: QUERY
POSTHOOK: Input: default@test_vector_bround
#### A masked pattern was here ####
-2.0 1.2
-4.0 1.4
-2.0 -1.2
-4.0 -1.4
2.0 1.2
+2.0 1.2
3.0 1.3
3.0 1.3
4.0 1.4
+4.0 1.4
NULL NULL
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out b/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out
index f43c9ea..3776f3e 100644
--- a/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out
@@ -168,8 +168,8 @@ GROUP BY str2
POSTHOOK: type: QUERY
POSTHOOK: Input: default@str_str_orc
#### A masked pattern was here ####
-X 0.02
NULL 0.0
+X 0.02
y 0.0
PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION
SELECT COALESCE(str1, 0) as result
@@ -248,9 +248,9 @@ POSTHOOK: Input: default@str_str_orc
#### A masked pattern was here ####
0
0
-1
0
0
+1
PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION
SELECT
str2, ROUND(sum(cast(COALESCE(str1, 0) as int))/60, 2) as result
@@ -393,8 +393,8 @@ GROUP BY str2
POSTHOOK: type: QUERY
POSTHOOK: Input: default@str_str_orc
#### A masked pattern was here ####
-X 0.02
NULL 0.0
+X 0.02
y 0.0
PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION
SELECT COALESCE(str1, 0) as result
@@ -473,6 +473,6 @@ POSTHOOK: Input: default@str_str_orc
#### A masked pattern was here ####
0
0
-1
0
0
+1
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out b/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out
index 43c5761..6e0663c 100644
--- a/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out
@@ -170,8 +170,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
str1 _c1 _c2 _c3 _c4
-NULL 1-2 NULL 1 02:03:04.000000000 NULL
1-2 1-2 1-2 1 02:03:04.000000000 1 02:03:04.000000000
+NULL 1-2 NULL 1 02:03:04.000000000 NULL
PREHOOK: query: explain vectorization expression
select
dt,
@@ -307,8 +307,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
dt _c1 _c2 _c3 _c4 _c5 _c6
-NULL 2-4 NULL NULL 0-0 NULL NULL
2001-01-01 2-4 2-4 2-4 0-0 0-0 0-0
+NULL 2-4 NULL NULL 0-0 NULL NULL
PREHOOK: query: explain vectorization expression
select
dt,
@@ -444,8 +444,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
dt _c1 _c2 _c3 _c4 _c5 _c6
-NULL 2 04:06:08.000000000 NULL NULL 0 00:00:00.000000000 NULL NULL
2001-01-01 2 04:06:08.000000000 2 04:06:08.000000000 2 04:06:08.000000000 0 00:00:00.000000000 0 00:00:00.000000000 0 00:00:00.000000000
+NULL 2 04:06:08.000000000 NULL NULL 0 00:00:00.000000000 NULL NULL
PREHOOK: query: explain vectorization expression
select
dt,
@@ -604,8 +604,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
dt _c1 _c2 _c3 _c4 _c5 _c6 _c7 _c8 _c9 _c10 _c11 _c12
-NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
2001-01-01 2002-03-01 2002-03-01 2002-03-01 2002-03-01 1999-11-01 1999-11-01 2001-01-02 02:03:04 2001-01-02 02:03:04 2001-01-02 02:03:04 2001-01-02 02:03:04 2000-12-30 21:56:56 2000-12-30 21:56:56
+NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
PREHOOK: query: explain vectorization expression
select
ts,
@@ -764,8 +764,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
ts _c1 _c2 _c3 _c4 _c5 _c6 _c7 _c8 _c9 _c10 _c11 _c12
-NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
2001-01-01 01:02:03 2002-03-01 01:02:03 2002-03-01 01:02:03 2002-03-01 01:02:03 2002-03-01 01:02:03 1999-11-01 01:02:03 1999-11-01 01:02:03 2001-01-02 03:05:07 2001-01-02 03:05:07 2001-01-02 03:05:07 2001-01-02 03:05:07 2000-12-30 22:58:59 2000-12-30 22:58:59
+NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
PREHOOK: query: explain vectorization expression
select
ts,
@@ -888,8 +888,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
ts _c1 _c2 _c3
-NULL NULL NULL NULL
2001-01-01 01:02:03 0 00:00:00.000000000 0 00:00:00.000000000 0 00:00:00.000000000
+NULL NULL NULL NULL
PREHOOK: query: explain vectorization expression
select
dt,
@@ -1012,8 +1012,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
dt _c1 _c2 _c3
-NULL NULL NULL NULL
2001-01-01 0 00:00:00.000000000 0 00:00:00.000000000 0 00:00:00.000000000
+NULL NULL NULL NULL
PREHOOK: query: explain vectorization expression
select
dt,
@@ -1148,5 +1148,5 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
dt _c1 _c2 _c3 _c4 _c5 _c6
-NULL NULL NULL NULL NULL NULL NULL
2001-01-01 0 01:02:03.000000000 0 01:02:03.000000000 0 01:02:03.000000000 -0 01:02:03.000000000 -0 01:02:03.000000000 -0 01:02:03.000000000
+NULL NULL NULL NULL NULL NULL NULL
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out b/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
index d5cf9f5..d0d13ba 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
@@ -218,13 +218,14 @@ abcd 4 abcd 4 3.89 1
abcde 5 abcde 5 56.23 1
abcde 5 abcdef 6 90.21 1
abcde 5 abcdefg 7 6.09 1
+bcdef 5 abcde 5 90.33 1
bcdef 5 abcdefgh 8 9.44 1
cdefg 5 B4F3CAFDBE 10 77.54 1
klmno 5 abcdedef 8 25.42 1
-pqrst 5 abcdede 7 60.12 1
nopqr 5 abcded 6 49.56 1
opqrs 5 abcdd 5 80.76 1
pqrst 5 abc 3 23.23 1
+pqrst 5 abcdede 7 60.12 1
qrstu 5 b 1 1.01 1
rstuv 5 abcded 6 5.98 1
stuvw 5 abcded 6 11.22 1
@@ -232,7 +233,6 @@ tuvwx 5 abcded 6 9.88 1
uvwzy 5 abcdede 7 4.76 1
vwxyz 5 abcdede 7 12.83 1
wxyza 5 abcde 5 73.04 1
-bcdef 5 abcde 5 90.33 1
PREHOOK: query: explain vectorization expression
SELECT ctinyint,
MAX(cint),
@@ -559,13 +559,14 @@ abcd 4 abcd 4 3.89 1
abcde 5 abcde 5 56.23 1
abcde 5 abcdef 6 90.21 1
abcde 5 abcdefg 7 6.09 1
+bcdef 5 abcde 5 90.33 1
bcdef 5 abcdefgh 8 9.44 1
cdefg 5 B4F3CAFDBE 10 77.54 1
klmno 5 abcdedef 8 25.42 1
-pqrst 5 abcdede 7 60.12 1
nopqr 5 abcded 6 49.56 1
opqrs 5 abcdd 5 80.76 1
pqrst 5 abc 3 23.23 1
+pqrst 5 abcdede 7 60.12 1
qrstu 5 b 1 1.01 1
rstuv 5 abcded 6 5.98 1
stuvw 5 abcded 6 11.22 1
@@ -573,7 +574,6 @@ tuvwx 5 abcded 6 9.88 1
uvwzy 5 abcdede 7 4.76 1
vwxyz 5 abcdede 7 12.83 1
wxyza 5 abcde 5 73.04 1
-bcdef 5 abcde 5 90.33 1
PREHOOK: query: explain vectorization select max(t), min(t) from parquet_type_nodict
PREHOOK: type: QUERY
POSTHOOK: query: explain vectorization select max(t), min(t) from parquet_type_nodict
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/results/clientpositive/orc_schema_evolution_float.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_schema_evolution_float.q.out b/ql/src/test/results/clientpositive/orc_schema_evolution_float.q.out
index 1e6e473..19b5ca1 100644
--- a/ql/src/test/results/clientpositive/orc_schema_evolution_float.q.out
+++ b/ql/src/test/results/clientpositive/orc_schema_evolution_float.q.out
@@ -36,8 +36,8 @@ POSTHOOK: query: select f from float_text
POSTHOOK: type: QUERY
POSTHOOK: Input: default@float_text
#### A masked pattern was here ####
-74.72
0.22
+74.72
PREHOOK: query: alter table float_text change column f f double
PREHOOK: type: ALTERTABLE_RENAMECOL
PREHOOK: Input: default@float_text
@@ -54,8 +54,8 @@ POSTHOOK: query: select f from float_text
POSTHOOK: type: QUERY
POSTHOOK: Input: default@float_text
#### A masked pattern was here ####
-74.72
0.22
+74.72
PREHOOK: query: select f from float_text where f=74.72
PREHOOK: type: QUERY
PREHOOK: Input: default@float_text
@@ -90,8 +90,8 @@ POSTHOOK: query: select f from float_text
POSTHOOK: type: QUERY
POSTHOOK: Input: default@float_text
#### A masked pattern was here ####
-74.72000
0.22000
+74.72000
PREHOOK: query: select f from float_text where f=74.72
PREHOOK: type: QUERY
PREHOOK: Input: default@float_text
@@ -135,8 +135,8 @@ POSTHOOK: query: select f from float_orc
POSTHOOK: type: QUERY
POSTHOOK: Input: default@float_orc
#### A masked pattern was here ####
-74.72
0.22
+74.72
PREHOOK: query: alter table float_orc change column f f double
PREHOOK: type: ALTERTABLE_RENAMECOL
PREHOOK: Input: default@float_orc
@@ -153,8 +153,8 @@ POSTHOOK: query: select f from float_orc
POSTHOOK: type: QUERY
POSTHOOK: Input: default@float_orc
#### A masked pattern was here ####
-74.72
0.22
+74.72
PREHOOK: query: select f from float_orc where f=74.72
PREHOOK: type: QUERY
PREHOOK: Input: default@float_orc
@@ -207,8 +207,8 @@ POSTHOOK: query: select f from float_orc
POSTHOOK: type: QUERY
POSTHOOK: Input: default@float_orc
#### A masked pattern was here ####
-74.72000
0.22000
+74.72000
PREHOOK: query: select f from float_orc where f=74.72
PREHOOK: type: QUERY
PREHOOK: Input: default@float_orc
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/results/clientpositive/union38.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union38.q.out b/ql/src/test/results/clientpositive/union38.q.out
index 285d4a4..8fe3c7d 100644
--- a/ql/src/test/results/clientpositive/union38.q.out
+++ b/ql/src/test/results/clientpositive/union38.q.out
@@ -50,8 +50,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@union38_test1
POSTHOOK: Input: default@union38_test1_view
#### A masked pattern was here ####
-Young 1 Sydney
Jin 2 Mel
+Young 1 Sydney
PREHOOK: query: create table union38_test2( name String, id int, address String)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -186,10 +186,10 @@ POSTHOOK: Input: default@union38_test1
POSTHOOK: Input: default@union38_test2
POSTHOOK: Input: default@union38_test_view1
#### A masked pattern was here ####
-Young 1 Sydney
-Jin 2 Mel
Eun 3 Bri
+Jin 2 Mel
Kim 4 Ad
+Young 1 Sydney
PREHOOK: query: create view union38_test_view2 as with union38_tmp_1 as ( select * from union38_test1 ), union38_tmp_2 as (select * from union38_test2 ) select * from union38_tmp_1 union select * from union38_tmp_2
PREHOOK: type: CREATEVIEW
PREHOOK: Input: default@union38_test1
@@ -248,10 +248,10 @@ POSTHOOK: Input: default@union38_test1
POSTHOOK: Input: default@union38_test2
POSTHOOK: Input: default@union38_test_view3
#### A masked pattern was here ####
-Young 1 Sydney
-Jin 2 Mel
Eun 3 Bri
+Jin 2 Mel
Kim 4 Ad
+Young 1 Sydney
PREHOOK: query: create table union38_test_table1 as with union38_tmp_1 as ( select * from union38_test1 ), union38_tmp_2 as (select * from union38_test2 ) select * from union38_tmp_1 union all select * from union38_tmp_2
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@union38_test1
@@ -275,7 +275,7 @@ POSTHOOK: query: select * from union38_test_table1
POSTHOOK: type: QUERY
POSTHOOK: Input: default@union38_test_table1
#### A masked pattern was here ####
-Young 1 Sydney
-Jin 2 Mel
Eun 3 Bri
+Jin 2 Mel
Kim 4 Ad
+Young 1 Sydney
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/results/clientpositive/vector_bround.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_bround.q.out b/ql/src/test/results/clientpositive/vector_bround.q.out
index 68086c2..6dcc0f1 100644
--- a/ql/src/test/results/clientpositive/vector_bround.q.out
+++ b/ql/src/test/results/clientpositive/vector_bround.q.out
@@ -118,12 +118,12 @@ POSTHOOK: query: select bround(v0), bround(v1, 1) from test_vector_bround
POSTHOOK: type: QUERY
POSTHOOK: Input: default@test_vector_bround
#### A masked pattern was here ####
-2.0 1.2
-4.0 1.4
-2.0 -1.2
-4.0 -1.4
2.0 1.2
+2.0 1.2
3.0 1.3
3.0 1.3
4.0 1.4
+4.0 1.4
NULL NULL
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/results/clientpositive/vector_coalesce_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_coalesce_2.q.out b/ql/src/test/results/clientpositive/vector_coalesce_2.q.out
index 6030750..918ac59 100644
--- a/ql/src/test/results/clientpositive/vector_coalesce_2.q.out
+++ b/ql/src/test/results/clientpositive/vector_coalesce_2.q.out
@@ -218,9 +218,9 @@ POSTHOOK: Input: default@str_str_orc
#### A masked pattern was here ####
0
0
-1
0
0
+1
PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION
SELECT
str2, ROUND(sum(cast(COALESCE(str1, 0) as int))/60, 2) as result
@@ -413,6 +413,6 @@ POSTHOOK: Input: default@str_str_orc
#### A masked pattern was here ####
0
0
-1
0
0
+1
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/results/clientpositive/vector_interval_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_interval_1.q.out b/ql/src/test/results/clientpositive/vector_interval_1.q.out
index 7bbd4a7..9a2a18a 100644
--- a/ql/src/test/results/clientpositive/vector_interval_1.q.out
+++ b/ql/src/test/results/clientpositive/vector_interval_1.q.out
@@ -152,8 +152,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
str1 _c1 _c2 _c3 _c4
-NULL 1-2 NULL 1 02:03:04.000000000 NULL
1-2 1-2 1-2 1 02:03:04.000000000 1 02:03:04.000000000
+NULL 1-2 NULL 1 02:03:04.000000000 NULL
PREHOOK: query: explain vectorization expression
select
dt,
@@ -271,8 +271,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
dt _c1 _c2 _c3 _c4 _c5 _c6
-NULL 2-4 NULL NULL 0-0 NULL NULL
2001-01-01 2-4 2-4 2-4 0-0 0-0 0-0
+NULL 2-4 NULL NULL 0-0 NULL NULL
PREHOOK: query: explain vectorization expression
select
dt,
@@ -390,8 +390,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
dt _c1 _c2 _c3 _c4 _c5 _c6
-NULL 2 04:06:08.000000000 NULL NULL 0 00:00:00.000000000 NULL NULL
2001-01-01 2 04:06:08.000000000 2 04:06:08.000000000 2 04:06:08.000000000 0 00:00:00.000000000 0 00:00:00.000000000 0 00:00:00.000000000
+NULL 2 04:06:08.000000000 NULL NULL 0 00:00:00.000000000 NULL NULL
PREHOOK: query: explain vectorization expression
select
dt,
@@ -533,8 +533,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
dt _c1 _c2 _c3 _c4 _c5 _c6 _c7 _c8 _c9 _c10 _c11 _c12
-NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
2001-01-01 2002-03-01 2002-03-01 2002-03-01 2002-03-01 1999-11-01 1999-11-01 2001-01-02 02:03:04 2001-01-02 02:03:04 2001-01-02 02:03:04 2001-01-02 02:03:04 2000-12-30 21:56:56 2000-12-30 21:56:56
+NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
PREHOOK: query: explain vectorization expression
select
ts,
@@ -676,8 +676,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
ts _c1 _c2 _c3 _c4 _c5 _c6 _c7 _c8 _c9 _c10 _c11 _c12
-NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
2001-01-01 01:02:03 2002-03-01 01:02:03 2002-03-01 01:02:03 2002-03-01 01:02:03 2002-03-01 01:02:03 1999-11-01 01:02:03 1999-11-01 01:02:03 2001-01-02 03:05:07 2001-01-02 03:05:07 2001-01-02 03:05:07 2001-01-02 03:05:07 2000-12-30 22:58:59 2000-12-30 22:58:59
+NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
PREHOOK: query: explain vectorization expression
select
ts,
@@ -783,8 +783,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
ts _c1 _c2 _c3
-NULL NULL NULL NULL
2001-01-01 01:02:03 0 00:00:00.000000000 0 00:00:00.000000000 0 00:00:00.000000000
+NULL NULL NULL NULL
PREHOOK: query: explain vectorization expression
select
dt,
@@ -890,8 +890,8 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
dt _c1 _c2 _c3
-NULL NULL NULL NULL
2001-01-01 0 00:00:00.000000000 0 00:00:00.000000000 0 00:00:00.000000000
+NULL NULL NULL NULL
PREHOOK: query: explain vectorization expression
select
dt,
@@ -1009,5 +1009,5 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@vector_interval_1
#### A masked pattern was here ####
dt _c1 _c2 _c3 _c4 _c5 _c6
-NULL NULL NULL NULL NULL NULL NULL
2001-01-01 0 01:02:03.000000000 0 01:02:03.000000000 0 01:02:03.000000000 -0 01:02:03.000000000 -0 01:02:03.000000000 -0 01:02:03.000000000
+NULL NULL NULL NULL NULL NULL NULL
http://git-wip-us.apache.org/repos/asf/hive/blob/5016d6f0/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out b/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out
index 9429b04..c1f2d54 100644
--- a/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out
+++ b/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out
@@ -286,13 +286,14 @@ abcd 4 abcd 4 3.89 1
abcde 5 abcde 5 56.23 1
abcde 5 abcdef 6 90.21 1
abcde 5 abcdefg 7 6.09 1
+bcdef 5 abcde 5 90.33 1
bcdef 5 abcdefgh 8 9.44 1
cdefg 5 B4F3CAFDBE 10 77.54 1
klmno 5 abcdedef 8 25.42 1
-pqrst 5 abcdede 7 60.12 1
nopqr 5 abcded 6 49.56 1
opqrs 5 abcdd 5 80.76 1
pqrst 5 abc 3 23.23 1
+pqrst 5 abcdede 7 60.12 1
qrstu 5 b 1 1.01 1
rstuv 5 abcded 6 5.98 1
stuvw 5 abcded 6 11.22 1
@@ -300,7 +301,6 @@ tuvwx 5 abcded 6 9.88 1
uvwzy 5 abcdede 7 4.76 1
vwxyz 5 abcdede 7 12.83 1
wxyza 5 abcde 5 73.04 1
-bcdef 5 abcde 5 90.33 1
PREHOOK: query: explain vectorization expression
SELECT ctinyint,
MAX(cint),
@@ -685,13 +685,14 @@ abcd 4 abcd 4 3.89 1
abcde 5 abcde 5 56.23 1
abcde 5 abcdef 6 90.21 1
abcde 5 abcdefg 7 6.09 1
+bcdef 5 abcde 5 90.33 1
bcdef 5 abcdefgh 8 9.44 1
cdefg 5 B4F3CAFDBE 10 77.54 1
klmno 5 abcdedef 8 25.42 1
-pqrst 5 abcdede 7 60.12 1
nopqr 5 abcded 6 49.56 1
opqrs 5 abcdd 5 80.76 1
pqrst 5 abc 3 23.23 1
+pqrst 5 abcdede 7 60.12 1
qrstu 5 b 1 1.01 1
rstuv 5 abcded 6 5.98 1
stuvw 5 abcded 6 11.22 1
@@ -699,7 +700,6 @@ tuvwx 5 abcded 6 9.88 1
uvwzy 5 abcdede 7 4.76 1
vwxyz 5 abcdede 7 12.83 1
wxyza 5 abcde 5 73.04 1
-bcdef 5 abcde 5 90.33 1
PREHOOK: query: explain vectorization select max(t), min(t) from parquet_type_nodict
PREHOOK: type: QUERY
POSTHOOK: query: explain vectorization select max(t), min(t) from parquet_type_nodict