http://git-wip-us.apache.org/repos/asf/hive/blob/eacf9f9b/ql/src/test/results/clientpositive/llap/mm_all.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/mm_all.q.out b/ql/src/test/results/clientpositive/llap/mm_all.q.out index b70ae3c..f8001c2 100644 --- a/ql/src/test/results/clientpositive/llap/mm_all.q.out +++ b/ql/src/test/results/clientpositive/llap/mm_all.q.out @@ -153,12 +153,12 @@ POSTHOOK: Input: default@part_mm@key_mm=456 10 456 10 455 10 455 -97 456 97 455 +97 456 97 455 98 455 -98 455 98 456 +98 455 PREHOOK: query: drop table part_mm PREHOOK: type: DROPTABLE PREHOOK: Input: default@part_mm @@ -735,37 +735,195 @@ POSTHOOK: query: drop table skew_dp_union_mm POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@skew_dp_union_mm POSTHOOK: Output: default@skew_dp_union_mm -PREHOOK: query: -- future +PREHOOK: query: create table merge0_mm (id int) stored as orc tblproperties('hivecommit'='true') +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@merge0_mm +POSTHOOK: query: create table merge0_mm (id int) stored as orc tblproperties('hivecommit'='true') +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@merge0_mm +PREHOOK: query: insert into table merge0_mm select key from intermediate +PREHOOK: type: QUERY +PREHOOK: Input: default@intermediate +PREHOOK: Input: default@intermediate@p=455 +PREHOOK: Input: default@intermediate@p=456 +PREHOOK: Output: default@merge0_mm +POSTHOOK: query: insert into table merge0_mm select key from intermediate +POSTHOOK: type: QUERY +POSTHOOK: Input: default@intermediate +POSTHOOK: Input: default@intermediate@p=455 +POSTHOOK: Input: default@intermediate@p=456 +POSTHOOK: Output: default@merge0_mm +POSTHOOK: Lineage: merge0_mm.id SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] +PREHOOK: query: select * from merge0_mm +PREHOOK: type: QUERY +PREHOOK: Input: default@merge0_mm +#### A masked pattern was here #### +POSTHOOK: query: select * from merge0_mm +POSTHOOK: type: QUERY +POSTHOOK: Input: default@merge0_mm +#### A masked pattern was here #### +98 +97 +0 +10 +PREHOOK: query: insert into table merge0_mm select key from intermediate +PREHOOK: type: QUERY +PREHOOK: Input: default@intermediate +PREHOOK: Input: default@intermediate@p=455 +PREHOOK: Input: default@intermediate@p=456 +PREHOOK: Output: default@merge0_mm +POSTHOOK: query: insert into table merge0_mm select key from intermediate +POSTHOOK: type: QUERY +POSTHOOK: Input: default@intermediate +POSTHOOK: Input: default@intermediate@p=455 +POSTHOOK: Input: default@intermediate@p=456 +POSTHOOK: Output: default@merge0_mm +POSTHOOK: Lineage: merge0_mm.id SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] +PREHOOK: query: select * from merge0_mm +PREHOOK: type: QUERY +PREHOOK: Input: default@merge0_mm +#### A masked pattern was here #### +POSTHOOK: query: select * from merge0_mm +POSTHOOK: type: QUERY +POSTHOOK: Input: default@merge0_mm +#### A masked pattern was here #### +98 +97 +0 +10 +98 +97 +0 +10 +PREHOOK: query: drop table merge0_mm +PREHOOK: type: DROPTABLE +PREHOOK: Input: default@merge0_mm +PREHOOK: Output: default@merge0_mm +POSTHOOK: query: drop table merge0_mm +POSTHOOK: type: DROPTABLE +POSTHOOK: Input: default@merge0_mm +POSTHOOK: Output: default@merge0_mm +PREHOOK: query: create table merge1_mm (id int) partitioned by (key int) stored as orc tblproperties('hivecommit'='true') +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@merge1_mm +POSTHOOK: query: create table merge1_mm (id int) partitioned by (key int) stored as orc tblproperties('hivecommit'='true') +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@merge1_mm +PREHOOK: query: insert into table merge1_mm partition (key) select key, key from intermediate +PREHOOK: type: QUERY +PREHOOK: Input: default@intermediate +PREHOOK: Input: default@intermediate@p=455 +PREHOOK: Input: default@intermediate@p=456 +PREHOOK: Output: default@merge1_mm +POSTHOOK: query: insert into table merge1_mm partition (key) select key, key from intermediate +POSTHOOK: type: QUERY +POSTHOOK: Input: default@intermediate +POSTHOOK: Input: default@intermediate@p=455 +POSTHOOK: Input: default@intermediate@p=456 +POSTHOOK: Output: default@merge1_mm@key=0 +POSTHOOK: Output: default@merge1_mm@key=10 +POSTHOOK: Output: default@merge1_mm@key=97 +POSTHOOK: Output: default@merge1_mm@key=98 +POSTHOOK: Lineage: merge1_mm PARTITION(key=0).id SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] +POSTHOOK: Lineage: merge1_mm PARTITION(key=10).id SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] +POSTHOOK: Lineage: merge1_mm PARTITION(key=97).id SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] +POSTHOOK: Lineage: merge1_mm PARTITION(key=98).id SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] +PREHOOK: query: select * from merge1_mm +PREHOOK: type: QUERY +PREHOOK: Input: default@merge1_mm +PREHOOK: Input: default@merge1_mm@key=0 +PREHOOK: Input: default@merge1_mm@key=10 +PREHOOK: Input: default@merge1_mm@key=97 +PREHOOK: Input: default@merge1_mm@key=98 +#### A masked pattern was here #### +POSTHOOK: query: select * from merge1_mm +POSTHOOK: type: QUERY +POSTHOOK: Input: default@merge1_mm +POSTHOOK: Input: default@merge1_mm@key=0 +POSTHOOK: Input: default@merge1_mm@key=10 +POSTHOOK: Input: default@merge1_mm@key=97 +POSTHOOK: Input: default@merge1_mm@key=98 +#### A masked pattern was here #### +97 97 +98 98 +0 0 +10 10 +PREHOOK: query: insert into table merge1_mm partition (key) select key, key from intermediate +PREHOOK: type: QUERY +PREHOOK: Input: default@intermediate +PREHOOK: Input: default@intermediate@p=455 +PREHOOK: Input: default@intermediate@p=456 +PREHOOK: Output: default@merge1_mm +POSTHOOK: query: insert into table merge1_mm partition (key) select key, key from intermediate +POSTHOOK: type: QUERY +POSTHOOK: Input: default@intermediate +POSTHOOK: Input: default@intermediate@p=455 +POSTHOOK: Input: default@intermediate@p=456 +POSTHOOK: Output: default@merge1_mm@key=0 +POSTHOOK: Output: default@merge1_mm@key=10 +POSTHOOK: Output: default@merge1_mm@key=97 +POSTHOOK: Output: default@merge1_mm@key=98 +POSTHOOK: Lineage: merge1_mm PARTITION(key=0).id SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] +POSTHOOK: Lineage: merge1_mm PARTITION(key=10).id SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] +POSTHOOK: Lineage: merge1_mm PARTITION(key=97).id SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] +POSTHOOK: Lineage: merge1_mm PARTITION(key=98).id SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] +PREHOOK: query: select * from merge1_mm +PREHOOK: type: QUERY +PREHOOK: Input: default@merge1_mm +PREHOOK: Input: default@merge1_mm@key=0 +PREHOOK: Input: default@merge1_mm@key=10 +PREHOOK: Input: default@merge1_mm@key=97 +PREHOOK: Input: default@merge1_mm@key=98 +#### A masked pattern was here #### +POSTHOOK: query: select * from merge1_mm +POSTHOOK: type: QUERY +POSTHOOK: Input: default@merge1_mm +POSTHOOK: Input: default@merge1_mm@key=0 +POSTHOOK: Input: default@merge1_mm@key=10 +POSTHOOK: Input: default@merge1_mm@key=97 +POSTHOOK: Input: default@merge1_mm@key=98 +#### A masked pattern was here #### +97 97 +97 97 +98 98 +98 98 +0 0 +0 0 +10 10 +10 10 +PREHOOK: query: drop table merge1_mm +PREHOOK: type: DROPTABLE +PREHOOK: Input: default@merge1_mm +PREHOOK: Output: default@merge1_mm +POSTHOOK: query: drop table merge1_mm +POSTHOOK: type: DROPTABLE +POSTHOOK: Input: default@merge1_mm +POSTHOOK: Output: default@merge1_mm +PREHOOK: query: -- TODO: need to include merge+union, but it's broken for now + + + + + + +-- future + + ---drop table merge_mm; --drop table ctas_mm; -- -- --create table ctas_mm tblproperties ('hivecommit'='true') as select * from src limit 3; -- -- ---set hive.merge.mapredfiles=true; ---set hive.merge.sparkfiles=true; ---set hive.merge.tezfiles=true; --- ---CREATE TABLE merge_mm (key INT, value STRING) --- PARTITIONED BY (ds STRING, part STRING) STORED AS ORC tblproperties ('hivecommit'='true'); --- ---EXPLAIN ---INSERT OVERWRITE TABLE merge_mm PARTITION (ds='123', part) --- SELECT key, value, PMOD(HASH(key), 2) as part --- FROM src; --- ---INSERT OVERWRITE TABLE merge_mm PARTITION (ds='123', part) --- SELECT key, value, PMOD(HASH(key), 2) as part --- FROM src; --- --- --- ---- TODO load, multi-insert etc -- -- @@ -774,37 +932,27 @@ drop table intermediate PREHOOK: type: DROPTABLE PREHOOK: Input: default@intermediate PREHOOK: Output: default@intermediate -POSTHOOK: query: -- future +POSTHOOK: query: -- TODO: need to include merge+union, but it's broken for now + + + + + + +-- future + + ---drop table merge_mm; --drop table ctas_mm; -- -- --create table ctas_mm tblproperties ('hivecommit'='true') as select * from src limit 3; -- -- ---set hive.merge.mapredfiles=true; ---set hive.merge.sparkfiles=true; ---set hive.merge.tezfiles=true; --- ---CREATE TABLE merge_mm (key INT, value STRING) --- PARTITIONED BY (ds STRING, part STRING) STORED AS ORC tblproperties ('hivecommit'='true'); --- ---EXPLAIN ---INSERT OVERWRITE TABLE merge_mm PARTITION (ds='123', part) --- SELECT key, value, PMOD(HASH(key), 2) as part --- FROM src; --- ---INSERT OVERWRITE TABLE merge_mm PARTITION (ds='123', part) --- SELECT key, value, PMOD(HASH(key), 2) as part --- FROM src; --- --- --- ---- TODO load, multi-insert etc -- --
http://git-wip-us.apache.org/repos/asf/hive/blob/eacf9f9b/ql/src/test/results/clientpositive/llap/mm_current.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/mm_current.q.out b/ql/src/test/results/clientpositive/llap/mm_current.q.out index d6d31ea..4d28c63 100644 --- a/ql/src/test/results/clientpositive/llap/mm_current.q.out +++ b/ql/src/test/results/clientpositive/llap/mm_current.q.out @@ -10,181 +10,24 @@ POSTHOOK: query: create table intermediate(key int) partitioned by (p int) store POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@intermediate -PREHOOK: query: insert into table intermediate partition(p='455') select key from src limit 2 +PREHOOK: query: insert into table intermediate partition(p='455') select distinct key from src where key >= 0 order by key desc limit 2 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@intermediate@p=455 -POSTHOOK: query: insert into table intermediate partition(p='455') select key from src limit 2 +POSTHOOK: query: insert into table intermediate partition(p='455') select distinct key from src where key >= 0 order by key desc limit 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@intermediate@p=455 POSTHOOK: Lineage: intermediate PARTITION(p=455).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -PREHOOK: query: insert into table intermediate partition(p='456') select key from src limit 2 +PREHOOK: query: insert into table intermediate partition(p='456') select distinct key from src where key is not null order by key asc limit 2 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@intermediate@p=456 -POSTHOOK: query: insert into table intermediate partition(p='456') select key from src limit 2 +POSTHOOK: query: insert into table intermediate partition(p='456') select distinct key from src where key is not null order by key asc limit 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@intermediate@p=456 POSTHOOK: Lineage: intermediate PARTITION(p=456).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -PREHOOK: query: create table skew_mm(k1 int, k2 int, k4 int) skewed by (k1, k4) on ((0,0),(1,1),(2,2),(3,3)) - stored as directories tblproperties ('hivecommit'='false') -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@skew_mm -POSTHOOK: query: create table skew_mm(k1 int, k2 int, k4 int) skewed by (k1, k4) on ((0,0),(1,1),(2,2),(3,3)) - stored as directories tblproperties ('hivecommit'='false') -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@skew_mm -PREHOOK: query: insert into table skew_mm -select key, key, key from intermediate -PREHOOK: type: QUERY -PREHOOK: Input: default@intermediate -PREHOOK: Input: default@intermediate@p=455 -PREHOOK: Input: default@intermediate@p=456 -PREHOOK: Output: default@skew_mm -POSTHOOK: query: insert into table skew_mm -select key, key, key from intermediate -POSTHOOK: type: QUERY -POSTHOOK: Input: default@intermediate -POSTHOOK: Input: default@intermediate@p=455 -POSTHOOK: Input: default@intermediate@p=456 -POSTHOOK: Output: default@skew_mm -POSTHOOK: Lineage: skew_mm.k1 SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm.k2 SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm.k4 SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -PREHOOK: query: drop table skew_mm -PREHOOK: type: DROPTABLE -PREHOOK: Input: default@skew_mm -PREHOOK: Output: default@skew_mm -POSTHOOK: query: drop table skew_mm -POSTHOOK: type: DROPTABLE -POSTHOOK: Input: default@skew_mm -POSTHOOK: Output: default@skew_mm -PREHOOK: query: create table skew_mm(k1 int, k2 int, k4 int) skewed by (k1, k4) on ((0,0),(1,1),(2,2),(3,3)) - stored as directories tblproperties ('hivecommit'='true') -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@skew_mm -POSTHOOK: query: create table skew_mm(k1 int, k2 int, k4 int) skewed by (k1, k4) on ((0,0),(1,1),(2,2),(3,3)) - stored as directories tblproperties ('hivecommit'='true') -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@skew_mm -PREHOOK: query: insert into table skew_mm -select key, key, key from intermediate -PREHOOK: type: QUERY -PREHOOK: Input: default@intermediate -PREHOOK: Input: default@intermediate@p=455 -PREHOOK: Input: default@intermediate@p=456 -PREHOOK: Output: default@skew_mm -POSTHOOK: query: insert into table skew_mm -select key, key, key from intermediate -POSTHOOK: type: QUERY -POSTHOOK: Input: default@intermediate -POSTHOOK: Input: default@intermediate@p=455 -POSTHOOK: Input: default@intermediate@p=456 -POSTHOOK: Output: default@skew_mm -POSTHOOK: Lineage: skew_mm.k1 SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm.k2 SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm.k4 SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -PREHOOK: query: select * from skew_mm -PREHOOK: type: QUERY -PREHOOK: Input: default@skew_mm -#### A masked pattern was here #### -POSTHOOK: query: select * from skew_mm -POSTHOOK: type: QUERY -POSTHOOK: Input: default@skew_mm -#### A masked pattern was here #### -455 455 455 -455 455 455 -0 0 0 -0 0 0 -PREHOOK: query: drop table skew_mm -PREHOOK: type: DROPTABLE -PREHOOK: Input: default@skew_mm -PREHOOK: Output: default@skew_mm -POSTHOOK: query: drop table skew_mm -POSTHOOK: type: DROPTABLE -POSTHOOK: Input: default@skew_mm -POSTHOOK: Output: default@skew_mm -PREHOOK: query: create table skew_mm(k1 int, k2 int, k4 int) partitioned by (k3 int) -skewed by (k1, k4) on ((0,0),(1,1),(2,2),(3,3)) stored as directories tblproperties ('hivecommit'='true') -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@skew_mm -POSTHOOK: query: create table skew_mm(k1 int, k2 int, k4 int) partitioned by (k3 int) -skewed by (k1, k4) on ((0,0),(1,1),(2,2),(3,3)) stored as directories tblproperties ('hivecommit'='true') -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@skew_mm -PREHOOK: query: insert into table skew_mm partition (k3) -select key as i, key as j, key as k, key as l from intermediate -union all -select key +1 as i, key +2 as j, key +3 as k, key +4 as l from intermediate -PREHOOK: type: QUERY -PREHOOK: Input: default@intermediate -PREHOOK: Input: default@intermediate@p=455 -PREHOOK: Input: default@intermediate@p=456 -PREHOOK: Output: default@skew_mm -POSTHOOK: query: insert into table skew_mm partition (k3) -select key as i, key as j, key as k, key as l from intermediate -union all -select key +1 as i, key +2 as j, key +3 as k, key +4 as l from intermediate -POSTHOOK: type: QUERY -POSTHOOK: Input: default@intermediate -POSTHOOK: Input: default@intermediate@p=455 -POSTHOOK: Input: default@intermediate@p=456 -POSTHOOK: Output: default@skew_mm@k3=0 -POSTHOOK: Output: default@skew_mm@k3=4 -POSTHOOK: Output: default@skew_mm@k3=455 -POSTHOOK: Output: default@skew_mm@k3=459 -POSTHOOK: Lineage: skew_mm PARTITION(k3=0).k1 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm PARTITION(k3=0).k2 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm PARTITION(k3=0).k4 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm PARTITION(k3=455).k1 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm PARTITION(k3=455).k2 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm PARTITION(k3=455).k4 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm PARTITION(k3=459).k1 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm PARTITION(k3=459).k2 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm PARTITION(k3=459).k4 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm PARTITION(k3=4).k1 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm PARTITION(k3=4).k2 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -POSTHOOK: Lineage: skew_mm PARTITION(k3=4).k4 EXPRESSION [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -PREHOOK: query: select * from skew_mm -PREHOOK: type: QUERY -PREHOOK: Input: default@skew_mm -PREHOOK: Input: default@skew_mm@k3=0 -PREHOOK: Input: default@skew_mm@k3=4 -PREHOOK: Input: default@skew_mm@k3=455 -PREHOOK: Input: default@skew_mm@k3=459 -#### A masked pattern was here #### -POSTHOOK: query: select * from skew_mm -POSTHOOK: type: QUERY -POSTHOOK: Input: default@skew_mm -POSTHOOK: Input: default@skew_mm@k3=0 -POSTHOOK: Input: default@skew_mm@k3=4 -POSTHOOK: Input: default@skew_mm@k3=455 -POSTHOOK: Input: default@skew_mm@k3=459 -#### A masked pattern was here #### -0 0 0 0 -0 0 0 0 -1 2 3 4 -1 2 3 4 -455 455 455 455 -455 455 455 455 -456 457 458 459 -456 457 458 459 -PREHOOK: query: drop table skew_mm -PREHOOK: type: DROPTABLE -PREHOOK: Input: default@skew_mm -PREHOOK: Output: default@skew_mm -POSTHOOK: query: drop table skew_mm -POSTHOOK: type: DROPTABLE -POSTHOOK: Input: default@skew_mm -POSTHOOK: Output: default@skew_mm PREHOOK: query: drop table intermediate PREHOOK: type: DROPTABLE PREHOOK: Input: default@intermediate
