diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 02367eb..17ef57f 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -3004,12 +3004,12 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal "2. better : use vectorized IF expression classes that conditionally execute THEN/ELSE\n" + " expressions for better performance.\n"), HIVE_TEST_VECTORIZATION_ENABLED_OVERRIDE("hive.test.vectorized.execution.enabled.override", - "none", new StringSet("none", "enable", "disable"), + "enable", new StringSet("none", "enable", "disable"), "internal use only, used to override the hive.vectorized.execution.enabled setting and\n" + "turn off vectorization. The default is false, of course", true), HIVE_TEST_VECTORIZATION_SUPPRESS_EXPLAIN_EXECUTION_MODE( - "hive.test.vectorization.suppress.explain.execution.mode", false, + "hive.test.vectorization.suppress.explain.execution.mode", true, "internal use only, used to suppress \"Execution mode: vectorized\" EXPLAIN display.\n" + "The default is false, of course", true), diff --git ql/src/test/queries/clientpositive/cbo_rp_windowing.q ql/src/test/queries/clientpositive/cbo_rp_windowing.q index edd19c9..8e81b12 100644 --- ql/src/test/queries/clientpositive/cbo_rp_windowing.q +++ ql/src/test/queries/clientpositive/cbo_rp_windowing.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.cbo.enable=true; set hive.cbo.returnpath.hiveop=true; diff --git ql/src/test/queries/clientpositive/cbo_rp_windowing_2.q ql/src/test/queries/clientpositive/cbo_rp_windowing_2.q index 6362be3..2c2ff5c 100644 --- ql/src/test/queries/clientpositive/cbo_rp_windowing_2.q +++ ql/src/test/queries/clientpositive/cbo_rp_windowing_2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.cbo.enable=true; set hive.cbo.returnpath.hiveop=true; diff --git ql/src/test/queries/clientpositive/cbo_windowing.q ql/src/test/queries/clientpositive/cbo_windowing.q index 4fb0351..447d79e 100644 --- ql/src/test/queries/clientpositive/cbo_windowing.q +++ ql/src/test/queries/clientpositive/cbo_windowing.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.cbo.enable=true; set hive.exec.check.crossproducts=false; diff --git ql/src/test/queries/clientpositive/distinct_windowing.q ql/src/test/queries/clientpositive/distinct_windowing.q index ca863cb..1bef163 100644 --- ql/src/test/queries/clientpositive/distinct_windowing.q +++ ql/src/test/queries/clientpositive/distinct_windowing.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/distinct_windowing_no_cbo.q ql/src/test/queries/clientpositive/distinct_windowing_no_cbo.q index 36f071f..56a296a 100644 --- ql/src/test/queries/clientpositive/distinct_windowing_no_cbo.q +++ ql/src/test/queries/clientpositive/distinct_windowing_no_cbo.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.cbo.enable=false; drop table over10k; diff --git ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q index 9d20123..346b021 100644 --- ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q +++ ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + CREATE TABLE druid_partitioned_table_0 STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler' TBLPROPERTIES ( diff --git ql/src/test/queries/clientpositive/dynamic_partition_insert.q ql/src/test/queries/clientpositive/dynamic_partition_insert.q index ef04a45..c272581 100644 --- ql/src/test/queries/clientpositive/dynamic_partition_insert.q +++ ql/src/test/queries/clientpositive/dynamic_partition_insert.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + CREATE TABLE t1 (c1 BIGINT, c2 STRING); CREATE TABLE t2 (c1 INT, c2 STRING) diff --git ql/src/test/queries/clientpositive/dynamic_partition_pruning.q ql/src/test/queries/clientpositive/dynamic_partition_pruning.q index 9145a36..8361316 100644 --- ql/src/test/queries/clientpositive/dynamic_partition_pruning.q +++ ql/src/test/queries/clientpositive/dynamic_partition_pruning.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; diff --git ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q index b8b04ee..a63d82f 100644 --- ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q +++ ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.explain.user=false; set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=true; diff --git ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q index 699e58e..2e3bcd3 100644 --- ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q +++ ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q @@ -1,3 +1,5 @@ +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; diff --git ql/src/test/queries/clientpositive/escape_crlf.q ql/src/test/queries/clientpositive/escape_crlf.q index 2d6e05e..5272b93 100644 --- ql/src/test/queries/clientpositive/escape_crlf.q +++ ql/src/test/queries/clientpositive/escape_crlf.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + DROP TABLE IF EXISTS base_tab; CREATE TABLE base_tab(a STRING, b STRING) ROW FORMAT DELIMITED diff --git ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q index 2025d53..ebf2086 100644 --- ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q +++ ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q @@ -1,3 +1,4 @@ +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; diff --git ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q index 24a4f78..291871a 100644 --- ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q +++ 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; diff --git ql/src/test/queries/clientpositive/join46.q ql/src/test/queries/clientpositive/join46.q index a661c0f..17673cc 100644 --- ql/src/test/queries/clientpositive/join46.q +++ ql/src/test/queries/clientpositive/join46.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.strict.checks.cartesian.product=false; set hive.join.emit.interval=2; diff --git ql/src/test/queries/clientpositive/leftsemijoin.q ql/src/test/queries/clientpositive/leftsemijoin.q index 8974219..b1d631d 100644 --- ql/src/test/queries/clientpositive/leftsemijoin.q +++ ql/src/test/queries/clientpositive/leftsemijoin.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + -- SORT_QUERY_RESULTS drop table sales; diff --git ql/src/test/queries/clientpositive/leftsemijoin_mr.q ql/src/test/queries/clientpositive/leftsemijoin_mr.q index c9ebe0e..f43518d 100644 --- ql/src/test/queries/clientpositive/leftsemijoin_mr.q +++ ql/src/test/queries/clientpositive/leftsemijoin_mr.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + CREATE TABLE T1(key INT); LOAD DATA LOCAL INPATH '../../data/files/leftsemijoin_mr_t1.txt' INTO TABLE T1; CREATE TABLE T2(key INT); diff --git ql/src/test/queries/clientpositive/mapjoin46.q ql/src/test/queries/clientpositive/mapjoin46.q index 348dd67..b7aa092 100644 --- ql/src/test/queries/clientpositive/mapjoin46.q +++ 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; diff --git ql/src/test/queries/clientpositive/merge_dynamic_partition.q ql/src/test/queries/clientpositive/merge_dynamic_partition.q index f70d1c2..056340c 100644 --- ql/src/test/queries/clientpositive/merge_dynamic_partition.q +++ ql/src/test/queries/clientpositive/merge_dynamic_partition.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/merge_dynamic_partition2.q ql/src/test/queries/clientpositive/merge_dynamic_partition2.q index e61b615..53bd40e 100644 --- ql/src/test/queries/clientpositive/merge_dynamic_partition2.q +++ ql/src/test/queries/clientpositive/merge_dynamic_partition2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.strict.checks.bucketing=false; set hive.exec.dynamic.partition=true; diff --git ql/src/test/queries/clientpositive/merge_dynamic_partition3.q ql/src/test/queries/clientpositive/merge_dynamic_partition3.q index 8caf933..f3316e2 100644 --- ql/src/test/queries/clientpositive/merge_dynamic_partition3.q +++ ql/src/test/queries/clientpositive/merge_dynamic_partition3.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.strict.checks.bucketing=false; set hive.exec.dynamic.partition=true; diff --git ql/src/test/queries/clientpositive/merge_dynamic_partition4.q ql/src/test/queries/clientpositive/merge_dynamic_partition4.q index 9be7f16..5689687 100644 --- ql/src/test/queries/clientpositive/merge_dynamic_partition4.q +++ ql/src/test/queries/clientpositive/merge_dynamic_partition4.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/merge_dynamic_partition5.q ql/src/test/queries/clientpositive/merge_dynamic_partition5.q index 89a8849..430bbf0 100644 --- ql/src/test/queries/clientpositive/merge_dynamic_partition5.q +++ ql/src/test/queries/clientpositive/merge_dynamic_partition5.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/orc_analyze.q ql/src/test/queries/clientpositive/orc_analyze.q index 5202c07..1a156d0 100644 --- ql/src/test/queries/clientpositive/orc_analyze.q +++ ql/src/test/queries/clientpositive/orc_analyze.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.exec.submitviachild=false; set hive.exec.submit.local.task.via.child=false; diff --git ql/src/test/queries/clientpositive/orc_avro_partition_uniontype.q ql/src/test/queries/clientpositive/orc_avro_partition_uniontype.q index 47ac526..8bcd954 100644 --- ql/src/test/queries/clientpositive/orc_avro_partition_uniontype.q +++ ql/src/test/queries/clientpositive/orc_avro_partition_uniontype.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; SET hive.exec.schema.evolution = false; CREATE TABLE avro_orc_partitioned_uniontype (a uniontype) PARTITIONED BY (b int) STORED AS ORC; diff --git ql/src/test/queries/clientpositive/orc_create.q ql/src/test/queries/clientpositive/orc_create.q index 0647200..b91c15f 100644 --- ql/src/test/queries/clientpositive/orc_create.q +++ ql/src/test/queries/clientpositive/orc_create.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + -- SORT_QUERY_RESULTS DROP TABLE orc_create; diff --git ql/src/test/queries/clientpositive/orc_createas1.q ql/src/test/queries/clientpositive/orc_createas1.q index b39d65d..fc4ed04 100644 --- ql/src/test/queries/clientpositive/orc_createas1.q +++ ql/src/test/queries/clientpositive/orc_createas1.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set mapred.max.split.size=100; set mapred.min.split.size=1; diff --git ql/src/test/queries/clientpositive/orc_dictionary_threshold.q ql/src/test/queries/clientpositive/orc_dictionary_threshold.q index a0eaab7..90bab28 100644 --- ql/src/test/queries/clientpositive/orc_dictionary_threshold.q +++ ql/src/test/queries/clientpositive/orc_dictionary_threshold.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.exec.orc.dictionary.key.size.threshold=-1; -- Set the threshold to -1 to guarantee dictionary encoding is turned off diff --git ql/src/test/queries/clientpositive/orc_diff_part_cols.q ql/src/test/queries/clientpositive/orc_diff_part_cols.q index 3bfdf99..af76569 100644 --- ql/src/test/queries/clientpositive/orc_diff_part_cols.q +++ ql/src/test/queries/clientpositive/orc_diff_part_cols.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + -- SORT_QUERY_RESULTS CREATE TABLE test_orc (key STRING) diff --git ql/src/test/queries/clientpositive/orc_diff_part_cols2.q ql/src/test/queries/clientpositive/orc_diff_part_cols2.q index 3fe42bb..66c6366 100644 --- ql/src/test/queries/clientpositive/orc_diff_part_cols2.q +++ ql/src/test/queries/clientpositive/orc_diff_part_cols2.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- Create a table with one column, write to it, then add an additional column -- This can break reads diff --git ql/src/test/queries/clientpositive/orc_empty_files.q ql/src/test/queries/clientpositive/orc_empty_files.q index dd0e81a..4f2e6cd 100644 --- ql/src/test/queries/clientpositive/orc_empty_files.q +++ ql/src/test/queries/clientpositive/orc_empty_files.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + CREATE TABLE test_orc (key STRING, cnt INT) CLUSTERED BY (key) INTO 3 BUCKETS ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' diff --git ql/src/test/queries/clientpositive/orc_empty_strings.q ql/src/test/queries/clientpositive/orc_empty_strings.q index c69414a..0a18f7e 100644 --- ql/src/test/queries/clientpositive/orc_empty_strings.q +++ ql/src/test/queries/clientpositive/orc_empty_strings.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- SORT_QUERY_RESULTS CREATE TABLE test_orc (key STRING) diff --git ql/src/test/queries/clientpositive/orc_empty_table.q ql/src/test/queries/clientpositive/orc_empty_table.q index 05bba28..0f992ed 100644 --- ql/src/test/queries/clientpositive/orc_empty_table.q +++ ql/src/test/queries/clientpositive/orc_empty_table.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + CREATE TABLE test_orc_empty_table_with_struct (struct_field STRUCT) STORED AS ORC; SELECT count(*) FROM test_orc_empty_table_with_struct; diff --git ql/src/test/queries/clientpositive/orc_ends_with_nulls.q ql/src/test/queries/clientpositive/orc_ends_with_nulls.q index 83c5a05..457b25d 100644 --- ql/src/test/queries/clientpositive/orc_ends_with_nulls.q +++ ql/src/test/queries/clientpositive/orc_ends_with_nulls.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + CREATE TABLE test_orc (key STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' diff --git ql/src/test/queries/clientpositive/orc_file_dump.q ql/src/test/queries/clientpositive/orc_file_dump.q index 07c755c..8d29274 100644 --- ql/src/test/queries/clientpositive/orc_file_dump.q +++ ql/src/test/queries/clientpositive/orc_file_dump.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + CREATE TABLE staging(t tinyint, si smallint, i int, diff --git ql/src/test/queries/clientpositive/orc_int_type_promotion.q ql/src/test/queries/clientpositive/orc_int_type_promotion.q index 9be46f0..0821726 100644 --- ql/src/test/queries/clientpositive/orc_int_type_promotion.q +++ ql/src/test/queries/clientpositive/orc_int_type_promotion.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.metastore.disallow.incompatible.col.type.changes=false; create table if not exists alltypes ( diff --git ql/src/test/queries/clientpositive/orc_merge1.q ql/src/test/queries/clientpositive/orc_merge1.q index f704a1c..104ac42d 100644 --- ql/src/test/queries/clientpositive/orc_merge1.q +++ ql/src/test/queries/clientpositive/orc_merge1.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; diff --git ql/src/test/queries/clientpositive/orc_merge10.q ql/src/test/queries/clientpositive/orc_merge10.q index b84ed80..6b18529 100644 --- ql/src/test/queries/clientpositive/orc_merge10.q +++ ql/src/test/queries/clientpositive/orc_merge10.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; diff --git ql/src/test/queries/clientpositive/orc_merge11.q ql/src/test/queries/clientpositive/orc_merge11.q index a10cca3..88f66ed 100644 --- ql/src/test/queries/clientpositive/orc_merge11.q +++ ql/src/test/queries/clientpositive/orc_merge11.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + DROP TABLE orcfile_merge1; DROP TABLE orc_split_elim; diff --git ql/src/test/queries/clientpositive/orc_merge12.q ql/src/test/queries/clientpositive/orc_merge12.q index ed17cea..7f331cf 100644 --- ql/src/test/queries/clientpositive/orc_merge12.q +++ ql/src/test/queries/clientpositive/orc_merge12.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + CREATE TABLE `alltypesorc3xcols`( `atinyint` tinyint, `asmallint` smallint, diff --git ql/src/test/queries/clientpositive/orc_merge13.q ql/src/test/queries/clientpositive/orc_merge13.q index 8f013a0..01e54b0 100644 --- ql/src/test/queries/clientpositive/orc_merge13.q +++ ql/src/test/queries/clientpositive/orc_merge13.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + drop table aa; create table aa (a string, b int) stored as orc; insert into table aa values("b",2); diff --git ql/src/test/queries/clientpositive/orc_merge2.q ql/src/test/queries/clientpositive/orc_merge2.q index 667e878..3c2a572 100644 --- ql/src/test/queries/clientpositive/orc_merge2.q +++ ql/src/test/queries/clientpositive/orc_merge2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; set hive.merge.orcfile.stripe.level=true; diff --git ql/src/test/queries/clientpositive/orc_merge3.q ql/src/test/queries/clientpositive/orc_merge3.q index d5230b1..7c5fa19 100644 --- ql/src/test/queries/clientpositive/orc_merge3.q +++ ql/src/test/queries/clientpositive/orc_merge3.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; set hive.merge.orcfile.stripe.level=true; diff --git ql/src/test/queries/clientpositive/orc_merge4.q ql/src/test/queries/clientpositive/orc_merge4.q index 0f91641..d97eced 100644 --- ql/src/test/queries/clientpositive/orc_merge4.q +++ ql/src/test/queries/clientpositive/orc_merge4.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; set hive.merge.orcfile.stripe.level=true; diff --git ql/src/test/queries/clientpositive/orc_merge5.q ql/src/test/queries/clientpositive/orc_merge5.q index c24c407..04e9a73 100644 --- ql/src/test/queries/clientpositive/orc_merge5.q +++ ql/src/test/queries/clientpositive/orc_merge5.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.explain.user=false; + -- SORT_QUERY_RESULTS create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc; diff --git ql/src/test/queries/clientpositive/orc_merge6.q ql/src/test/queries/clientpositive/orc_merge6.q index 1612a8b..37c8edd 100644 --- ql/src/test/queries/clientpositive/orc_merge6.q +++ ql/src/test/queries/clientpositive/orc_merge6.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.explain.user=false; + -- SORT_QUERY_RESULTS -- orc file merge tests for static partitions diff --git ql/src/test/queries/clientpositive/orc_merge7.q ql/src/test/queries/clientpositive/orc_merge7.q index 49b81bf..e1a1d63 100644 --- ql/src/test/queries/clientpositive/orc_merge7.q +++ ql/src/test/queries/clientpositive/orc_merge7.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.explain.user=false; + -- SORT_QUERY_RESULTS -- orc merge file tests for dynamic partition case diff --git ql/src/test/queries/clientpositive/orc_merge8.q ql/src/test/queries/clientpositive/orc_merge8.q index 30a892b..a69bb5b 100644 --- ql/src/test/queries/clientpositive/orc_merge8.q +++ ql/src/test/queries/clientpositive/orc_merge8.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + create table if not exists alltypes ( bo boolean, ti tinyint, diff --git ql/src/test/queries/clientpositive/orc_merge9.q ql/src/test/queries/clientpositive/orc_merge9.q index 5f387ba..9134164 100644 --- ql/src/test/queries/clientpositive/orc_merge9.q +++ ql/src/test/queries/clientpositive/orc_merge9.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + create table ts_merge ( userid bigint, string1 string, diff --git ql/src/test/queries/clientpositive/orc_merge_diff_fs.q ql/src/test/queries/clientpositive/orc_merge_diff_fs.q index 94c0e6a..674e8a5 100644 --- ql/src/test/queries/clientpositive/orc_merge_diff_fs.q +++ ql/src/test/queries/clientpositive/orc_merge_diff_fs.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; diff --git ql/src/test/queries/clientpositive/orc_merge_incompat1.q ql/src/test/queries/clientpositive/orc_merge_incompat1.q index b9f6246..2e72713 100644 --- ql/src/test/queries/clientpositive/orc_merge_incompat1.q +++ ql/src/test/queries/clientpositive/orc_merge_incompat1.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.explain.user=false; + -- SORT_QUERY_RESULTS create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc; diff --git ql/src/test/queries/clientpositive/orc_merge_incompat2.q ql/src/test/queries/clientpositive/orc_merge_incompat2.q index 4d8674f..808e5e1 100644 --- ql/src/test/queries/clientpositive/orc_merge_incompat2.q +++ ql/src/test/queries/clientpositive/orc_merge_incompat2.q @@ -1,5 +1,7 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; + -- SORT_QUERY_RESULTS -- orc merge file tests for dynamic partition case diff --git ql/src/test/queries/clientpositive/orc_merge_incompat3.q ql/src/test/queries/clientpositive/orc_merge_incompat3.q index d6be111..50e7b87 100644 --- ql/src/test/queries/clientpositive/orc_merge_incompat3.q +++ ql/src/test/queries/clientpositive/orc_merge_incompat3.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + create table concat_incompat like alltypesorc; load data local inpath '../../data/files/alltypesorc' into table concat_incompat; diff --git ql/src/test/queries/clientpositive/orc_merge_incompat_schema.q ql/src/test/queries/clientpositive/orc_merge_incompat_schema.q index 2396194..c889418 100644 --- ql/src/test/queries/clientpositive/orc_merge_incompat_schema.q +++ ql/src/test/queries/clientpositive/orc_merge_incompat_schema.q @@ -1,5 +1,4 @@ SET hive.vectorized.execution.enabled=false; - set hive.metastore.disallow.incompatible.col.type.changes=false; CREATE TABLE orc_create_staging ( diff --git ql/src/test/queries/clientpositive/orc_merge_incompat_writer_version.q ql/src/test/queries/clientpositive/orc_merge_incompat_writer_version.q index 5e188f7..726c72a 100644 --- ql/src/test/queries/clientpositive/orc_merge_incompat_writer_version.q +++ ql/src/test/queries/clientpositive/orc_merge_incompat_writer_version.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + DROP TABLE part_orc; CREATE TABLE part_orc( p_partkey int, diff --git ql/src/test/queries/clientpositive/orc_min_max.q ql/src/test/queries/clientpositive/orc_min_max.q index b81adf2..d769e7a 100644 --- ql/src/test/queries/clientpositive/orc_min_max.q +++ ql/src/test/queries/clientpositive/orc_min_max.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + create table if not exists alltypes ( bo boolean, ti tinyint, diff --git ql/src/test/queries/clientpositive/orc_mr_pathalias.q ql/src/test/queries/clientpositive/orc_mr_pathalias.q index b92bb9c..e683839 100644 --- ql/src/test/queries/clientpositive/orc_mr_pathalias.q +++ ql/src/test/queries/clientpositive/orc_mr_pathalias.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + create database if not exists test; drop table if exists test.test_orc_src; drop table if exists test.test_orc_src2; diff --git ql/src/test/queries/clientpositive/orc_ppd_basic.q ql/src/test/queries/clientpositive/orc_ppd_basic.q index 1c9e4dd..360f045 100644 --- ql/src/test/queries/clientpositive/orc_ppd_basic.q +++ ql/src/test/queries/clientpositive/orc_ppd_basic.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.fetch.task.conversion=none; diff --git ql/src/test/queries/clientpositive/orc_ppd_boolean.q ql/src/test/queries/clientpositive/orc_ppd_boolean.q index d344714..3e304da 100644 --- ql/src/test/queries/clientpositive/orc_ppd_boolean.q +++ ql/src/test/queries/clientpositive/orc_ppd_boolean.q @@ -1,3 +1,4 @@ +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; diff --git ql/src/test/queries/clientpositive/orc_ppd_char.q ql/src/test/queries/clientpositive/orc_ppd_char.q index 5c34d04..c0c3d8d 100644 --- ql/src/test/queries/clientpositive/orc_ppd_char.q +++ ql/src/test/queries/clientpositive/orc_ppd_char.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; SET mapred.min.split.size=1000; diff --git ql/src/test/queries/clientpositive/orc_ppd_date.q ql/src/test/queries/clientpositive/orc_ppd_date.q index 3d21d41..067ad36 100644 --- ql/src/test/queries/clientpositive/orc_ppd_date.q +++ ql/src/test/queries/clientpositive/orc_ppd_date.q @@ -1,3 +1,4 @@ +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; diff --git ql/src/test/queries/clientpositive/orc_ppd_decimal.q ql/src/test/queries/clientpositive/orc_ppd_decimal.q index a54b862..268d5ae 100644 --- ql/src/test/queries/clientpositive/orc_ppd_decimal.q +++ ql/src/test/queries/clientpositive/orc_ppd_decimal.q @@ -1,3 +1,4 @@ +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; diff --git ql/src/test/queries/clientpositive/orc_ppd_exception.q ql/src/test/queries/clientpositive/orc_ppd_exception.q index 1513d91..f4a79bf 100644 --- ql/src/test/queries/clientpositive/orc_ppd_exception.q +++ ql/src/test/queries/clientpositive/orc_ppd_exception.q @@ -1,3 +1,4 @@ +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; diff --git ql/src/test/queries/clientpositive/orc_ppd_is_null.q ql/src/test/queries/clientpositive/orc_ppd_is_null.q index 862a961..539475b 100644 --- ql/src/test/queries/clientpositive/orc_ppd_is_null.q +++ ql/src/test/queries/clientpositive/orc_ppd_is_null.q @@ -1,3 +1,4 @@ +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; diff --git ql/src/test/queries/clientpositive/orc_ppd_same_table_multiple_aliases.q ql/src/test/queries/clientpositive/orc_ppd_same_table_multiple_aliases.q index 3b72c14..06c55c2 100644 --- ql/src/test/queries/clientpositive/orc_ppd_same_table_multiple_aliases.q +++ ql/src/test/queries/clientpositive/orc_ppd_same_table_multiple_aliases.q @@ -1,4 +1,7 @@ --- SORT_QUERY_RESULTS; +SET hive.vectorized.execution.enabled=false; + +-- SORT_QUERY_RESULTS + set hive.optimize.index.filter=true; create table test_table(number int) stored as ORC; diff --git ql/src/test/queries/clientpositive/orc_ppd_schema_evol_1a.q ql/src/test/queries/clientpositive/orc_ppd_schema_evol_1a.q index 60408db..809f77c 100644 --- ql/src/test/queries/clientpositive/orc_ppd_schema_evol_1a.q +++ ql/src/test/queries/clientpositive/orc_ppd_schema_evol_1a.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.cli.print.header=true; set hive.metastore.disallow.incompatible.col.type.changes=true; set hive.optimize.ppd=false; diff --git ql/src/test/queries/clientpositive/orc_ppd_schema_evol_1b.q ql/src/test/queries/clientpositive/orc_ppd_schema_evol_1b.q index c1be125..fa33f85 100644 --- ql/src/test/queries/clientpositive/orc_ppd_schema_evol_1b.q +++ ql/src/test/queries/clientpositive/orc_ppd_schema_evol_1b.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.cli.print.header=true; set hive.metastore.disallow.incompatible.col.type.changes=true; set hive.optimize.ppd=false; diff --git ql/src/test/queries/clientpositive/orc_ppd_schema_evol_2a.q ql/src/test/queries/clientpositive/orc_ppd_schema_evol_2a.q index 8951496..69f07b2 100644 --- ql/src/test/queries/clientpositive/orc_ppd_schema_evol_2a.q +++ ql/src/test/queries/clientpositive/orc_ppd_schema_evol_2a.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.cli.print.header=true; set hive.metastore.disallow.incompatible.col.type.changes=false; set hive.optimize.ppd=false; diff --git ql/src/test/queries/clientpositive/orc_ppd_schema_evol_2b.q ql/src/test/queries/clientpositive/orc_ppd_schema_evol_2b.q index f6e3133..a191709 100644 --- ql/src/test/queries/clientpositive/orc_ppd_schema_evol_2b.q +++ ql/src/test/queries/clientpositive/orc_ppd_schema_evol_2b.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.cli.print.header=true; set hive.metastore.disallow.incompatible.col.type.changes=false; set hive.optimize.ppd=false; diff --git ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q index 1c0119f..e4a9268 100644 --- ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q +++ 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; diff --git ql/src/test/queries/clientpositive/orc_ppd_str_conversion.q ql/src/test/queries/clientpositive/orc_ppd_str_conversion.q index 768e3f7..b6df963 100644 --- ql/src/test/queries/clientpositive/orc_ppd_str_conversion.q +++ ql/src/test/queries/clientpositive/orc_ppd_str_conversion.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.cbo.enable=false; create table orc_test( col1 varchar(15), col2 char(10)) stored as orc; diff --git ql/src/test/queries/clientpositive/orc_ppd_timestamp.q ql/src/test/queries/clientpositive/orc_ppd_timestamp.q index dafd6cf..47c98d3 100644 --- ql/src/test/queries/clientpositive/orc_ppd_timestamp.q +++ ql/src/test/queries/clientpositive/orc_ppd_timestamp.q @@ -1,3 +1,4 @@ +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; diff --git ql/src/test/queries/clientpositive/orc_ppd_varchar.q ql/src/test/queries/clientpositive/orc_ppd_varchar.q index 0fecc66..0c7e747 100644 --- ql/src/test/queries/clientpositive/orc_ppd_varchar.q +++ ql/src/test/queries/clientpositive/orc_ppd_varchar.q @@ -1,3 +1,4 @@ +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; diff --git ql/src/test/queries/clientpositive/orc_predicate_pushdown.q ql/src/test/queries/clientpositive/orc_predicate_pushdown.q index 9be815e..f6d9fb3 100644 --- ql/src/test/queries/clientpositive/orc_predicate_pushdown.q +++ ql/src/test/queries/clientpositive/orc_predicate_pushdown.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + -- SORT_QUERY_RESULTS CREATE TABLE orc_pred(t tinyint, diff --git ql/src/test/queries/clientpositive/orc_remove_cols.q ql/src/test/queries/clientpositive/orc_remove_cols.q index c3c95f3..96e81f4 100644 --- ql/src/test/queries/clientpositive/orc_remove_cols.q +++ ql/src/test/queries/clientpositive/orc_remove_cols.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; SET hive.exec.schema.evolution=false; set hive.fetch.task.conversion=more; set hive.mapred.mode=nonstrict; diff --git ql/src/test/queries/clientpositive/orc_schema_evolution.q ql/src/test/queries/clientpositive/orc_schema_evolution.q index aa6fc58..0f2f6cf 100644 --- ql/src/test/queries/clientpositive/orc_schema_evolution.q +++ ql/src/test/queries/clientpositive/orc_schema_evolution.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; SET hive.exec.schema.evolution=true; diff --git ql/src/test/queries/clientpositive/orc_schema_evolution_float.q ql/src/test/queries/clientpositive/orc_schema_evolution_float.q index 6316324..794733c 100644 --- ql/src/test/queries/clientpositive/orc_schema_evolution_float.q +++ ql/src/test/queries/clientpositive/orc_schema_evolution_float.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.optimize.index.filter=false; set hive.metastore.disallow.incompatible.col.type.changes=false; diff --git ql/src/test/queries/clientpositive/orc_split_elimination.q ql/src/test/queries/clientpositive/orc_split_elimination.q index 0d99f046..0e719d6 100644 --- ql/src/test/queries/clientpositive/orc_split_elimination.q +++ ql/src/test/queries/clientpositive/orc_split_elimination.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- SORT_QUERY_RESULTS create table orc_split_elim (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc; diff --git ql/src/test/queries/clientpositive/orc_wide_table.q ql/src/test/queries/clientpositive/orc_wide_table.q index d2ec385..13ec893 100644 --- ql/src/test/queries/clientpositive/orc_wide_table.q +++ ql/src/test/queries/clientpositive/orc_wide_table.q @@ -1,5 +1,7 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.stats.column.autogather=false; + drop table if exists test_txt; drop table if exists test_orc; create table test_txt( diff --git ql/src/test/queries/clientpositive/parquet_analyze.q ql/src/test/queries/clientpositive/parquet_analyze.q index 0d7543e..ba65033 100644 --- ql/src/test/queries/clientpositive/parquet_analyze.q +++ ql/src/test/queries/clientpositive/parquet_analyze.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + CREATE TABLE parquet_create_people_staging ( id int, first_name string, diff --git ql/src/test/queries/clientpositive/parquet_array_map_emptynullvals.q ql/src/test/queries/clientpositive/parquet_array_map_emptynullvals.q index eeae5cf..e45436a 100644 --- ql/src/test/queries/clientpositive/parquet_array_map_emptynullvals.q +++ ql/src/test/queries/clientpositive/parquet_array_map_emptynullvals.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + drop table if exists testSets; drop table if exists testSets2; create table testSets ( diff --git ql/src/test/queries/clientpositive/parquet_array_null_element.q ql/src/test/queries/clientpositive/parquet_array_null_element.q index d711d26..57a6adc 100644 --- ql/src/test/queries/clientpositive/parquet_array_null_element.q +++ ql/src/test/queries/clientpositive/parquet_array_null_element.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + DROP TABLE parquet_array_null_element_staging; DROP TABLE parquet_array_null_element; diff --git ql/src/test/queries/clientpositive/parquet_array_of_multi_field_struct.q ql/src/test/queries/clientpositive/parquet_array_of_multi_field_struct.q index b96d302..ec623dd 100644 --- ql/src/test/queries/clientpositive/parquet_array_of_multi_field_struct.q +++ ql/src/test/queries/clientpositive/parquet_array_of_multi_field_struct.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test creates a Parquet table with an array of multi-field structs CREATE TABLE parquet_array_of_multi_field_structs ( diff --git ql/src/test/queries/clientpositive/parquet_array_of_optional_elements.q ql/src/test/queries/clientpositive/parquet_array_of_optional_elements.q index 1ae9cce..4c48df8 100644 --- ql/src/test/queries/clientpositive/parquet_array_of_optional_elements.q +++ ql/src/test/queries/clientpositive/parquet_array_of_optional_elements.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test creates a Parquet table with an array of optional structs CREATE TABLE parquet_array_of_optional_elements ( diff --git ql/src/test/queries/clientpositive/parquet_array_of_required_elements.q ql/src/test/queries/clientpositive/parquet_array_of_required_elements.q index 967b333..3ecd1a6 100644 --- ql/src/test/queries/clientpositive/parquet_array_of_required_elements.q +++ ql/src/test/queries/clientpositive/parquet_array_of_required_elements.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test creates a Parquet table with an array of structs CREATE TABLE parquet_array_of_required_elements ( diff --git ql/src/test/queries/clientpositive/parquet_array_of_single_field_struct.q ql/src/test/queries/clientpositive/parquet_array_of_single_field_struct.q index f61fe29..2f147e6 100644 --- ql/src/test/queries/clientpositive/parquet_array_of_single_field_struct.q +++ ql/src/test/queries/clientpositive/parquet_array_of_single_field_struct.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test creates a Parquet table with an array of single-field structs -- that has an ambiguous Parquet schema that is assumed to be a list of bigints -- This is verifies compliance with the spec for this case. diff --git ql/src/test/queries/clientpositive/parquet_array_of_structs.q ql/src/test/queries/clientpositive/parquet_array_of_structs.q index 9e8b56c..689e1ef 100644 --- ql/src/test/queries/clientpositive/parquet_array_of_structs.q +++ ql/src/test/queries/clientpositive/parquet_array_of_structs.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test creates a Parquet table with an array of structs CREATE TABLE parquet_array_of_structs ( diff --git ql/src/test/queries/clientpositive/parquet_array_of_unannotated_groups.q ql/src/test/queries/clientpositive/parquet_array_of_unannotated_groups.q index 1a0698a..8ee4344 100644 --- ql/src/test/queries/clientpositive/parquet_array_of_unannotated_groups.q +++ ql/src/test/queries/clientpositive/parquet_array_of_unannotated_groups.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test creates a Parquet table from a structure with an unannotated -- repeated structure of (x,y) structs diff --git ql/src/test/queries/clientpositive/parquet_array_of_unannotated_primitives.q ql/src/test/queries/clientpositive/parquet_array_of_unannotated_primitives.q index c38d9dc..ab74ee8 100644 --- ql/src/test/queries/clientpositive/parquet_array_of_unannotated_primitives.q +++ ql/src/test/queries/clientpositive/parquet_array_of_unannotated_primitives.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test creates a Parquet table from a structure with an unannotated -- repeated structure of int32s diff --git ql/src/test/queries/clientpositive/parquet_avro_array_of_primitives.q ql/src/test/queries/clientpositive/parquet_avro_array_of_primitives.q index 9f7ad3d..f830942 100644 --- ql/src/test/queries/clientpositive/parquet_avro_array_of_primitives.q +++ ql/src/test/queries/clientpositive/parquet_avro_array_of_primitives.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test creates a Parquet table with an array of structs CREATE TABLE parquet_avro_array_of_primitives ( diff --git ql/src/test/queries/clientpositive/parquet_avro_array_of_single_field_struct.q ql/src/test/queries/clientpositive/parquet_avro_array_of_single_field_struct.q index d5fdb00..18f9eec 100644 --- ql/src/test/queries/clientpositive/parquet_avro_array_of_single_field_struct.q +++ ql/src/test/queries/clientpositive/parquet_avro_array_of_single_field_struct.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test creates a Parquet table with an array of single-field structs -- as written by parquet-avro diff --git ql/src/test/queries/clientpositive/parquet_columnar.q ql/src/test/queries/clientpositive/parquet_columnar.q index ca6da81..1bca151 100644 --- ql/src/test/queries/clientpositive/parquet_columnar.q +++ ql/src/test/queries/clientpositive/parquet_columnar.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set parquet.column.index.access=true; DROP TABLE IF EXISTS parquet_columnar_access_stage; diff --git ql/src/test/queries/clientpositive/parquet_create.q ql/src/test/queries/clientpositive/parquet_create.q index f2eea6e..dd6b232 100644 --- ql/src/test/queries/clientpositive/parquet_create.q +++ ql/src/test/queries/clientpositive/parquet_create.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + DROP TABLE parquet_create_staging; DROP TABLE parquet_create; diff --git ql/src/test/queries/clientpositive/parquet_ctas.q ql/src/test/queries/clientpositive/parquet_ctas.q index b8a3f95..52d2656 100644 --- ql/src/test/queries/clientpositive/parquet_ctas.q +++ ql/src/test/queries/clientpositive/parquet_ctas.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + drop table staging; drop table parquet_ctas; drop table parquet_ctas_advanced; diff --git ql/src/test/queries/clientpositive/parquet_decimal.q ql/src/test/queries/clientpositive/parquet_decimal.q index ccb6713..8357d5e 100644 --- ql/src/test/queries/clientpositive/parquet_decimal.q +++ ql/src/test/queries/clientpositive/parquet_decimal.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + DROP TABLE IF EXISTS `dec`; CREATE TABLE `dec`(name string, value decimal(8,4)); diff --git ql/src/test/queries/clientpositive/parquet_decimal1.q ql/src/test/queries/clientpositive/parquet_decimal1.q index fa3e2b8..9905f95 100644 --- ql/src/test/queries/clientpositive/parquet_decimal1.q +++ ql/src/test/queries/clientpositive/parquet_decimal1.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + DROP TABLE IF EXISTS dec_comp; CREATE TABLE dec_comp(arr ARRAY, m MAP, s STRUCT) diff --git ql/src/test/queries/clientpositive/parquet_external_time.q ql/src/test/queries/clientpositive/parquet_external_time.q index 6c9f2d1..4db87e6 100644 --- ql/src/test/queries/clientpositive/parquet_external_time.q +++ ql/src/test/queries/clientpositive/parquet_external_time.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + create table timetest_parquet(t timestamp) stored as parquet; load data local inpath '../../data/files/parquet_external_time.parq' into table timetest_parquet; diff --git ql/src/test/queries/clientpositive/parquet_join.q ql/src/test/queries/clientpositive/parquet_join.q index 2a2e85b..7e6374d 100644 --- ql/src/test/queries/clientpositive/parquet_join.q +++ ql/src/test/queries/clientpositive/parquet_join.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; drop table if exists staging; diff --git ql/src/test/queries/clientpositive/parquet_join2.q ql/src/test/queries/clientpositive/parquet_join2.q index 9d107c7..e27b736 100644 --- ql/src/test/queries/clientpositive/parquet_join2.q +++ ql/src/test/queries/clientpositive/parquet_join2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.optimize.index.filter = true; set hive.auto.convert.join=false; diff --git ql/src/test/queries/clientpositive/parquet_map_null.q ql/src/test/queries/clientpositive/parquet_map_null.q index e154159..66e3d16 100644 --- ql/src/test/queries/clientpositive/parquet_map_null.q +++ ql/src/test/queries/clientpositive/parquet_map_null.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- This test attempts to write a parquet table from an avro table that contains map null values DROP TABLE IF EXISTS avro_table; diff --git ql/src/test/queries/clientpositive/parquet_map_of_arrays_of_ints.q ql/src/test/queries/clientpositive/parquet_map_of_arrays_of_ints.q index 8517848..3f8358b 100644 --- ql/src/test/queries/clientpositive/parquet_map_of_arrays_of_ints.q +++ ql/src/test/queries/clientpositive/parquet_map_of_arrays_of_ints.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test reads and writes a parquet file with a map of arrays of ints -- validates PARQUET-26 is fixed diff --git ql/src/test/queries/clientpositive/parquet_map_of_maps.q ql/src/test/queries/clientpositive/parquet_map_of_maps.q index 4289f37..f76a7ed 100644 --- ql/src/test/queries/clientpositive/parquet_map_of_maps.q +++ ql/src/test/queries/clientpositive/parquet_map_of_maps.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test reads and writes a parquet file with a map of maps CREATE TABLE parquet_map_of_maps ( diff --git ql/src/test/queries/clientpositive/parquet_mixed_case.q ql/src/test/queries/clientpositive/parquet_mixed_case.q index 95fc958..2063a12 100644 --- ql/src/test/queries/clientpositive/parquet_mixed_case.q +++ ql/src/test/queries/clientpositive/parquet_mixed_case.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + DROP TABLE parquet_mixed_case; CREATE TABLE parquet_mixed_case ( diff --git ql/src/test/queries/clientpositive/parquet_mixed_partition_formats.q ql/src/test/queries/clientpositive/parquet_mixed_partition_formats.q index fb6f458..14c186f 100644 --- ql/src/test/queries/clientpositive/parquet_mixed_partition_formats.q +++ ql/src/test/queries/clientpositive/parquet_mixed_partition_formats.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + DROP TABLE if exists parquet_mixed_partition_formats; CREATE TABLE parquet_mixed_partition_formats ( diff --git ql/src/test/queries/clientpositive/parquet_mixed_partition_formats2.q ql/src/test/queries/clientpositive/parquet_mixed_partition_formats2.q index 00d05d2..7bd5e11 100644 --- ql/src/test/queries/clientpositive/parquet_mixed_partition_formats2.q +++ ql/src/test/queries/clientpositive/parquet_mixed_partition_formats2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; add jar ${system:maven.local.repository}/org/apache/hive/hcatalog/hive-hcatalog-core/${system:hive.version}/hive-hcatalog-core-${system:hive.version}.jar; diff --git ql/src/test/queries/clientpositive/parquet_nested_complex.q ql/src/test/queries/clientpositive/parquet_nested_complex.q index 9ada66f..aa91d52 100644 --- ql/src/test/queries/clientpositive/parquet_nested_complex.q +++ ql/src/test/queries/clientpositive/parquet_nested_complex.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- start with the original nestedcomplex test create table nestedcomplex ( diff --git ql/src/test/queries/clientpositive/parquet_no_row_serde.q ql/src/test/queries/clientpositive/parquet_no_row_serde.q index c33a650..c988a90 100644 --- ql/src/test/queries/clientpositive/parquet_no_row_serde.q +++ ql/src/test/queries/clientpositive/parquet_no_row_serde.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; diff --git ql/src/test/queries/clientpositive/parquet_partitioned.q ql/src/test/queries/clientpositive/parquet_partitioned.q index 4f6a1a8..b933e59 100644 --- ql/src/test/queries/clientpositive/parquet_partitioned.q +++ ql/src/test/queries/clientpositive/parquet_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.exec.dynamic.partition=true; diff --git ql/src/test/queries/clientpositive/parquet_ppd.q ql/src/test/queries/clientpositive/parquet_ppd.q index 56ca96e..17ccba1 100644 --- ql/src/test/queries/clientpositive/parquet_ppd.q +++ ql/src/test/queries/clientpositive/parquet_ppd.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + CREATE TABLE parquet_tbl( key int, ldate string) diff --git ql/src/test/queries/clientpositive/parquet_ppd_boolean.q ql/src/test/queries/clientpositive/parquet_ppd_boolean.q index 059da68..f17276f 100644 --- ql/src/test/queries/clientpositive/parquet_ppd_boolean.q +++ ql/src/test/queries/clientpositive/parquet_ppd_boolean.q @@ -1,3 +1,4 @@ +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; diff --git ql/src/test/queries/clientpositive/parquet_ppd_char.q ql/src/test/queries/clientpositive/parquet_ppd_char.q index eaddcb4..e799174 100644 --- ql/src/test/queries/clientpositive/parquet_ppd_char.q +++ ql/src/test/queries/clientpositive/parquet_ppd_char.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; SET hive.optimize.ppd=true; SET mapred.min.split.size=1000; diff --git ql/src/test/queries/clientpositive/parquet_ppd_date.q ql/src/test/queries/clientpositive/parquet_ppd_date.q index 41d0d64..c5bf9fb 100644 --- ql/src/test/queries/clientpositive/parquet_ppd_date.q +++ ql/src/test/queries/clientpositive/parquet_ppd_date.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; SET hive.optimize.ppd=true; SET mapred.min.split.size=1000; diff --git ql/src/test/queries/clientpositive/parquet_ppd_decimal.q ql/src/test/queries/clientpositive/parquet_ppd_decimal.q index ff883db..09b8d2e 100644 --- ql/src/test/queries/clientpositive/parquet_ppd_decimal.q +++ ql/src/test/queries/clientpositive/parquet_ppd_decimal.q @@ -1,3 +1,4 @@ +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; diff --git ql/src/test/queries/clientpositive/parquet_ppd_multifiles.q ql/src/test/queries/clientpositive/parquet_ppd_multifiles.q index ebbf3af..309adf1 100644 --- ql/src/test/queries/clientpositive/parquet_ppd_multifiles.q +++ ql/src/test/queries/clientpositive/parquet_ppd_multifiles.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + CREATE TABLE parquet_ppd_multifiles ( name string, `dec` decimal(5,0) diff --git ql/src/test/queries/clientpositive/parquet_ppd_partition.q ql/src/test/queries/clientpositive/parquet_ppd_partition.q index 08af84f..d87e1d9 100644 --- ql/src/test/queries/clientpositive/parquet_ppd_partition.q +++ ql/src/test/queries/clientpositive/parquet_ppd_partition.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; SET hive.optimize.index.filter=true; SET hive.optimize.ppd=true; diff --git ql/src/test/queries/clientpositive/parquet_ppd_timestamp.q ql/src/test/queries/clientpositive/parquet_ppd_timestamp.q index 1b9f6ff..9d8ea4f 100644 --- ql/src/test/queries/clientpositive/parquet_ppd_timestamp.q +++ ql/src/test/queries/clientpositive/parquet_ppd_timestamp.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; SET hive.optimize.ppd=true; SET mapred.min.split.size=1000; diff --git ql/src/test/queries/clientpositive/parquet_ppd_varchar.q ql/src/test/queries/clientpositive/parquet_ppd_varchar.q index 6449c6d..3f7defb 100644 --- ql/src/test/queries/clientpositive/parquet_ppd_varchar.q +++ ql/src/test/queries/clientpositive/parquet_ppd_varchar.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; SET hive.optimize.ppd=true; SET mapred.min.split.size=1000; diff --git ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q index 0e8dd04..4516782 100644 --- ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q +++ ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; SET hive.optimize.ppd=true; set hive.llap.cache.allow.synthetic.fileid=true; diff --git ql/src/test/queries/clientpositive/parquet_predicate_pushdown_2.q ql/src/test/queries/clientpositive/parquet_predicate_pushdown_2.q index 1b63a42..5c40974 100644 --- ql/src/test/queries/clientpositive/parquet_predicate_pushdown_2.q +++ ql/src/test/queries/clientpositive/parquet_predicate_pushdown_2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; SET hive.optimize.ppd=true; SET hive.optimize.index.filter=true; diff --git ql/src/test/queries/clientpositive/parquet_read_backward_compatible_files.q ql/src/test/queries/clientpositive/parquet_read_backward_compatible_files.q index f4928c7..4f84cd1 100644 --- ql/src/test/queries/clientpositive/parquet_read_backward_compatible_files.q +++ ql/src/test/queries/clientpositive/parquet_read_backward_compatible_files.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- This test makes sure that parquet can read older parquet files written by Hive <= 0.12 -- alltypesparquet is a files written by older version of Hive diff --git ql/src/test/queries/clientpositive/parquet_schema_evolution.q ql/src/test/queries/clientpositive/parquet_schema_evolution.q index e767b81..b47bc99 100644 --- ql/src/test/queries/clientpositive/parquet_schema_evolution.q +++ ql/src/test/queries/clientpositive/parquet_schema_evolution.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + -- Some tables might have extra columns and struct elements on the schema than the on Parquet schema; -- This is called 'schema evolution' as the Parquet file is not ready yet for such new columns; -- Hive should support this schema, and return NULL values instead; diff --git ql/src/test/queries/clientpositive/parquet_serde.q ql/src/test/queries/clientpositive/parquet_serde.q index 275f92a..8d95ffb 100644 --- ql/src/test/queries/clientpositive/parquet_serde.q +++ ql/src/test/queries/clientpositive/parquet_serde.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + DROP TABLE if exists parquet_mixed_fileformat; CREATE TABLE parquet_mixed_fileformat ( diff --git ql/src/test/queries/clientpositive/parquet_table_with_subschema.q ql/src/test/queries/clientpositive/parquet_table_with_subschema.q index 7c1b7b5..dab74a5 100644 --- ql/src/test/queries/clientpositive/parquet_table_with_subschema.q +++ ql/src/test/queries/clientpositive/parquet_table_with_subschema.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- Sometimes, the user wants to create a table from just a portion of the file schema; -- This test makes sure that this scenario works; diff --git ql/src/test/queries/clientpositive/parquet_thrift_array_of_primitives.q ql/src/test/queries/clientpositive/parquet_thrift_array_of_primitives.q index 38b8e6b..c43a69a 100644 --- ql/src/test/queries/clientpositive/parquet_thrift_array_of_primitives.q +++ ql/src/test/queries/clientpositive/parquet_thrift_array_of_primitives.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test creates a Parquet table with an array of structs CREATE TABLE parquet_thrift_array_of_primitives ( diff --git ql/src/test/queries/clientpositive/parquet_thrift_array_of_single_field_struct.q ql/src/test/queries/clientpositive/parquet_thrift_array_of_single_field_struct.q index bbb8c98..93d91f5 100644 --- ql/src/test/queries/clientpositive/parquet_thrift_array_of_single_field_struct.q +++ ql/src/test/queries/clientpositive/parquet_thrift_array_of_single_field_struct.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- this test creates a Parquet table with an array of single-field structs -- as written by parquet-thrift diff --git ql/src/test/queries/clientpositive/parquet_type_promotion.q ql/src/test/queries/clientpositive/parquet_type_promotion.q index 7edfc35..1527d28 100644 --- ql/src/test/queries/clientpositive/parquet_type_promotion.q +++ ql/src/test/queries/clientpositive/parquet_type_promotion.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + DROP TABLE parquet_type_promotion_staging; DROP TABLE parquet_type_promotion; diff --git ql/src/test/queries/clientpositive/parquet_types.q ql/src/test/queries/clientpositive/parquet_types.q index 1a8844b..f7d7cd6 100644 --- ql/src/test/queries/clientpositive/parquet_types.q +++ ql/src/test/queries/clientpositive/parquet_types.q @@ -1,5 +1,7 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.llap.cache.allow.synthetic.fileid=true; + DROP TABLE parquet_types_staging; DROP TABLE parquet_types; diff --git ql/src/test/queries/clientpositive/parquet_write_correct_definition_levels.q ql/src/test/queries/clientpositive/parquet_write_correct_definition_levels.q index 172fda6..8c390b6 100644 --- ql/src/test/queries/clientpositive/parquet_write_correct_definition_levels.q +++ ql/src/test/queries/clientpositive/parquet_write_correct_definition_levels.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + CREATE TABLE text_tbl (a STRUCT>) STORED AS TEXTFILE; diff --git ql/src/test/queries/clientpositive/ppd_windowing1.q ql/src/test/queries/clientpositive/ppd_windowing1.q index f380eab..ec1c6ab 100644 --- ql/src/test/queries/clientpositive/ppd_windowing1.q +++ ql/src/test/queries/clientpositive/ppd_windowing1.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=false; diff --git ql/src/test/queries/clientpositive/ppd_windowing2.q ql/src/test/queries/clientpositive/ppd_windowing2.q index abfe89e..5ca45be 100644 --- ql/src/test/queries/clientpositive/ppd_windowing2.q +++ ql/src/test/queries/clientpositive/ppd_windowing2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=false; diff --git ql/src/test/queries/clientpositive/ptf.q ql/src/test/queries/clientpositive/ptf.q index 5ab6cdc..a527fe8 100644 --- ql/src/test/queries/clientpositive/ptf.q +++ ql/src/test/queries/clientpositive/ptf.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.explain.user=false; + -- SORT_QUERY_RESULTS --1. test1 diff --git ql/src/test/queries/clientpositive/ptf_decimal.q ql/src/test/queries/clientpositive/ptf_decimal.q index 94885e3..7cefb2d 100644 --- ql/src/test/queries/clientpositive/ptf_decimal.q +++ ql/src/test/queries/clientpositive/ptf_decimal.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- SORT_QUERY_RESULTS -- 1. aggregate functions with decimal type diff --git ql/src/test/queries/clientpositive/ptf_general_queries.q ql/src/test/queries/clientpositive/ptf_general_queries.q index 9942063..020524a 100644 --- ql/src/test/queries/clientpositive/ptf_general_queries.q +++ ql/src/test/queries/clientpositive/ptf_general_queries.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + -- SORT_QUERY_RESULTS -- 1. testNoPTFNoWindowing diff --git ql/src/test/queries/clientpositive/ptf_matchpath.q ql/src/test/queries/clientpositive/ptf_matchpath.q index 7b67a34..0450c05 100644 --- ql/src/test/queries/clientpositive/ptf_matchpath.q +++ ql/src/test/queries/clientpositive/ptf_matchpath.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.explain.user=false; + DROP TABLE flights_tiny; create table flights_tiny ( diff --git ql/src/test/queries/clientpositive/ptf_rcfile.q ql/src/test/queries/clientpositive/ptf_rcfile.q index 501d2a4..38b2f84 100644 --- ql/src/test/queries/clientpositive/ptf_rcfile.q +++ ql/src/test/queries/clientpositive/ptf_rcfile.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + DROP TABLE part_rc; CREATE TABLE part_rc( diff --git ql/src/test/queries/clientpositive/ptf_register_tblfn.q ql/src/test/queries/clientpositive/ptf_register_tblfn.q index 374cc43..cf3baba 100644 --- ql/src/test/queries/clientpositive/ptf_register_tblfn.q +++ ql/src/test/queries/clientpositive/ptf_register_tblfn.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + DROP TABLE flights_tiny; create table flights_tiny ( diff --git ql/src/test/queries/clientpositive/ptf_seqfile.q ql/src/test/queries/clientpositive/ptf_seqfile.q index ac55714..205b634 100644 --- ql/src/test/queries/clientpositive/ptf_seqfile.q +++ ql/src/test/queries/clientpositive/ptf_seqfile.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + DROP TABLE part_seq; CREATE TABLE part_seq( diff --git ql/src/test/queries/clientpositive/ptf_streaming.q ql/src/test/queries/clientpositive/ptf_streaming.q index aa70a5c..e521356 100644 --- ql/src/test/queries/clientpositive/ptf_streaming.q +++ ql/src/test/queries/clientpositive/ptf_streaming.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.explain.user=false; + -- SORT_QUERY_RESULTS --1. test1 diff --git ql/src/test/queries/clientpositive/ptfgroupbyjoin.q ql/src/test/queries/clientpositive/ptfgroupbyjoin.q index 62472c8..242af3d 100644 --- ql/src/test/queries/clientpositive/ptfgroupbyjoin.q +++ ql/src/test/queries/clientpositive/ptfgroupbyjoin.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + create table tlb1 (id int, fkey int, val string); create table tlb2 (fid int, name string); insert into table tlb1 values(100,1,'abc'); diff --git ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q index 71a7399..1c2e156 100644 --- ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q +++ ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=true; set hive.spark.dynamic.partition.pruning=true; diff --git ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q index 2202709..c2451fc 100644 --- ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q +++ ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=true; set hive.spark.dynamic.partition.pruning=true; diff --git ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_3.q ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_3.q index 2d622ae..42a8017 100644 --- ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_3.q +++ ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_3.q @@ -1,4 +1,6 @@ +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); CREATE TABLE partitioned_table3 (col int) PARTITIONED BY (part_col int); diff --git ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q index e5f4874..0d9ed31 100644 --- ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q +++ ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.spark.dynamic.partition.pruning=true; set hive.combine.equivalent.work.optimization=true; diff --git ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q index 4883787..afeaa97 100644 --- ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q +++ ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.spark.dynamic.partition.pruning=true; -- This qfile tests whether we can handle nested DPP sinks diff --git ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_6.q ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_6.q index 381b2f9..19284fd 100644 --- ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_6.q +++ 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 diff --git ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q index 7c2164d..9937339 100644 --- ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q +++ ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=true; set hive.optimize.metadataonly=false; diff --git ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_recursive_mapjoin.q ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_recursive_mapjoin.q index 5e19b97..51278e9 100644 --- ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_recursive_mapjoin.q +++ 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; diff --git ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q index a286aed..684ab3b 100644 --- ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q +++ ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; diff --git ql/src/test/queries/clientpositive/tez_dml.q ql/src/test/queries/clientpositive/tez_dml.q index 816da5d..f739f90 100644 --- ql/src/test/queries/clientpositive/tez_dml.q +++ ql/src/test/queries/clientpositive/tez_dml.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; set hive.exec.dynamic.partition.mode=nonstrict; diff --git ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q index aa331f2..40658b3 100644 --- ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q +++ ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; diff --git ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q index 2c36189..540a2a9 100644 --- ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q +++ ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; diff --git ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q index ff4cde2..f18ca2e 100644 --- ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q +++ ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.optimize.limittranspose=true; set hive.optimize.limittranspose.reductionpercentage=0.1f; set hive.optimize.limittranspose.reductiontuples=100; @@ -5,6 +6,7 @@ set hive.explain.user=false; set hive.auto.convert.join=false; set hive.optimize.dynamic.partition.hashjoin=false; set hive.mapred.mode=nonstrict; + explain select a.* from alltypesorc a left outer join src b diff --git ql/src/test/queries/clientpositive/tez_fsstat.q ql/src/test/queries/clientpositive/tez_fsstat.q index 67ec7a8..1456901 100644 --- ql/src/test/queries/clientpositive/tez_fsstat.q +++ ql/src/test/queries/clientpositive/tez_fsstat.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/tez_input_counters.q ql/src/test/queries/clientpositive/tez_input_counters.q index d471c3d..555a949 100644 --- ql/src/test/queries/clientpositive/tez_input_counters.q +++ ql/src/test/queries/clientpositive/tez_input_counters.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.compute.query.using.stats=false; set hive.exec.dynamic.partition.mode=nonstrict; set hive.exec.max.dynamic.partitions=400; diff --git ql/src/test/queries/clientpositive/tez_insert_overwrite_local_directory_1.q ql/src/test/queries/clientpositive/tez_insert_overwrite_local_directory_1.q index e06403a..1c49937 100644 --- ql/src/test/queries/clientpositive/tez_insert_overwrite_local_directory_1.q +++ ql/src/test/queries/clientpositive/tez_insert_overwrite_local_directory_1.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + insert overwrite local directory '${system:test.tmp.dir}/tez_local_src_table_1' select * from src order by key limit 10 ; dfs -cat ${system:test.tmp.dir.uri}/tez_local_src_table_1/* ; diff --git ql/src/test/queries/clientpositive/tez_join.q ql/src/test/queries/clientpositive/tez_join.q index 107080d..4579323 100644 --- ql/src/test/queries/clientpositive/tez_join.q +++ ql/src/test/queries/clientpositive/tez_join.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.sortmerge.join = true; diff --git ql/src/test/queries/clientpositive/tez_join_hash.q ql/src/test/queries/clientpositive/tez_join_hash.q index 158c99b..40c2a14 100644 --- ql/src/test/queries/clientpositive/tez_join_hash.q +++ ql/src/test/queries/clientpositive/tez_join_hash.q @@ -1,5 +1,7 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; + -- SORT_QUERY_RESULTS create table orc_src (key string, value string) STORED AS ORC; diff --git ql/src/test/queries/clientpositive/tez_join_result_complex.q ql/src/test/queries/clientpositive/tez_join_result_complex.q index 42c5506..248645f 100644 --- ql/src/test/queries/clientpositive/tez_join_result_complex.q +++ ql/src/test/queries/clientpositive/tez_join_result_complex.q @@ -1,8 +1,10 @@ +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; set hive.mapjoin.optimized.hashtable=true; set hive.mapred.mode=nonstrict; + create table service_request_clean( cnctevn_id string , svcrqst_id string , diff --git ql/src/test/queries/clientpositive/tez_join_tests.q ql/src/test/queries/clientpositive/tez_join_tests.q index 9a62805..5853bf2 100644 --- ql/src/test/queries/clientpositive/tez_join_tests.q +++ ql/src/test/queries/clientpositive/tez_join_tests.q @@ -1,5 +1,7 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; + -- SORT_QUERY_RESULTS explain diff --git ql/src/test/queries/clientpositive/tez_joins_explain.q ql/src/test/queries/clientpositive/tez_joins_explain.q index 5f26ee2..ff17094 100644 --- ql/src/test/queries/clientpositive/tez_joins_explain.q +++ ql/src/test/queries/clientpositive/tez_joins_explain.q @@ -1,6 +1,9 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; + -- SORT_QUERY_RESULTS + explain select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key; diff --git ql/src/test/queries/clientpositive/tez_multi_union.q ql/src/test/queries/clientpositive/tez_multi_union.q index 9dd3c8d..95d9f03 100644 --- ql/src/test/queries/clientpositive/tez_multi_union.q +++ ql/src/test/queries/clientpositive/tez_multi_union.q @@ -1,4 +1,7 @@ +SET hive.vectorized.execution.enabled=false; + -- SORT_QUERY_RESULTS + select key from ( select key from src diff --git ql/src/test/queries/clientpositive/tez_nway_join.q ql/src/test/queries/clientpositive/tez_nway_join.q index 9757dc4..a6b0080 100644 --- ql/src/test/queries/clientpositive/tez_nway_join.q +++ ql/src/test/queries/clientpositive/tez_nway_join.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/tez_schema_evolution.q ql/src/test/queries/clientpositive/tez_schema_evolution.q index 1d8f487..315a768 100644 --- ql/src/test/queries/clientpositive/tez_schema_evolution.q +++ ql/src/test/queries/clientpositive/tez_schema_evolution.q @@ -1,5 +1,7 @@ SET hive.vectorized.execution.enabled=false; +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; + -- SORT_QUERY_RESULTS create table test (key int, value string) partitioned by (p int) stored as textfile; diff --git ql/src/test/queries/clientpositive/tez_self_join.q ql/src/test/queries/clientpositive/tez_self_join.q index bde56bd..df4f5b3 100644 --- ql/src/test/queries/clientpositive/tez_self_join.q +++ ql/src/test/queries/clientpositive/tez_self_join.q @@ -1,5 +1,7 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; + drop table if exists tez_self_join1; drop table if exists tez_self_join2; diff --git ql/src/test/queries/clientpositive/tez_smb_1.q ql/src/test/queries/clientpositive/tez_smb_1.q index ecfb0dc..e4c90a8 100644 --- ql/src/test/queries/clientpositive/tez_smb_1.q +++ ql/src/test/queries/clientpositive/tez_smb_1.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=false; set hive.stats.column.autogather=false; set hive.strict.checks.bucketing=false; diff --git ql/src/test/queries/clientpositive/tez_smb_empty.q ql/src/test/queries/clientpositive/tez_smb_empty.q index eb73f88..6b54763 100644 --- ql/src/test/queries/clientpositive/tez_smb_empty.q +++ ql/src/test/queries/clientpositive/tez_smb_empty.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/tez_smb_main.q ql/src/test/queries/clientpositive/tez_smb_main.q index 7d35571..b522ab4 100644 --- ql/src/test/queries/clientpositive/tez_smb_main.q +++ ql/src/test/queries/clientpositive/tez_smb_main.q @@ -1,9 +1,11 @@ +SET hive.vectorized.execution.enabled=false; set hive.stats.column.autogather=false; set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; set hive.join.emit.interval=2; + explain select * from src a join src1 b on a.key = b.key; diff --git ql/src/test/queries/clientpositive/tez_union.q ql/src/test/queries/clientpositive/tez_union.q index fba543c..81a777b 100644 --- ql/src/test/queries/clientpositive/tez_union.q +++ ql/src/test/queries/clientpositive/tez_union.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; diff --git ql/src/test/queries/clientpositive/tez_union2.q ql/src/test/queries/clientpositive/tez_union2.q index 22eab01..5fb6603 100644 --- ql/src/test/queries/clientpositive/tez_union2.q +++ ql/src/test/queries/clientpositive/tez_union2.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.explain.user=false; + explain SELECT key, value FROM ( diff --git ql/src/test/queries/clientpositive/tez_union_decimal.q ql/src/test/queries/clientpositive/tez_union_decimal.q index 0f56e6a..61bfe54 100644 --- ql/src/test/queries/clientpositive/tez_union_decimal.q +++ ql/src/test/queries/clientpositive/tez_union_decimal.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + select sum(a) from ( select cast(1.1 as decimal) a from src tablesample (1 rows) union all diff --git ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q index 782fc1e..2bb6430 100644 --- ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q +++ ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q @@ -1,5 +1,7 @@ +SET hive.vectorized.execution.enabled=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; + create table dummy(i int); insert into table dummy values (1); select * from dummy; diff --git ql/src/test/queries/clientpositive/tez_union_dynamic_partition_2.q ql/src/test/queries/clientpositive/tez_union_dynamic_partition_2.q index e8cfb3a..5c1dc31 100644 --- ql/src/test/queries/clientpositive/tez_union_dynamic_partition_2.q +++ ql/src/test/queries/clientpositive/tez_union_dynamic_partition_2.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + drop table if exists dummy; drop table if exists partunion1; diff --git ql/src/test/queries/clientpositive/tez_union_group_by.q ql/src/test/queries/clientpositive/tez_union_group_by.q index 200f38d..55aa1a9 100644 --- ql/src/test/queries/clientpositive/tez_union_group_by.q +++ ql/src/test/queries/clientpositive/tez_union_group_by.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.explain.user=false; + CREATE TABLE x ( u bigint, diff --git ql/src/test/queries/clientpositive/tez_union_multiinsert.q ql/src/test/queries/clientpositive/tez_union_multiinsert.q index 67a9ac5..20fe87d 100644 --- ql/src/test/queries/clientpositive/tez_union_multiinsert.q +++ ql/src/test/queries/clientpositive/tez_union_multiinsert.q @@ -1,4 +1,6 @@ +SET hive.vectorized.execution.enabled=false; set hive.explain.user=false; + -- SORT_QUERY_RESULTS CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE; diff --git ql/src/test/queries/clientpositive/tez_union_with_udf.q ql/src/test/queries/clientpositive/tez_union_with_udf.q index 6826530..673551e 100644 --- ql/src/test/queries/clientpositive/tez_union_with_udf.q +++ ql/src/test/queries/clientpositive/tez_union_with_udf.q @@ -1,3 +1,5 @@ +SET hive.vectorized.execution.enabled=false; + select * from (select key + key from src limit 1) a union all select * from (select key + key from src limit 1) b; diff --git ql/src/test/queries/clientpositive/vector_data_types.q ql/src/test/queries/clientpositive/vector_data_types.q index b796e71..41146d7 100644 --- ql/src/test/queries/clientpositive/vector_data_types.q +++ ql/src/test/queries/clientpositive/vector_data_types.q @@ -42,7 +42,7 @@ insert into over1korc values (NULL, NULL,NULL, NULL,NULL, NULL,NULL, NULL,NULL, SET hive.vectorized.execution.enabled=false; -EXPLAIN VECTORIZATION EXPRESSION SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20; +EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20; SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20; diff --git ql/src/test/queries/clientpositive/vector_left_outer_join2.q ql/src/test/queries/clientpositive/vector_left_outer_join2.q index ccceb36..3e5ec7e 100644 --- ql/src/test/queries/clientpositive/vector_left_outer_join2.q +++ ql/src/test/queries/clientpositive/vector_left_outer_join2.q @@ -27,7 +27,7 @@ select tjoin1.rnum, tjoin1.c1, tjoin1.c2, tjoin2.c2 as c2j2 from tjoin1 left out set hive.vectorized.execution.enabled=false; set hive.mapjoin.hybridgrace.hashtable=true; -explain vectorization expression +explain select tjoin1.rnum, tjoin1.c1, tjoin1.c2, tjoin2.c2 as c2j2 from tjoin1 left outer join tjoin2 on ( tjoin1.c1 = tjoin2.c1 and tjoin1.c2 > 15 ); select tjoin1.rnum, tjoin1.c1, tjoin1.c2, tjoin2.c2 as c2j2 from tjoin1 left outer join tjoin2 on ( tjoin1.c1 = tjoin2.c1 and tjoin1.c2 > 15 ); diff --git ql/src/test/queries/clientpositive/vectorization_numeric_overflows.q ql/src/test/queries/clientpositive/vectorization_numeric_overflows.q index 828a029..b18e6e5 100644 --- ql/src/test/queries/clientpositive/vectorization_numeric_overflows.q +++ ql/src/test/queries/clientpositive/vectorization_numeric_overflows.q @@ -91,7 +91,7 @@ select csmallint2, csmallint2 * 2 from test_overflow where (csmallint2 * 2S) < 0 -- results should match in non-vectorized execution set hive.vectorized.execution.enabled=false; -explain vectorization expression +explain select csmallint2, csmallint2 * 2 from test_overflow where (csmallint2 * 2S) < 0 order by csmallint2; select csmallint2, csmallint2 * 2 from test_overflow where (csmallint2 * 2S) < 0 order by csmallint2; @@ -100,7 +100,7 @@ insert into parquettable values (-104, 25,2147483647, 10), (-112, 24, -214748364 -- test ColSubstractCol operation underflow -explain vectorization expression select t1, t2, (t1-t2) as diff from parquettable where (t1-t2) < 50 order by diff desc; +explain select t1, t2, (t1-t2) as diff from parquettable where (t1-t2) < 50 order by diff desc; select t1, t2, (t1-t2) as diff from parquettable where (t1-t2) < 50 order by diff desc; -- the above query should return the same results in non-vectorized mode @@ -142,7 +142,7 @@ set hive.vectorized.execution.enabled=false; select 2147483648 from test_overflow; -- test PosMod vector expression, the third row will overflow the int range and cause the result to be negative -set hive.vectorized.execution.enabled=false; +set hive.enabled=false; select * from test_overflow where pmod(cint1, 1073741825) > 0 order by cint1; -- results should match in non-vectorized execution diff --git ql/src/test/queries/clientpositive/vectorized_timestamp.q ql/src/test/queries/clientpositive/vectorized_timestamp.q index 8de4e86..257e914 100644 --- ql/src/test/queries/clientpositive/vectorized_timestamp.q +++ ql/src/test/queries/clientpositive/vectorized_timestamp.q @@ -7,7 +7,7 @@ CREATE TABLE test(ts TIMESTAMP) STORED AS ORC; INSERT INTO TABLE test VALUES ('0001-01-01 00:00:00.000000000'), ('9999-12-31 23:59:59.999999999'); SET hive.vectorized.execution.enabled = false; -EXPLAIN VECTORIZATION DETAIL +EXPLAIN SELECT ts FROM test; SELECT ts FROM test; diff --git ql/src/test/queries/clientpositive/windowing.q ql/src/test/queries/clientpositive/windowing.q index 5de2b0e..ff6f03e 100644 --- ql/src/test/queries/clientpositive/windowing.q +++ ql/src/test/queries/clientpositive/windowing.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; set hive.mapred.mode=nonstrict; set mapred.reduce.tasks=4; -- SORT_QUERY_RESULTS diff --git ql/src/test/queries/clientpositive/windowing_adjust_rowcontainer_sz.q ql/src/test/queries/clientpositive/windowing_adjust_rowcontainer_sz.q index 402fbad..7d19ce0 100644 --- ql/src/test/queries/clientpositive/windowing_adjust_rowcontainer_sz.q +++ ql/src/test/queries/clientpositive/windowing_adjust_rowcontainer_sz.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; set hive.join.cache.size=1; select p_mfgr, p_name, p_size, diff --git ql/src/test/queries/clientpositive/windowing_columnPruning.q ql/src/test/queries/clientpositive/windowing_columnPruning.q index fea674f..bc3e032 100644 --- ql/src/test/queries/clientpositive/windowing_columnPruning.q +++ ql/src/test/queries/clientpositive/windowing_columnPruning.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; -- 1. testQueryLevelPartitionColsNotInSelect select p_size, sum(p_retailprice) over (distribute by p_mfgr sort by p_name rows between unbounded preceding and current row) as s1 diff --git ql/src/test/queries/clientpositive/windowing_decimal.q ql/src/test/queries/clientpositive/windowing_decimal.q index f785bb5..f30900a 100644 --- ql/src/test/queries/clientpositive/windowing_decimal.q +++ ql/src/test/queries/clientpositive/windowing_decimal.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; create table part_dec( p_partkey INT, p_name STRING, diff --git ql/src/test/queries/clientpositive/windowing_distinct.q ql/src/test/queries/clientpositive/windowing_distinct.q index 63f10fe..9826b4e 100644 --- ql/src/test/queries/clientpositive/windowing_distinct.q +++ ql/src/test/queries/clientpositive/windowing_distinct.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table windowing_distinct; create table windowing_distinct( diff --git ql/src/test/queries/clientpositive/windowing_duplicate.q ql/src/test/queries/clientpositive/windowing_duplicate.q index ebdecd7..5190dc9 100644 --- ql/src/test/queries/clientpositive/windowing_duplicate.q +++ ql/src/test/queries/clientpositive/windowing_duplicate.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; create table mytable1 ( mytime timestamp, string1 string); diff --git ql/src/test/queries/clientpositive/windowing_expressions.q ql/src/test/queries/clientpositive/windowing_expressions.q index 33d05d1..4f27420 100644 --- ql/src/test/queries/clientpositive/windowing_expressions.q +++ ql/src/test/queries/clientpositive/windowing_expressions.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/windowing_gby.q ql/src/test/queries/clientpositive/windowing_gby.q index e1a536b..2dd2c4c 100644 --- ql/src/test/queries/clientpositive/windowing_gby.q +++ ql/src/test/queries/clientpositive/windowing_gby.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; set hive.mapred.mode=nonstrict; set hive.explain.user=true; explain diff --git ql/src/test/queries/clientpositive/windowing_gby2.q ql/src/test/queries/clientpositive/windowing_gby2.q index 920f723..c97ea9d 100644 --- ql/src/test/queries/clientpositive/windowing_gby2.q +++ ql/src/test/queries/clientpositive/windowing_gby2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; set hive.mapred.mode=nonstrict; explain diff --git ql/src/test/queries/clientpositive/windowing_multipartitioning.q ql/src/test/queries/clientpositive/windowing_multipartitioning.q index 92e229e..89a65b8 100644 --- ql/src/test/queries/clientpositive/windowing_multipartitioning.q +++ ql/src/test/queries/clientpositive/windowing_multipartitioning.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/windowing_navfn.q ql/src/test/queries/clientpositive/windowing_navfn.q index 7c27e22..86b49cb 100644 --- ql/src/test/queries/clientpositive/windowing_navfn.q +++ ql/src/test/queries/clientpositive/windowing_navfn.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/windowing_ntile.q ql/src/test/queries/clientpositive/windowing_ntile.q index 2382ca8..379ba0b 100644 --- ql/src/test/queries/clientpositive/windowing_ntile.q +++ ql/src/test/queries/clientpositive/windowing_ntile.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/windowing_order_null.q ql/src/test/queries/clientpositive/windowing_order_null.q index 5d17d94..a84e4e0 100644 --- ql/src/test/queries/clientpositive/windowing_order_null.q +++ ql/src/test/queries/clientpositive/windowing_order_null.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/windowing_range_multiorder.q ql/src/test/queries/clientpositive/windowing_range_multiorder.q index e727d27..1ea0d14 100644 --- ql/src/test/queries/clientpositive/windowing_range_multiorder.q +++ ql/src/test/queries/clientpositive/windowing_range_multiorder.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/windowing_rank.q ql/src/test/queries/clientpositive/windowing_rank.q index 9812037..900bb0f 100644 --- ql/src/test/queries/clientpositive/windowing_rank.q +++ ql/src/test/queries/clientpositive/windowing_rank.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/windowing_streaming.q ql/src/test/queries/clientpositive/windowing_streaming.q index 4699e69..015b7c2 100644 --- ql/src/test/queries/clientpositive/windowing_streaming.q +++ ql/src/test/queries/clientpositive/windowing_streaming.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/windowing_udaf.q ql/src/test/queries/clientpositive/windowing_udaf.q index 19bae8a..3fcf4cc 100644 --- ql/src/test/queries/clientpositive/windowing_udaf.q +++ ql/src/test/queries/clientpositive/windowing_udaf.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/windowing_udaf2.q ql/src/test/queries/clientpositive/windowing_udaf2.q index b813657..1df31e0 100644 --- ql/src/test/queries/clientpositive/windowing_udaf2.q +++ ql/src/test/queries/clientpositive/windowing_udaf2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; -- user-added aggregates should be usable as windowing functions create temporary function mysum as 'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum'; diff --git ql/src/test/queries/clientpositive/windowing_windowspec.q ql/src/test/queries/clientpositive/windowing_windowspec.q index 7c5cc2c..bfbe9bc 100644 --- ql/src/test/queries/clientpositive/windowing_windowspec.q +++ ql/src/test/queries/clientpositive/windowing_windowspec.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/windowing_windowspec2.q ql/src/test/queries/clientpositive/windowing_windowspec2.q index 24e3b32..e07a057 100644 --- ql/src/test/queries/clientpositive/windowing_windowspec2.q +++ ql/src/test/queries/clientpositive/windowing_windowspec2.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; drop table over10k; create table over10k( diff --git ql/src/test/queries/clientpositive/windowing_windowspec3.q ql/src/test/queries/clientpositive/windowing_windowspec3.q index aee0076..09a034d 100644 --- ql/src/test/queries/clientpositive/windowing_windowspec3.q +++ ql/src/test/queries/clientpositive/windowing_windowspec3.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; -- Test value based windowing spec drop table if exists emp; diff --git ql/src/test/queries/clientpositive/windowing_windowspec4.q ql/src/test/queries/clientpositive/windowing_windowspec4.q index fcf0f25..d48d2a7 100644 --- ql/src/test/queries/clientpositive/windowing_windowspec4.q +++ ql/src/test/queries/clientpositive/windowing_windowspec4.q @@ -1,3 +1,4 @@ +SET hive.vectorized.execution.enabled=true; --Test small dataset with larger windowing drop table if exists smalltable_windowing;