From c8e350529a03f523a732086984e1479456819115 Mon Sep 17 00:00:00 2001 From: Ashutosh Chauhan Date: Wed, 25 Nov 2015 09:40:38 -0800 Subject: [PATCH] HIVE-12520 : Fix schema_evol* tests on master --- hbase-handler/src/test/results/positive/hbase_queries.q.out | 1 + ql/src/test/queries/clientpositive/insert_values_nonascii.q | 2 +- .../queries/clientpositive/schema_evol_orc_acid_mapwork_part.q | 2 +- .../queries/clientpositive/schema_evol_orc_acid_mapwork_table.q | 2 +- .../queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q | 2 +- .../queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q | 2 +- .../clientpositive/schema_evol_orc_nonvec_fetchwork_table.q | 3 +-- .../queries/clientpositive/schema_evol_orc_nonvec_mapwork_table.q | 2 +- .../queries/clientpositive/schema_evol_orc_vec_mapwork_table.q | 2 +- .../test/queries/clientpositive/schema_evol_text_fetchwork_table.q | 2 +- .../test/queries/clientpositive/schema_evol_text_mapwork_table.q | 2 +- ql/src/test/results/clientpositive/limit_join_transpose.q.out | 7 +++++++ .../test/results/clientpositive/tez/tez_dynpart_hashjoin_3.q.out | 2 ++ 13 files changed, 20 insertions(+), 11 deletions(-) diff --git a/hbase-handler/src/test/results/positive/hbase_queries.q.out b/hbase-handler/src/test/results/positive/hbase_queries.q.out index fa348e3..1ab9877 100644 --- a/hbase-handler/src/test/results/positive/hbase_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_queries.q.out @@ -176,6 +176,7 @@ STAGE PLANS: key expressions: _col0 (type: string), _col1 (type: string) sort order: ++ Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE + TopN Hash Memory Usage: 0.1 Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) diff --git a/ql/src/test/queries/clientpositive/insert_values_nonascii.q b/ql/src/test/queries/clientpositive/insert_values_nonascii.q index 2e4ef41..52b34e9 100644 --- a/ql/src/test/queries/clientpositive/insert_values_nonascii.q +++ b/ql/src/test/queries/clientpositive/insert_values_nonascii.q @@ -1,6 +1,6 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; -set hive.enforce.bucketing=true; + create table insert_values_nonascii(t1 char(32), t2 string); diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q index 681a4ac..d6919c1 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q +++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; -set hive.enforce.bucketing=true; + SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q index bde5d50..8c933e1 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q +++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; -set hive.enforce.bucketing=true; + SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q index 6b75505..a8770fc 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q +++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; -set hive.enforce.bucketing=true; + SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q index 0edca16..d6e82f5 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q +++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; -set hive.enforce.bucketing=true; + SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q index 04189cd..8e7e373 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q +++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q @@ -1,7 +1,6 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; -set hive.enforce.bucketing=true; SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=more; set hive.exec.dynamic.partition.mode=nonstrict; @@ -53,4 +52,4 @@ select a,b from table2; DROP TABLE table1; -DROP TABLE table2; \ No newline at end of file +DROP TABLE table2; diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_table.q index db57965..6c256ea 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_table.q +++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_table.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; -set hive.enforce.bucketing=true; + SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_table.q index d80d7be..6df2095 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_table.q +++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_table.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; -set hive.enforce.bucketing=true; + SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_fetchwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_text_fetchwork_table.q index 0c85044..7de5367 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_text_fetchwork_table.q +++ b/ql/src/test/queries/clientpositive/schema_evol_text_fetchwork_table.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; -set hive.enforce.bucketing=true; + SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_mapwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_text_mapwork_table.q index 0c85044..7de5367 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_text_mapwork_table.q +++ b/ql/src/test/queries/clientpositive/schema_evol_text_mapwork_table.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; -set hive.enforce.bucketing=true; + SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git a/ql/src/test/results/clientpositive/limit_join_transpose.q.out b/ql/src/test/results/clientpositive/limit_join_transpose.q.out index 8717154..3181cdf 100644 --- a/ql/src/test/results/clientpositive/limit_join_transpose.q.out +++ b/ql/src/test/results/clientpositive/limit_join_transpose.q.out @@ -206,6 +206,7 @@ STAGE PLANS: Reduce Output Operator sort order: Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE Column stats: NONE + TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: string), _col1 (type: string) Reduce Operator Tree: Select Operator @@ -327,6 +328,7 @@ STAGE PLANS: Reduce Output Operator sort order: Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE Column stats: NONE + TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: string), _col1 (type: string) Reduce Operator Tree: Select Operator @@ -498,6 +500,7 @@ STAGE PLANS: Reduce Output Operator sort order: Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE Column stats: NONE + TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: string), _col1 (type: string) Reduce Operator Tree: Select Operator @@ -563,6 +566,7 @@ STAGE PLANS: Reduce Output Operator sort order: Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE Column stats: NONE + TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string) Reduce Operator Tree: Select Operator @@ -692,6 +696,7 @@ STAGE PLANS: key expressions: _col0 (type: string) sort order: + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + TopN Hash Memory Usage: 0.1 value expressions: _col1 (type: string) Reduce Operator Tree: Select Operator @@ -758,6 +763,7 @@ STAGE PLANS: key expressions: _col0 (type: string) sort order: + Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE + TopN Hash Memory Usage: 0.1 value expressions: _col1 (type: string) Reduce Operator Tree: Select Operator @@ -821,6 +827,7 @@ STAGE PLANS: key expressions: _col2 (type: string) sort order: + Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE + TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: string), _col1 (type: string), _col3 (type: string) Reduce Operator Tree: Select Operator diff --git a/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_3.q.out b/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_3.q.out index 29ffb47..efce91e 100644 --- a/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_3.q.out +++ b/ql/src/test/results/clientpositive/tez/tez_dynpart_hashjoin_3.q.out @@ -37,6 +37,7 @@ STAGE PLANS: Reduce Output Operator sort order: Statistics: Num rows: 1 Data size: 215 Basic stats: COMPLETE Column stats: NONE + TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean) Map 4 Map Operator Tree: @@ -135,6 +136,7 @@ STAGE PLANS: Reduce Output Operator sort order: Statistics: Num rows: 1 Data size: 215 Basic stats: COMPLETE Column stats: NONE + TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean) Map 3 Map Operator Tree: -- 1.7.12.4 (Apple Git-37)