You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by mg...@apache.org on 2020/04/22 17:26:39 UTC
[hive] branch master updated: HIVE-23264 Make
partition_wise_fileformat12.q deterministic with order by clauses (Miklos
Gergely, reviewed by Laszlo Bodor)
This is an automated email from the ASF dual-hosted git repository.
mgergely pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 3bb2bf8 HIVE-23264 Make partition_wise_fileformat12.q deterministic with order by clauses (Miklos Gergely, reviewed by Laszlo Bodor)
3bb2bf8 is described below
commit 3bb2bf8813cb4cc578b16459025aa151f3aeb8bd
Author: miklosgergely <mg...@cloudera.com>
AuthorDate: Tue Apr 21 16:11:49 2020 +0200
HIVE-23264 Make partition_wise_fileformat12.q deterministic with order by clauses (Miklos Gergely, reviewed by Laszlo Bodor)
---
.../clientpositive/partition_wise_fileformat12.q | 16 ++++----
.../llap/partition_wise_fileformat12.q.out | 48 +++++++++++-----------
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/ql/src/test/queries/clientpositive/partition_wise_fileformat12.q b/ql/src/test/queries/clientpositive/partition_wise_fileformat12.q
index c9379f4..1933d96 100644
--- a/ql/src/test/queries/clientpositive/partition_wise_fileformat12.q
+++ b/ql/src/test/queries/clientpositive/partition_wise_fileformat12.q
@@ -6,22 +6,22 @@ create table partition_test_partitioned_n9(key string, value string) partitioned
alter table partition_test_partitioned_n9 set serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe';
insert overwrite table partition_test_partitioned_n9 partition(dt='1') select * from src where key = 238;
-select * from partition_test_partitioned_n9 where dt is not null;
-select key+key, value from partition_test_partitioned_n9 where dt is not null;
+select * from partition_test_partitioned_n9 where dt is not null order by key, value, dt;
+select key+key, value from partition_test_partitioned_n9 where dt is not null order by key;
set hive.metastore.disallow.incompatible.col.type.changes=false;
alter table partition_test_partitioned_n9 change key key int;
reset hive.metastore.disallow.incompatible.col.type.changes;
-select key+key, value from partition_test_partitioned_n9 where dt is not null;
-select * from partition_test_partitioned_n9 where dt is not null;
+select key+key, value from partition_test_partitioned_n9 where dt is not null order by key, value;
+select * from partition_test_partitioned_n9 where dt is not null order by key, value, dt;
insert overwrite table partition_test_partitioned_n9 partition(dt='2') select * from src where key = 97;
alter table partition_test_partitioned_n9 add columns (value2 string);
-select key+key, value from partition_test_partitioned_n9 where dt is not null;
-select * from partition_test_partitioned_n9 where dt is not null;
+select key+key, value from partition_test_partitioned_n9 where dt is not null order by key, value;
+select * from partition_test_partitioned_n9 where dt is not null order by key, value, value2, dt;
insert overwrite table partition_test_partitioned_n9 partition(dt='3') select key, value, value from src where key = 200;
-select key+key, value, value2 from partition_test_partitioned_n9 where dt is not null;
-select * from partition_test_partitioned_n9 where dt is not null;
+select key+key, value, value2 from partition_test_partitioned_n9 where dt is not null order by key, value, value2;
+select * from partition_test_partitioned_n9 where dt is not null order by key, value, value2, dt;
diff --git a/ql/src/test/results/clientpositive/llap/partition_wise_fileformat12.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat12.q.out
index c91e2b7..bd1952e 100644
--- a/ql/src/test/results/clientpositive/llap/partition_wise_fileformat12.q.out
+++ b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat12.q.out
@@ -24,24 +24,24 @@ POSTHOOK: Input: default@src
POSTHOOK: Output: default@partition_test_partitioned_n9@dt=1
POSTHOOK: Lineage: partition_test_partitioned_n9 PARTITION(dt=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: partition_test_partitioned_n9 PARTITION(dt=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select * from partition_test_partitioned_n9 where dt is not null
+PREHOOK: query: select * from partition_test_partitioned_n9 where dt is not null order by key, value, dt
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_partitioned_n9
PREHOOK: Input: default@partition_test_partitioned_n9@dt=1
#### A masked pattern was here ####
-POSTHOOK: query: select * from partition_test_partitioned_n9 where dt is not null
+POSTHOOK: query: select * from partition_test_partitioned_n9 where dt is not null order by key, value, dt
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_partitioned_n9
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=1
#### A masked pattern was here ####
238 val_238 1
238 val_238 1
-PREHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null
+PREHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null order by key
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_partitioned_n9
PREHOOK: Input: default@partition_test_partitioned_n9@dt=1
#### A masked pattern was here ####
-POSTHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null
+POSTHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null order by key
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_partitioned_n9
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=1
@@ -56,24 +56,24 @@ POSTHOOK: query: alter table partition_test_partitioned_n9 change key key int
POSTHOOK: type: ALTERTABLE_RENAMECOL
POSTHOOK: Input: default@partition_test_partitioned_n9
POSTHOOK: Output: default@partition_test_partitioned_n9
-PREHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null
+PREHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null order by key, value
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_partitioned_n9
PREHOOK: Input: default@partition_test_partitioned_n9@dt=1
#### A masked pattern was here ####
-POSTHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null
+POSTHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null order by key, value
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_partitioned_n9
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=1
#### A masked pattern was here ####
476 val_238
476 val_238
-PREHOOK: query: select * from partition_test_partitioned_n9 where dt is not null
+PREHOOK: query: select * from partition_test_partitioned_n9 where dt is not null order by key, value, dt
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_partitioned_n9
PREHOOK: Input: default@partition_test_partitioned_n9@dt=1
#### A masked pattern was here ####
-POSTHOOK: query: select * from partition_test_partitioned_n9 where dt is not null
+POSTHOOK: query: select * from partition_test_partitioned_n9 where dt is not null order by key, value, dt
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_partitioned_n9
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=1
@@ -98,38 +98,38 @@ POSTHOOK: query: alter table partition_test_partitioned_n9 add columns (value2 s
POSTHOOK: type: ALTERTABLE_ADDCOLS
POSTHOOK: Input: default@partition_test_partitioned_n9
POSTHOOK: Output: default@partition_test_partitioned_n9
-PREHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null
+PREHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null order by key, value
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_partitioned_n9
PREHOOK: Input: default@partition_test_partitioned_n9@dt=1
PREHOOK: Input: default@partition_test_partitioned_n9@dt=2
#### A masked pattern was here ####
-POSTHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null
+POSTHOOK: query: select key+key, value from partition_test_partitioned_n9 where dt is not null order by key, value
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_partitioned_n9
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=1
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=2
#### A masked pattern was here ####
-476 val_238
-476 val_238
194 val_97
194 val_97
-PREHOOK: query: select * from partition_test_partitioned_n9 where dt is not null
+476 val_238
+476 val_238
+PREHOOK: query: select * from partition_test_partitioned_n9 where dt is not null order by key, value, value2, dt
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_partitioned_n9
PREHOOK: Input: default@partition_test_partitioned_n9@dt=1
PREHOOK: Input: default@partition_test_partitioned_n9@dt=2
#### A masked pattern was here ####
-POSTHOOK: query: select * from partition_test_partitioned_n9 where dt is not null
+POSTHOOK: query: select * from partition_test_partitioned_n9 where dt is not null order by key, value, value2, dt
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_partitioned_n9
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=1
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=2
#### A masked pattern was here ####
-238 val_238 NULL 1
-238 val_238 NULL 1
97 val_97 NULL 2
97 val_97 NULL 2
+238 val_238 NULL 1
+238 val_238 NULL 1
PREHOOK: query: insert overwrite table partition_test_partitioned_n9 partition(dt='3') select key, value, value from src where key = 200
PREHOOK: type: QUERY
PREHOOK: Input: default@src
@@ -141,43 +141,43 @@ POSTHOOK: Output: default@partition_test_partitioned_n9@dt=3
POSTHOOK: Lineage: partition_test_partitioned_n9 PARTITION(dt=3).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: partition_test_partitioned_n9 PARTITION(dt=3).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: partition_test_partitioned_n9 PARTITION(dt=3).value2 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select key+key, value, value2 from partition_test_partitioned_n9 where dt is not null
+PREHOOK: query: select key+key, value, value2 from partition_test_partitioned_n9 where dt is not null order by key, value, value2
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_partitioned_n9
PREHOOK: Input: default@partition_test_partitioned_n9@dt=1
PREHOOK: Input: default@partition_test_partitioned_n9@dt=2
PREHOOK: Input: default@partition_test_partitioned_n9@dt=3
#### A masked pattern was here ####
-POSTHOOK: query: select key+key, value, value2 from partition_test_partitioned_n9 where dt is not null
+POSTHOOK: query: select key+key, value, value2 from partition_test_partitioned_n9 where dt is not null order by key, value, value2
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_partitioned_n9
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=1
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=2
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=3
#### A masked pattern was here ####
-476 val_238 NULL
-476 val_238 NULL
194 val_97 NULL
194 val_97 NULL
400 val_200 val_200
400 val_200 val_200
-PREHOOK: query: select * from partition_test_partitioned_n9 where dt is not null
+476 val_238 NULL
+476 val_238 NULL
+PREHOOK: query: select * from partition_test_partitioned_n9 where dt is not null order by key, value, value2, dt
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_partitioned_n9
PREHOOK: Input: default@partition_test_partitioned_n9@dt=1
PREHOOK: Input: default@partition_test_partitioned_n9@dt=2
PREHOOK: Input: default@partition_test_partitioned_n9@dt=3
#### A masked pattern was here ####
-POSTHOOK: query: select * from partition_test_partitioned_n9 where dt is not null
+POSTHOOK: query: select * from partition_test_partitioned_n9 where dt is not null order by key, value, value2, dt
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_partitioned_n9
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=1
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=2
POSTHOOK: Input: default@partition_test_partitioned_n9@dt=3
#### A masked pattern was here ####
-238 val_238 NULL 1
-238 val_238 NULL 1
97 val_97 NULL 2
97 val_97 NULL 2
200 val_200 val_200 3
200 val_200 val_200 3
+238 val_238 NULL 1
+238 val_238 NULL 1