hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject [22/50] [abbrv] hive git commit: HIVE-19275: Vectorization: Defer Wrong Results / Execution Failures when Vectorization turned on (Matt McCline, reviewed by Vihang Karajgaonkar)
Date Thu, 26 Apr 2018 14:58:46 GMT
HIVE-19275: Vectorization: Defer Wrong Results / Execution Failures when Vectorization turned on (Matt McCline, reviewed by Vihang Karajgaonkar)


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

Branch: refs/heads/storage-branch-2.6
Commit: f552e745bd21012a081f1a7e26a7e299f37e24d2
Parents: 211baae
Author: Matt McCline <mmccline@hortonworks.com>
Authored: Mon Apr 23 23:05:36 2018 -0500
Committer: Matt McCline <mmccline@hortonworks.com>
Committed: Mon Apr 23 23:05:36 2018 -0500

----------------------------------------------------------------------
 ql/src/test/queries/clientpositive/auto_join_without_localtask.q   | 1 +
 ql/src/test/queries/clientpositive/avro_decimal_native.q           | 2 ++
 ql/src/test/queries/clientpositive/bucket_map_join_spark1.q        | 1 +
 ql/src/test/queries/clientpositive/bucket_map_join_spark2.q        | 1 +
 ql/src/test/queries/clientpositive/bucket_map_join_spark3.q        | 1 +
 ql/src/test/queries/clientpositive/bucket_map_join_spark4.q        | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin1.q                | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin10.q               | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin11.q               | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin12.q               | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin13.q               | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin2.q                | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin3.q                | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin4.q                | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin5.q                | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin6.q                | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin7.q                | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin8.q                | 1 +
 ql/src/test/queries/clientpositive/bucketmapjoin9.q                | 2 ++
 ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q   | 1 +
 ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q   | 1 +
 ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q   | 1 +
 ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q   | 1 +
 ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q   | 1 +
 ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q   | 1 +
 ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q   | 1 +
 ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q   | 1 +
 ql/src/test/queries/clientpositive/decimal_join.q                  | 1 +
 ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q   | 1 +
 ql/src/test/queries/clientpositive/dynamic_partition_insert.q      | 1 +
 ql/src/test/queries/clientpositive/dynamic_partition_pruning.q     | 1 +
 ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q   | 1 +
 .../test/queries/clientpositive/dynamic_partition_skip_default.q   | 1 +
 ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q   | 1 +
 ql/src/test/queries/clientpositive/dynpart_sort_optimization.q     | 1 +
 ql/src/test/queries/clientpositive/explainanalyze_1.q              | 1 +
 ql/src/test/queries/clientpositive/explainanalyze_2.q              | 1 +
 ql/src/test/queries/clientpositive/explainanalyze_3.q              | 1 +
 ql/src/test/queries/clientpositive/explainanalyze_4.q              | 1 +
 ql/src/test/queries/clientpositive/explainanalyze_5.q              | 1 +
 ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q | 1 +
 .../queries/clientpositive/insert_values_dynamic_partitioned.q     | 1 +
 ql/src/test/queries/clientpositive/join0.q                         | 1 +
 ql/src/test/queries/clientpositive/lineage1.q                      | 1 +
 ql/src/test/queries/clientpositive/lineage2.q                      | 1 +
 ql/src/test/queries/clientpositive/lineage3.q                      | 1 +
 ql/src/test/queries/clientpositive/mapjoin1.q                      | 1 +
 ql/src/test/queries/clientpositive/mapjoin46.q                     | 1 +
 ql/src/test/queries/clientpositive/mapjoin_addjar.q                | 2 +-
 ql/src/test/queries/clientpositive/mapjoin_decimal.q               | 1 +
 ql/src/test/queries/clientpositive/merge_dynamic_partition.q       | 1 +
 ql/src/test/queries/clientpositive/merge_dynamic_partition2.q      | 1 +
 ql/src/test/queries/clientpositive/merge_dynamic_partition3.q      | 1 +
 ql/src/test/queries/clientpositive/merge_dynamic_partition4.q      | 1 +
 ql/src/test/queries/clientpositive/merge_dynamic_partition5.q      | 1 +
 ql/src/test/queries/clientpositive/multi_count_distinct.q          | 1 +
 ql/src/test/queries/clientpositive/nullgroup.q                     | 1 +
 ql/src/test/queries/clientpositive/offset_limit.q                  | 1 +
 ql/src/test/queries/clientpositive/offset_limit_ppd_optimizer.q    | 1 +
 ql/src/test/queries/clientpositive/orc_ppd_basic.q                 | 1 +
 ql/src/test/queries/clientpositive/orc_ppd_decimal.q               | 1 +
 ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q        | 1 +
 ql/src/test/queries/clientpositive/parallel_join0.q                | 1 +
 ql/src/test/queries/clientpositive/retry_failure.q                 | 1 +
 ql/src/test/queries/clientpositive/semijoin.q                      | 1 +
 ql/src/test/queries/clientpositive/skewjoin.q                      | 1 +
 ql/src/test/queries/clientpositive/skiphf_aggr.q                   | 1 +
 .../test/queries/clientpositive/spark_dynamic_partition_pruning.q  | 1 +
 .../queries/clientpositive/spark_dynamic_partition_pruning_2.q     | 1 +
 .../queries/clientpositive/spark_dynamic_partition_pruning_3.q     | 1 +
 .../queries/clientpositive/spark_dynamic_partition_pruning_4.q     | 1 +
 .../queries/clientpositive/spark_dynamic_partition_pruning_5.q     | 1 +
 .../queries/clientpositive/spark_dynamic_partition_pruning_6.q     | 1 +
 .../clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q  | 1 +
 .../spark_dynamic_partition_pruning_recursive_mapjoin.q            | 1 +
 ql/src/test/queries/clientpositive/tez-tag.q                       | 1 +
 ql/src/test/queries/clientpositive/tez_join_result_complex.q       | 1 +
 ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q   | 1 +
 ql/src/test/queries/clientpositive/tez_union_dynamic_partition_2.q | 1 +
 79 files changed, 81 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/auto_join_without_localtask.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join_without_localtask.q b/ql/src/test/queries/clientpositive/auto_join_without_localtask.q
