diff --git ql/src/test/queries/clientpositive/auto_join_without_localtask.q ql/src/test/queries/clientpositive/auto_join_without_localtask.q index ba3eeae..15697f2 100644 --- ql/src/test/queries/clientpositive/auto_join_without_localtask.q +++ 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; diff --git ql/src/test/queries/clientpositive/avro_decimal_native.q ql/src/test/queries/clientpositive/avro_decimal_native.q index b9a4163..69a8904 100644 --- ql/src/test/queries/clientpositive/avro_decimal_native.q +++ 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` ( diff --git ql/src/test/queries/clientpositive/bucket_map_join_spark1.q ql/src/test/queries/clientpositive/bucket_map_join_spark1.q index aefffb2..16b555d 100644 --- ql/src/test/queries/clientpositive/bucket_map_join_spark1.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucket_map_join_spark2.q ql/src/test/queries/clientpositive/bucket_map_join_spark2.q index 4fec66f..d8b6561 100644 --- ql/src/test/queries/clientpositive/bucket_map_join_spark2.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucket_map_join_spark3.q ql/src/test/queries/clientpositive/bucket_map_join_spark3.q index 36697e8..2adb777 100644 --- ql/src/test/queries/clientpositive/bucket_map_join_spark3.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucket_map_join_spark4.q ql/src/test/queries/clientpositive/bucket_map_join_spark4.q index 3ae141b..f3dc097 100644 --- ql/src/test/queries/clientpositive/bucket_map_join_spark4.q +++ 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; ; diff --git ql/src/test/queries/clientpositive/bucketmapjoin1.q ql/src/test/queries/clientpositive/bucketmapjoin1.q index 90cdc3f..e04c120 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin1.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketmapjoin10.q ql/src/test/queries/clientpositive/bucketmapjoin10.q index a0051b5..25141c1 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin10.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketmapjoin11.q ql/src/test/queries/clientpositive/bucketmapjoin11.q index 633e388..361a162 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin11.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketmapjoin12.q ql/src/test/queries/clientpositive/bucketmapjoin12.q index 2615f3e..103bdc3 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin12.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketmapjoin13.q ql/src/test/queries/clientpositive/bucketmapjoin13.q index db437b8..0766b3b 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin13.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketmapjoin2.q ql/src/test/queries/clientpositive/bucketmapjoin2.q index 121ca56..cff3a8c 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin2.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketmapjoin3.q ql/src/test/queries/clientpositive/bucketmapjoin3.q index 1e747bb..5904068 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin3.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketmapjoin4.q ql/src/test/queries/clientpositive/bucketmapjoin4.q index 16e71ac..d882a38 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin4.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketmapjoin5.q ql/src/test/queries/clientpositive/bucketmapjoin5.q index 7455e1e..7b09e7a 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin5.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketmapjoin6.q ql/src/test/queries/clientpositive/bucketmapjoin6.q index 29ced26..13e46e6 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin6.q +++ 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 diff --git ql/src/test/queries/clientpositive/bucketmapjoin7.q ql/src/test/queries/clientpositive/bucketmapjoin7.q index d467ca4..cbd690f 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin7.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketmapjoin8.q ql/src/test/queries/clientpositive/bucketmapjoin8.q index 4be81c5..15c52db 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin8.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketmapjoin9.q ql/src/test/queries/clientpositive/bucketmapjoin9.q index c9539f5..d6ebd06 100644 --- ql/src/test/queries/clientpositive/bucketmapjoin9.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q index 5c04de5..d5791e1 100644 --- ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q index 67eddf0..fadd178 100644 --- ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q index ee12ab2..7c44d70 100644 --- ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q index 2f99ed7..4189c54 100644 --- ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q index 94ea013..c9c617d 100644 --- ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q index 3cee1a6..af2ab96 100644 --- ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q index 2d4dc93..1b344da 100644 --- ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q +++ 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; diff --git ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q index af88d52..b9492eb 100644 --- ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q +++ 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; diff --git ql/src/test/queries/clientpositive/decimal_join.q ql/src/test/queries/clientpositive/decimal_join.q index c6d5571..201b91e 100644 --- ql/src/test/queries/clientpositive/decimal_join.q +++ 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 diff --git ql/src/test/queries/clientpositive/join0.q ql/src/test/queries/clientpositive/join0.q index d099ea7..0fce78c 100644 --- ql/src/test/queries/clientpositive/join0.q +++ 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 diff --git ql/src/test/queries/clientpositive/mapjoin1.q ql/src/test/queries/clientpositive/mapjoin1.q index 5e955f3..ad14112 100644 --- ql/src/test/queries/clientpositive/mapjoin1.q +++ 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 diff --git ql/src/test/queries/clientpositive/mapjoin_addjar.q ql/src/test/queries/clientpositive/mapjoin_addjar.q index 1d71512..cc8bb8b 100644 --- ql/src/test/queries/clientpositive/mapjoin_addjar.q +++ 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; diff --git ql/src/test/queries/clientpositive/mapjoin_decimal.q ql/src/test/queries/clientpositive/mapjoin_decimal.q index b562484..29eae50 100644 --- ql/src/test/queries/clientpositive/mapjoin_decimal.q +++ 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; diff --git ql/src/test/queries/clientpositive/nullgroup.q ql/src/test/queries/clientpositive/nullgroup.q index 7dd134b..064d1e2 100644 --- ql/src/test/queries/clientpositive/nullgroup.q +++ 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; diff --git ql/src/test/queries/clientpositive/parallel_join0.q ql/src/test/queries/clientpositive/parallel_join0.q index 544a5a1..c89e7d1 100644 --- ql/src/test/queries/clientpositive/parallel_join0.q +++ 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; diff --git ql/src/test/queries/clientpositive/semijoin.q ql/src/test/queries/clientpositive/semijoin.q index 9df6bc2..6c6135c 100644 --- ql/src/test/queries/clientpositive/semijoin.q +++ 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 diff --git ql/src/test/queries/clientpositive/skewjoin.q ql/src/test/queries/clientpositive/skewjoin.q index 9972edd..6e35e48 100644 --- ql/src/test/queries/clientpositive/skewjoin.q +++ 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;