From 65940caca56f67e87cdb583347437b16a04ec3b3 Mon Sep 17 00:00:00 2001 From: Ashutosh Chauhan Date: Fri, 16 Dec 2016 15:38:26 -0800 Subject: [PATCH] HIVE-15459 : Fix unit test failures on master --- .../clientnegative/subquery_nested_subquery.q | 4 --- .../queries/clientnegative/subquery_shared_alias.q | 6 ---- .../clientpositive/subquery_nested_subquery.q | 4 +++ .../queries/clientpositive/subquery_shared_alias.q | 6 ++++ .../clientpositive/llap/metadataonly1.q.out | 34 ++++++++++------------ .../clientpositive/llap/subquery_notin.q.out | 4 +-- 6 files changed, 27 insertions(+), 31 deletions(-) delete mode 100644 ql/src/test/queries/clientnegative/subquery_nested_subquery.q delete mode 100644 ql/src/test/queries/clientnegative/subquery_shared_alias.q create mode 100644 ql/src/test/queries/clientpositive/subquery_nested_subquery.q create mode 100644 ql/src/test/queries/clientpositive/subquery_shared_alias.q diff --git a/ql/src/test/queries/clientnegative/subquery_nested_subquery.q b/ql/src/test/queries/clientnegative/subquery_nested_subquery.q deleted file mode 100644 index 84c78b7..0000000 --- a/ql/src/test/queries/clientnegative/subquery_nested_subquery.q +++ /dev/null @@ -1,4 +0,0 @@ -select * -from part x -where x.p_name in (select y.p_name from part y where exists (select z.p_name from part z where y.p_name = z.p_name)) -; \ No newline at end of file diff --git a/ql/src/test/queries/clientnegative/subquery_shared_alias.q b/ql/src/test/queries/clientnegative/subquery_shared_alias.q deleted file mode 100644 index d442f07..0000000 --- a/ql/src/test/queries/clientnegative/subquery_shared_alias.q +++ /dev/null @@ -1,6 +0,0 @@ - - -select * -from src -where src.key in (select key from src where key > '9') -; \ No newline at end of file diff --git a/ql/src/test/queries/clientpositive/subquery_nested_subquery.q b/ql/src/test/queries/clientpositive/subquery_nested_subquery.q new file mode 100644 index 0000000..84c78b7 --- /dev/null +++ b/ql/src/test/queries/clientpositive/subquery_nested_subquery.q @@ -0,0 +1,4 @@ +select * +from part x +where x.p_name in (select y.p_name from part y where exists (select z.p_name from part z where y.p_name = z.p_name)) +; \ No newline at end of file diff --git a/ql/src/test/queries/clientpositive/subquery_shared_alias.q b/ql/src/test/queries/clientpositive/subquery_shared_alias.q new file mode 100644 index 0000000..d442f07 --- /dev/null +++ b/ql/src/test/queries/clientpositive/subquery_shared_alias.q @@ -0,0 +1,6 @@ + + +select * +from src +where src.key in (select key from src where key > '9') +; \ No newline at end of file diff --git a/ql/src/test/results/clientpositive/llap/metadataonly1.q.out b/ql/src/test/results/clientpositive/llap/metadataonly1.q.out index 98261bc..1eafc46 100644 --- a/ql/src/test/results/clientpositive/llap/metadataonly1.q.out +++ b/ql/src/test/results/clientpositive/llap/metadataonly1.q.out @@ -145,7 +145,7 @@ STAGE PLANS: Path -> Partition: nullscan://null/default.test1/part_ds=1_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 1 @@ -237,7 +237,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test1 POSTHOOK: Input: default@test1@ds=1 #### A masked pattern was here #### -1 +NULL PREHOOK: query: explain extended select count(distinct ds) from TEST1 PREHOOK: type: QUERY POSTHOOK: query: explain extended select count(distinct ds) from TEST1 @@ -284,7 +284,7 @@ STAGE PLANS: Path -> Partition: nullscan://null/default.test1/part_ds=1_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 1 @@ -376,7 +376,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test1 POSTHOOK: Input: default@test1@ds=1 #### A masked pattern was here #### -1 +0 PREHOOK: query: explain extended select count(ds) from TEST1 PREHOOK: type: QUERY POSTHOOK: query: explain extended select count(ds) from TEST1 @@ -968,7 +968,7 @@ STAGE PLANS: Path -> Partition: nullscan://null/default.test2/part_ds=1_hr=1_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 1 @@ -1013,7 +1013,7 @@ STAGE PLANS: name: default.test2 nullscan://null/default.test2/part_ds=1_hr=2_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 1 @@ -1058,7 +1058,7 @@ STAGE PLANS: name: default.test2 nullscan://null/default.test2/part_ds=1_hr=3_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 1 @@ -1158,7 +1158,6 @@ POSTHOOK: Input: default@test2@ds=1/hr=1 POSTHOOK: Input: default@test2@ds=1/hr=2 POSTHOOK: Input: default@test2@ds=1/hr=3 #### A masked pattern was here #### -1 3 PREHOOK: query: explain extended select ds, count(hr) from TEST2 group by ds PREHOOK: type: QUERY POSTHOOK: query: explain extended select ds, count(hr) from TEST2 group by ds @@ -1446,7 +1445,7 @@ STAGE PLANS: Path -> Partition: nullscan://null/default.test1/part_ds=1_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 1 @@ -1490,7 +1489,7 @@ STAGE PLANS: name: default.test1 nullscan://null/default.test1/part_ds=2_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 2 @@ -1585,7 +1584,7 @@ POSTHOOK: Input: default@test1 POSTHOOK: Input: default@test1@ds=1 POSTHOOK: Input: default@test1@ds=2 #### A masked pattern was here #### -2 +NULL PREHOOK: query: select distinct ds from srcpart PREHOOK: type: QUERY PREHOOK: Input: default@srcpart @@ -1688,7 +1687,7 @@ STAGE PLANS: Path -> Partition: nullscan://null/default.test2/part_ds=01_10_10_hr=01_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 01:10:10 @@ -1733,7 +1732,7 @@ STAGE PLANS: name: default.test2 nullscan://null/default.test2/part_ds=01_10_20_hr=02_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 01:10:20 @@ -1778,7 +1777,7 @@ STAGE PLANS: name: default.test2 nullscan://null/default.test2/part_ds=1_hr=1_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 1 @@ -1823,7 +1822,7 @@ STAGE PLANS: name: default.test2 nullscan://null/default.test2/part_ds=1_hr=2_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 1 @@ -1868,7 +1867,7 @@ STAGE PLANS: name: default.test2 nullscan://null/default.test2/part_ds=1_hr=3_ Partition - input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat + input format: org.apache.hadoop.hive.ql.io.ZeroRowsInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: ds 1 @@ -1974,6 +1973,3 @@ POSTHOOK: Input: default@test2@ds=1/hr=1 POSTHOOK: Input: default@test2@ds=1/hr=2 POSTHOOK: Input: default@test2@ds=1/hr=3 #### A masked pattern was here #### -01:10:10 1 -01:10:20 1 -1 3 diff --git a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out index 47a9d6b..252b058 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out @@ -6728,12 +6728,12 @@ STAGE PLANS: 0 UDFToDouble(_col0) (type: double) 1 UDFToDouble((_col0 + 100)) (type: double) outputColumnNames: _col1, _col2, _col3 - Statistics: Num rows: 13 Data size: 1300 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6 Data size: 600 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col1 (type: string), _col3 (type: int) sort order: ++ Map-reduce partition columns: _col1 (type: string), _col3 (type: int) - Statistics: Num rows: 13 Data size: 1300 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6 Data size: 600 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col2 (type: boolean) Reducer 15 Execution mode: llap -- 1.7.12.4 (Apple Git-37)