index ba3eeae..15697f2 100644
--- a/ql/src/test/queries/clientpositive/auto_join_without_localtask.q
+++ b/ql/src/test/queries/clientpositive/auto_join_without_localtask.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecutePrinter,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
 set hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/avro_decimal_native.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/avro_decimal_native.q b/ql/src/test/queries/clientpositive/avro_decimal_native.q
index b9a4163..69a8904 100644
--- a/ql/src/test/queries/clientpositive/avro_decimal_native.q
+++ b/ql/src/test/queries/clientpositive/avro_decimal_native.q
@@ -1,3 +1,5 @@
+SET hive.vectorized.execution.enabled=false;
+
 DROP TABLE IF EXISTS `dec`;
 
 CREATE TABLE `dec` (

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucket_map_join_spark1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_spark1.q b/ql/src/test/queries/clientpositive/bucket_map_join_spark1.q
index aefffb2..16b555d 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_spark1.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_spark1.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucket_map_join_spark2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_spark2.q b/ql/src/test/queries/clientpositive/bucket_map_join_spark2.q
index 4fec66f..d8b6561 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_spark2.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_spark2.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucket_map_join_spark3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_spark3.q b/ql/src/test/queries/clientpositive/bucket_map_join_spark3.q
index 36697e8..2adb777 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_spark3.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_spark3.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q b/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q
index 3ae141b..f3dc097 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 ;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin1.q b/ql/src/test/queries/clientpositive/bucketmapjoin1.q
index 90cdc3f..e04c120 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin1.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin1.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin10.q b/ql/src/test/queries/clientpositive/bucketmapjoin10.q
index a0051b5..25141c1 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin10.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin10.q
@@ -1,4 +1,5 @@
 --! qt:dataset:part
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin11.q b/ql/src/test/queries/clientpositive/bucketmapjoin11.q
index 633e388..361a162 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin11.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin11.q
@@ -1,4 +1,5 @@
 --! qt:dataset:part
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin12.q b/ql/src/test/queries/clientpositive/bucketmapjoin12.q
index 2615f3e..103bdc3 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin12.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin12.q
@@ -1,4 +1,5 @@
 --! qt:dataset:part
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin13.q b/ql/src/test/queries/clientpositive/bucketmapjoin13.q
index db437b8..0766b3b 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin13.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin13.q
@@ -1,5 +1,6 @@
 --! qt:dataset:src
 --! qt:dataset:part
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max=1;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin2.q b/ql/src/test/queries/clientpositive/bucketmapjoin2.q
index 121ca56..cff3a8c 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin2.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin2.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin3.q b/ql/src/test/queries/clientpositive/bucketmapjoin3.q
index 1e747bb..5904068 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin3.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin3.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin4.q b/ql/src/test/queries/clientpositive/bucketmapjoin4.q
index 16e71ac..d882a38 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin4.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin4.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin5.q b/ql/src/test/queries/clientpositive/bucketmapjoin5.q
index 7455e1e..7b09e7a 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin5.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin5.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin6.q b/ql/src/test/queries/clientpositive/bucketmapjoin6.q
index 29ced26..13e46e6 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin6.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin6.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin7.q b/ql/src/test/queries/clientpositive/bucketmapjoin7.q
index d467ca4..cbd690f 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin7.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin7.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 set hive.cbo.enable=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin8.q b/ql/src/test/queries/clientpositive/bucketmapjoin8.q
index 4be81c5..15c52db 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin8.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin8.q
@@ -1,4 +1,5 @@
 --! qt:dataset:part
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketmapjoin9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin9.q b/ql/src/test/queries/clientpositive/bucketmapjoin9.q
index c9539f5..d6ebd06 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin9.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin9.q
@@ -1,4 +1,6 @@
 --! qt:dataset:part
+
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
index 5c04de5..d5791e1 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
index 67eddf0..fadd178 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
index ee12ab2..7c44d70 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
index 2f99ed7..4189c54 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
index 94ea013..c9c617d 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
index 3cee1a6..af2ab96 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
index 2d4dc93..1b344da 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
index af88d52..b9492eb 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/decimal_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_join.q b/ql/src/test/queries/clientpositive/decimal_join.q
index c6d5571..201b91e 100644
--- a/ql/src/test/queries/clientpositive/decimal_join.q
+++ b/ql/src/test/queries/clientpositive/decimal_join.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 -- HIVE-5292 Join on decimal columns fails
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q b/ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q
index 8d9f5c1..71d1c56 100644
--- a/ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q
+++ b/ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q
@@ -1,4 +1,5 @@
 --! qt:dataset:alltypesorc
+SET hive.vectorized.execution.enabled=false;
 CREATE TABLE druid_partitioned_table_0
         STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler'
         TBLPROPERTIES (

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/dynamic_partition_insert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_partition_insert.q b/ql/src/test/queries/clientpositive/dynamic_partition_insert.q
index ade593d..ab70ff1 100644
--- a/ql/src/test/queries/clientpositive/dynamic_partition_insert.q
+++ b/ql/src/test/queries/clientpositive/dynamic_partition_insert.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 CREATE TABLE t1 (c1 BIGINT, c2 STRING);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q b/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
index 7819fdc..52d1c26 100644
--- a/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
+++ b/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
@@ -1,4 +1,5 @@
 --! qt:dataset:srcpart
+SET hive.vectorized.execution.enabled=false;
 set hive.compute.query.using.stats=false;
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q b/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q
index 009cf53..f3d94d5 100644
--- a/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q
+++ b/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q
@@ -1,4 +1,5 @@
 --! qt:dataset:srcpart
+SET hive.vectorized.execution.enabled=false;
 set hive.explain.user=false;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q b/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q
index 8fa03ac..b9a6e07 100644
--- a/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q
+++ b/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 create table dynamic_part_table(intcol string) partitioned by (partcol1 string, partcol2 string);
 
 set hive.exec.dynamic.partition.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q b/ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q
index 224c511..e9d0109 100644
--- a/ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q
+++ b/ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q
@@ -1,5 +1,6 @@
 --! qt:dataset:srcpart
 --! qt:dataset:alltypesorc
+SET hive.vectorized.execution.enabled=false;
 set hive.explain.user=true;
 set hive.compute.query.using.stats=false;
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q b/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q
index d07f016..3f35b81 100644
--- a/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q
+++ b/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.compute.query.using.stats=false;
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/explainanalyze_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainanalyze_1.q b/ql/src/test/queries/clientpositive/explainanalyze_1.q
index b59e734..9a2b9c5 100644
--- a/ql/src/test/queries/clientpositive/explainanalyze_1.q
+++ b/ql/src/test/queries/clientpositive/explainanalyze_1.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.map.aggr=false;
 set hive.mapred.mode=nonstrict;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/explainanalyze_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainanalyze_2.q b/ql/src/test/queries/clientpositive/explainanalyze_2.q
index e708664..10b605f 100644
--- a/ql/src/test/queries/clientpositive/explainanalyze_2.q
+++ b/ql/src/test/queries/clientpositive/explainanalyze_2.q
@@ -1,6 +1,7 @@
 --! qt:dataset:srcpart
 --! qt:dataset:src1
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.map.aggr=false;
 
 set hive.strict.checks.bucketing=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/explainanalyze_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainanalyze_3.q b/ql/src/test/queries/clientpositive/explainanalyze_3.q
index 647f8db..d5583db 100644
--- a/ql/src/test/queries/clientpositive/explainanalyze_3.q
+++ b/ql/src/test/queries/clientpositive/explainanalyze_3.q
@@ -1,5 +1,6 @@
 --! qt:dataset:srcpart
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.map.aggr=false;
 
 set hive.strict.checks.bucketing=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/explainanalyze_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainanalyze_4.q b/ql/src/test/queries/clientpositive/explainanalyze_4.q
index cf8b864..6daba22 100644
--- a/ql/src/test/queries/clientpositive/explainanalyze_4.q
+++ b/ql/src/test/queries/clientpositive/explainanalyze_4.q
@@ -1,4 +1,5 @@
 --! qt:dataset:alltypesorc
+SET hive.vectorized.execution.enabled=false;
 set hive.map.aggr=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/explainanalyze_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainanalyze_5.q b/ql/src/test/queries/clientpositive/explainanalyze_5.q
index 17f26ca..5f2c840 100644
--- a/ql/src/test/queries/clientpositive/explainanalyze_5.q
+++ b/ql/src/test/queries/clientpositive/explainanalyze_5.q
@@ -1,6 +1,7 @@
 --! qt:dataset:src1
 --! qt:dataset:src
 --! qt:dataset:alltypesorc
+SET hive.vectorized.execution.enabled=false;
 set hive.map.aggr=false;
 
 set hive.stats.column.autogather=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q b/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q
index f36294d..80553d5 100644
--- a/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q
+++ b/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q
@@ -1,4 +1,5 @@
 --! qt:dataset:alltypesorc
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q b/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q
index 24a4f78..291871a 100644
--- a/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q
+++ b/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.support.concurrency=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join0.q b/ql/src/test/queries/clientpositive/join0.q
index d099ea7..0fce78c 100644
--- a/ql/src/test/queries/clientpositive/join0.q
+++ b/ql/src/test/queries/clientpositive/join0.q
@@ -1,5 +1,6 @@
 --! qt:dataset:src1
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/lineage1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage1.q b/ql/src/test/queries/clientpositive/lineage1.q
index 3a03876..e7e9b4e 100644
--- a/ql/src/test/queries/clientpositive/lineage1.q
+++ b/ql/src/test/queries/clientpositive/lineage1.q
@@ -1,5 +1,6 @@
 --! qt:dataset:src1
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/lineage2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage2.q b/ql/src/test/queries/clientpositive/lineage2.q
index 298116f..4299e74 100644
--- a/ql/src/test/queries/clientpositive/lineage2.q
+++ b/ql/src/test/queries/clientpositive/lineage2.q
@@ -1,5 +1,6 @@
 --! qt:dataset:src1
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.LineageLogger;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/lineage3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage3.q b/ql/src/test/queries/clientpositive/lineage3.q
index 50e9c84..86c40f0 100644
--- a/ql/src/test/queries/clientpositive/lineage3.q
+++ b/ql/src/test/queries/clientpositive/lineage3.q
@@ -1,5 +1,6 @@
 --! qt:dataset:src1
 --! qt:dataset:alltypesorc
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.LineageLogger;
 set hive.metastore.disallow.incompatible.col.type.changes=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/mapjoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin1.q b/ql/src/test/queries/clientpositive/mapjoin1.q
index 5e955f3..ad14112 100644
--- a/ql/src/test/queries/clientpositive/mapjoin1.q
+++ b/ql/src/test/queries/clientpositive/mapjoin1.q
@@ -1,6 +1,7 @@
 --! qt:dataset:srcpart
 --! qt:dataset:src
 
+SET hive.vectorized.execution.enabled=false;
 set hive.auto.convert.join=true;
 SELECT  /*+ MAPJOIN(b) */ sum(a.key) as sum_a
     FROM srcpart a

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/mapjoin46.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin46.q b/ql/src/test/queries/clientpositive/mapjoin46.q
index 348dd67..b7aa092 100644
--- a/ql/src/test/queries/clientpositive/mapjoin46.q
+++ b/ql/src/test/queries/clientpositive/mapjoin46.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.auto.convert.join=true;
 set hive.strict.checks.cartesian.product=false;
 set hive.join.emit.interval=2;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/mapjoin_addjar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_addjar.q b/ql/src/test/queries/clientpositive/mapjoin_addjar.q
index 1d71512..cc8bb8b 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_addjar.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_addjar.q
@@ -1,4 +1,4 @@
-
+SET hive.vectorized.execution.enabled=false;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.use.nonstaged=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/mapjoin_decimal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_decimal.q b/ql/src/test/queries/clientpositive/mapjoin_decimal.q
index b562484..29eae50 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_decimal.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_decimal.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_dynamic_partition.q b/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
index 3c0fda1..26a7931 100644
--- a/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
+++ b/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
@@ -1,4 +1,5 @@
 --! qt:dataset:srcpart
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q b/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q
index 0378e01..6bfa5d9 100644
--- a/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q
+++ b/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q
@@ -1,4 +1,5 @@
 --! qt:dataset:srcpart
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q b/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q
index 1ede6da..e3070b1 100644
--- a/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q
+++ b/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q
@@ -1,4 +1,5 @@
 --! qt:dataset:srcpart
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q b/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
index b950a53..f94db72 100644
--- a/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
+++ b/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
@@ -1,4 +1,5 @@
 --! qt:dataset:srcpart
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q b/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
index 7278869..d96c94c 100644
--- a/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
+++ b/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
@@ -1,4 +1,5 @@
 --! qt:dataset:srcpart
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/multi_count_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_count_distinct.q b/ql/src/test/queries/clientpositive/multi_count_distinct.q
index fb0c5fe..038be3e 100644
--- a/ql/src/test/queries/clientpositive/multi_count_distinct.q
+++ b/ql/src/test/queries/clientpositive/multi_count_distinct.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 
 drop table employee;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/nullgroup.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup.q b/ql/src/test/queries/clientpositive/nullgroup.q
index 7dd134b..064d1e2 100644
--- a/ql/src/test/queries/clientpositive/nullgroup.q
+++ b/ql/src/test/queries/clientpositive/nullgroup.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/offset_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/offset_limit.q b/ql/src/test/queries/clientpositive/offset_limit.q
index eb97bcf..2927d3a 100644
--- a/ql/src/test/queries/clientpositive/offset_limit.q
+++ b/ql/src/test/queries/clientpositive/offset_limit.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 EXPLAIN
 SELECT src.key, sum(substr(src.value,5)) FROM src GROUP BY src.key ORDER BY src.key LIMIT 10,10;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/offset_limit_ppd_optimizer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/offset_limit_ppd_optimizer.q b/ql/src/test/queries/clientpositive/offset_limit_ppd_optimizer.q
index 1a600e3..18eb979 100644
--- a/ql/src/test/queries/clientpositive/offset_limit_ppd_optimizer.q
+++ b/ql/src/test/queries/clientpositive/offset_limit_ppd_optimizer.q
@@ -1,5 +1,6 @@
 --! qt:dataset:src
 --! qt:dataset:alltypesorc
+SET hive.vectorized.execution.enabled=false;
 set hive.explain.user=false;
 set hive.limit.pushdown.memory.usage=0.3f;
 set hive.optimize.reducededuplication.min.reducer=1;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/orc_ppd_basic.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_basic.q b/ql/src/test/queries/clientpositive/orc_ppd_basic.q
index dfd89a7..fb2efce 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_basic.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_basic.q
@@ -1,4 +1,5 @@
 --! qt:dataset:alltypesorc
+SET hive.vectorized.execution.enabled=false;
 set hive.compute.query.using.stats=false;
 set hive.mapred.mode=nonstrict;
 SET hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/orc_ppd_decimal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_decimal.q b/ql/src/test/queries/clientpositive/orc_ppd_decimal.q
index 91faa19..abfd452 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_decimal.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_decimal.q
@@ -1,5 +1,6 @@
 --! qt:dataset:src1
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;
 SET mapred.max.split.size=5000;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q b/ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q
index 1c0119f..e4a9268 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 SET hive.fetch.task.conversion=none;
 SET hive.cbo.enable=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/parallel_join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parallel_join0.q b/ql/src/test/queries/clientpositive/parallel_join0.q
index 544a5a1..c89e7d1 100644
--- a/ql/src/test/queries/clientpositive/parallel_join0.q
+++ b/ql/src/test/queries/clientpositive/parallel_join0.q
@@ -1,5 +1,6 @@
 --! qt:dataset:src1
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set mapreduce.job.reduces=4;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/retry_failure.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/retry_failure.q b/ql/src/test/queries/clientpositive/retry_failure.q
index ddc575f..dec584b 100644
--- a/ql/src/test/queries/clientpositive/retry_failure.q
+++ b/ql/src/test/queries/clientpositive/retry_failure.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 create table tx(a int,f string);
 insert into tx values (1,'non_existent_file');
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/semijoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/semijoin.q b/ql/src/test/queries/clientpositive/semijoin.q
index 9df6bc2..6c6135c 100644
--- a/ql/src/test/queries/clientpositive/semijoin.q
+++ b/ql/src/test/queries/clientpositive/semijoin.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/skewjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin.q b/ql/src/test/queries/clientpositive/skewjoin.q
index 9972edd..6e35e48 100644
--- a/ql/src/test/queries/clientpositive/skewjoin.q
+++ b/ql/src/test/queries/clientpositive/skewjoin.q
@@ -1,5 +1,6 @@
 --! qt:dataset:src1
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.optimize.skewjoin = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/skiphf_aggr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skiphf_aggr.q b/ql/src/test/queries/clientpositive/skiphf_aggr.q
index fcd0b35..846ad1f 100644
--- a/ql/src/test/queries/clientpositive/skiphf_aggr.q
+++ b/ql/src/test/queries/clientpositive/skiphf_aggr.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 DROP TABLE IF EXISTS skipHTbl;
 
 CREATE TABLE skipHTbl (a int) 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q
index 285d7c2..962d162 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q
@@ -1,4 +1,5 @@
 --! qt:dataset:srcpart
+SET hive.vectorized.execution.enabled=false;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;
 set hive.spark.dynamic.partition.pruning=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q
index 2483424..415af97 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q
@@ -1,4 +1,5 @@
 --! qt:dataset:srcpart
+SET hive.vectorized.execution.enabled=false;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;
 set hive.spark.dynamic.partition.pruning=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_3.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_3.q
index 2d622ae..4a245f9 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_3.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_3.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.stats.deserialization.factor=1.0;
 CREATE TABLE partitioned_table1 (col int) PARTITIONED BY (part_col int);
 CREATE TABLE partitioned_table2 (col int) PARTITIONED BY (part_col int);

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q
index 4e8bd1a..ec32c65 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.spark.dynamic.partition.pruning=true;
 set hive.combine.equivalent.work.optimization=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q
index c5c6a95..2b74f3d 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 set hive.spark.dynamic.partition.pruning=true;
 
 -- This qfile tests whether we can handle nested DPP sinks

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_6.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_6.q
index 381b2f9..19284fd 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_6.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_6.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.spark.dynamic.partition.pruning=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q
index 468dea4..dde6d1a 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q
@@ -1,4 +1,5 @@
 --! qt:dataset:srcpart
+SET hive.vectorized.execution.enabled=false;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;
 set hive.optimize.metadataonly=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_recursive_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_recursive_mapjoin.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_recursive_mapjoin.q
index 5e19b97..51278e9 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_recursive_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_recursive_mapjoin.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 SET hive.spark.dynamic.partition.pruning=true;
 SET hive.auto.convert.join=true;
 SET hive.strict.checks.cartesian.product=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/tez-tag.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez-tag.q b/ql/src/test/queries/clientpositive/tez-tag.q
index 795927f..b71fd47 100644
--- a/ql/src/test/queries/clientpositive/tez-tag.q
+++ b/ql/src/test/queries/clientpositive/tez-tag.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src1
+SET hive.vectorized.execution.enabled=false;
 set hive.strict.checks.bucketing=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/tez_join_result_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join_result_complex.q b/ql/src/test/queries/clientpositive/tez_join_result_complex.q
index cef8dc7..a77c44d 100644
--- a/ql/src/test/queries/clientpositive/tez_join_result_complex.q
+++ b/ql/src/test/queries/clientpositive/tez_join_result_complex.q
@@ -1,4 +1,5 @@
 --! qt:dataset:src
+SET hive.vectorized.execution.enabled=false;
 SET hive.auto.convert.join=true;
 SET hive.auto.convert.join.noconditionaltask=true;
 SET hive.auto.convert.join.noconditionaltask.size=1000000000;

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q b/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
index 782fc1e..e9efba4 100644
--- a/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
+++ b/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 create table dummy(i int);

http://git-wip-us.apache.org/repos/asf/hive/blob/f552e745/ql/src/test/queries/clientpositive/tez_union_dynamic_partition_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union_dynamic_partition_2.q b/ql/src/test/queries/clientpositive/tez_union_dynamic_partition_2.q
index e8cfb3a..7107b0b 100644
--- a/ql/src/test/queries/clientpositive/tez_union_dynamic_partition_2.q
+++ b/ql/src/test/queries/clientpositive/tez_union_dynamic_partition_2.q
@@ -1,3 +1,4 @@
+SET hive.vectorized.execution.enabled=false;
 drop table if exists dummy;
 drop table if exists partunion1;
  


Mime
View raw message