diff --git ql/src/test/queries/clientpositive/multi_insert_partitioned.q ql/src/test/queries/clientpositive/multi_insert_partitioned.q index c37fa70..433ac73 100644 --- ql/src/test/queries/clientpositive/multi_insert_partitioned.q +++ ql/src/test/queries/clientpositive/multi_insert_partitioned.q @@ -1,4 +1,5 @@ --! qt:dataset:src + set hive.stats.column.autogather=false; set hive.mapred.mode=nonstrict; set hive.explain.user=false; diff --git ql/src/test/queries/clientpositive/partition_wise_fileformat15.q ql/src/test/queries/clientpositive/partition_wise_fileformat15.q index 033e123..4bd14e9 100644 --- ql/src/test/queries/clientpositive/partition_wise_fileformat15.q +++ ql/src/test/queries/clientpositive/partition_wise_fileformat15.q @@ -1,5 +1,5 @@ --! qt:dataset:src ---SORT_QUERY_RESULTS + set hive.input.format = org.apache.hadoop.hive.ql.io.CombineHiveInputFormat; -- This tests that the schema can be changed for binary serde data @@ -18,11 +18,11 @@ alter table partition_test_partitioned_n6 add columns (value2 string); -select key+key, value from partition_test_partitioned_n6 where dt is not null; -select * from partition_test_partitioned_n6 where dt is not null; +select key+key, value from partition_test_partitioned_n6 where dt is not null order by dt,key; +select * from partition_test_partitioned_n6 where dt is not null order by dt,key; insert overwrite table partition_test_partitioned_n6 partition(dt='2') select key, value, value from src where key = 86; -select key+key, value, value2, dt from partition_test_partitioned_n6 where dt is not null; -select * from partition_test_partitioned_n6 where dt is not null; +select key+key, value, value2, dt from partition_test_partitioned_n6 where dt is not null order by dt,key; +select * from partition_test_partitioned_n6 where dt is not null order by dt,key; diff --git ql/src/test/queries/clientpositive/partition_wise_fileformat16.q ql/src/test/queries/clientpositive/partition_wise_fileformat16.q index 703b214..93e0ceb 100644 --- ql/src/test/queries/clientpositive/partition_wise_fileformat16.q +++ ql/src/test/queries/clientpositive/partition_wise_fileformat16.q @@ -1,4 +1,5 @@ --! qt:dataset:src + set hive.input.format = org.apache.hadoop.hive.ql.io.CombineHiveInputFormat; -- This tests that the schema can be changed for binary serde data @@ -17,11 +18,11 @@ alter table partition_test_partitioned_n10 add columns (value2 string); -select key+key, value from partition_test_partitioned_n10 where dt is not null; -select * from partition_test_partitioned_n10 where dt is not null; +select key+key, value from partition_test_partitioned_n10 where dt is not null order by dt,key; +select * from partition_test_partitioned_n10 where dt is not null order by dt,key; insert overwrite table partition_test_partitioned_n10 partition(dt='2') select key, value, value from src where key = 86; -select key+key, value, value2, dt from partition_test_partitioned_n10 where dt is not null; -select * from partition_test_partitioned_n10 where dt is not null; +select key+key, value, value2, dt from partition_test_partitioned_n10 where dt is not null order by dt,key; +select * from partition_test_partitioned_n10 where dt is not null order by dt,key; diff --git ql/src/test/results/clientpositive/llap/partition_wise_fileformat15.q.out ql/src/test/results/clientpositive/llap/partition_wise_fileformat15.q.out index 87098d2..f419bd8 100644 --- ql/src/test/results/clientpositive/llap/partition_wise_fileformat15.q.out +++ ql/src/test/results/clientpositive/llap/partition_wise_fileformat15.q.out @@ -84,24 +84,24 @@ POSTHOOK: type: ALTERTABLE_ADDCOLS POSTHOOK: Input: default@partition_test_partitioned_n6 POSTHOOK: Output: default@partition_test_partitioned_n6 -PREHOOK: query: select key+key, value from partition_test_partitioned_n6 where dt is not null +PREHOOK: query: select key+key, value from partition_test_partitioned_n6 where dt is not null order by dt,key PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned_n6 PREHOOK: Input: default@partition_test_partitioned_n6@dt=1 #### A masked pattern was here #### -POSTHOOK: query: select key+key, value from partition_test_partitioned_n6 where dt is not null +POSTHOOK: query: select key+key, value from partition_test_partitioned_n6 where dt is not null order by dt,key POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned_n6 POSTHOOK: Input: default@partition_test_partitioned_n6@dt=1 #### A masked pattern was here #### 476 val_238 476 val_238 -PREHOOK: query: select * from partition_test_partitioned_n6 where dt is not null +PREHOOK: query: select * from partition_test_partitioned_n6 where dt is not null order by dt,key PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned_n6 PREHOOK: Input: default@partition_test_partitioned_n6@dt=1 #### A masked pattern was here #### -POSTHOOK: query: select * from partition_test_partitioned_n6 where dt is not null +POSTHOOK: query: select * from partition_test_partitioned_n6 where dt is not null order by dt,key POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned_n6 POSTHOOK: Input: default@partition_test_partitioned_n6@dt=1 @@ -121,13 +121,13 @@ POSTHOOK: Lineage: partition_test_partitioned_n6 PARTITION(dt=2).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: partition_test_partitioned_n6 PARTITION(dt=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: partition_test_partitioned_n6 PARTITION(dt=2).value2 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: select key+key, value, value2, dt from partition_test_partitioned_n6 where dt is not null +PREHOOK: query: select key+key, value, value2, dt from partition_test_partitioned_n6 where dt is not null order by dt,key PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned_n6 PREHOOK: Input: default@partition_test_partitioned_n6@dt=1 PREHOOK: Input: default@partition_test_partitioned_n6@dt=2 #### A masked pattern was here #### -POSTHOOK: query: select key+key, value, value2, dt from partition_test_partitioned_n6 where dt is not null +POSTHOOK: query: select key+key, value, value2, dt from partition_test_partitioned_n6 where dt is not null order by dt,key POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned_n6 POSTHOOK: Input: default@partition_test_partitioned_n6@dt=1 @@ -136,13 +136,13 @@ 476 val_238 NULL 1 476 val_238 NULL 1 172 val_86 val_86 2 -PREHOOK: query: select * from partition_test_partitioned_n6 where dt is not null +PREHOOK: query: select * from partition_test_partitioned_n6 where dt is not null order by dt,key PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned_n6 PREHOOK: Input: default@partition_test_partitioned_n6@dt=1 PREHOOK: Input: default@partition_test_partitioned_n6@dt=2 #### A masked pattern was here #### -POSTHOOK: query: select * from partition_test_partitioned_n6 where dt is not null +POSTHOOK: query: select * from partition_test_partitioned_n6 where dt is not null order by dt,key POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned_n6 POSTHOOK: Input: default@partition_test_partitioned_n6@dt=1 diff --git ql/src/test/results/clientpositive/llap/partition_wise_fileformat16.q.out ql/src/test/results/clientpositive/llap/partition_wise_fileformat16.q.out index 233e229..07c7a38 100644 --- ql/src/test/results/clientpositive/llap/partition_wise_fileformat16.q.out +++ ql/src/test/results/clientpositive/llap/partition_wise_fileformat16.q.out @@ -84,24 +84,24 @@ POSTHOOK: type: ALTERTABLE_ADDCOLS POSTHOOK: Input: default@partition_test_partitioned_n10 POSTHOOK: Output: default@partition_test_partitioned_n10 -PREHOOK: query: select key+key, value from partition_test_partitioned_n10 where dt is not null +PREHOOK: query: select key+key, value from partition_test_partitioned_n10 where dt is not null order by dt,key PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned_n10 PREHOOK: Input: default@partition_test_partitioned_n10@dt=1 #### A masked pattern was here #### -POSTHOOK: query: select key+key, value from partition_test_partitioned_n10 where dt is not null +POSTHOOK: query: select key+key, value from partition_test_partitioned_n10 where dt is not null order by dt,key POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned_n10 POSTHOOK: Input: default@partition_test_partitioned_n10@dt=1 #### A masked pattern was here #### 476 val_238 476 val_238 -PREHOOK: query: select * from partition_test_partitioned_n10 where dt is not null +PREHOOK: query: select * from partition_test_partitioned_n10 where dt is not null order by dt,key PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned_n10 PREHOOK: Input: default@partition_test_partitioned_n10@dt=1 #### A masked pattern was here #### -POSTHOOK: query: select * from partition_test_partitioned_n10 where dt is not null +POSTHOOK: query: select * from partition_test_partitioned_n10 where dt is not null order by dt,key POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned_n10 POSTHOOK: Input: default@partition_test_partitioned_n10@dt=1 @@ -121,13 +121,13 @@ POSTHOOK: Lineage: partition_test_partitioned_n10 PARTITION(dt=2).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: partition_test_partitioned_n10 PARTITION(dt=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: partition_test_partitioned_n10 PARTITION(dt=2).value2 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: select key+key, value, value2, dt from partition_test_partitioned_n10 where dt is not null +PREHOOK: query: select key+key, value, value2, dt from partition_test_partitioned_n10 where dt is not null order by dt,key PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned_n10 PREHOOK: Input: default@partition_test_partitioned_n10@dt=1 PREHOOK: Input: default@partition_test_partitioned_n10@dt=2 #### A masked pattern was here #### -POSTHOOK: query: select key+key, value, value2, dt from partition_test_partitioned_n10 where dt is not null +POSTHOOK: query: select key+key, value, value2, dt from partition_test_partitioned_n10 where dt is not null order by dt,key POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned_n10 POSTHOOK: Input: default@partition_test_partitioned_n10@dt=1 @@ -136,13 +136,13 @@ 476 val_238 NULL 1 476 val_238 NULL 1 172 val_86 val_86 2 -PREHOOK: query: select * from partition_test_partitioned_n10 where dt is not null +PREHOOK: query: select * from partition_test_partitioned_n10 where dt is not null order by dt,key PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned_n10 PREHOOK: Input: default@partition_test_partitioned_n10@dt=1 PREHOOK: Input: default@partition_test_partitioned_n10@dt=2 #### A masked pattern was here #### -POSTHOOK: query: select * from partition_test_partitioned_n10 where dt is not null +POSTHOOK: query: select * from partition_test_partitioned_n10 where dt is not null order by dt,key POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned_n10 POSTHOOK: Input: default@partition_test_partitioned_n10@dt=1