You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by px...@apache.org on 2017/01/19 04:29:30 UTC
[18/20] hive git commit: IVE-15297: Hive should not split semicolon
within quoted string literals (Pengcheng Xiong,
reviewed by Ashutosh Chauhan) (addendum I)
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_merge7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge7.q.out b/ql/src/test/results/clientpositive/llap/orc_merge7.q.out
index 595061e..d86d2dc 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge7.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge7.q.out
@@ -1,16 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- orc merge file tests for dynamic partition case
-
-create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+PREHOOK: query: create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@orc_merge5
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- orc merge file tests for dynamic partition case
-
-create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+POSTHOOK: query: create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@orc_merge5
@@ -30,11 +22,9 @@ POSTHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' in
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@orc_merge5
-PREHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5a partition (st) select userid,string1,subtype,decimal1,ts,subtype from orc_merge5
+PREHOOK: query: explain insert overwrite table orc_merge5a partition (st) select userid,string1,subtype,decimal1,ts,subtype from orc_merge5
PREHOOK: type: QUERY
-POSTHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5a partition (st) select userid,string1,subtype,decimal1,ts,subtype from orc_merge5
+POSTHOOK: query: explain insert overwrite table orc_merge5a partition (st) select userid,string1,subtype,decimal1,ts,subtype from orc_merge5
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -147,14 +137,12 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).string1 SIMPLE [(orc_merge5)or
POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).subtype SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:subtype, type:double, comment:null), ]
POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).ts SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:ts, type:timestamp, comment:null), ]
POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ]
-PREHOOK: query: -- 3 files total
-analyze table orc_merge5a partition(st=80.0) compute statistics noscan
+PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5a
PREHOOK: Output: default@orc_merge5a
PREHOOK: Output: default@orc_merge5a@st=80.0
-POSTHOOK: query: -- 3 files total
-analyze table orc_merge5a partition(st=80.0) compute statistics noscan
+POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
@@ -202,11 +190,9 @@ POSTHOOK: Input: default@orc_merge5a@st=80.0
13 bar 80.0 2 1969-12-31 16:00:05 80.0
2 foo 0.8 1 1969-12-31 16:00:00 0.8
5 eat 0.8 6 1969-12-31 16:00:20 0.8
-PREHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5a partition (st) select userid,string1,subtype,decimal1,ts,subtype from orc_merge5
+PREHOOK: query: explain insert overwrite table orc_merge5a partition (st) select userid,string1,subtype,decimal1,ts,subtype from orc_merge5
PREHOOK: type: QUERY
-POSTHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5a partition (st) select userid,string1,subtype,decimal1,ts,subtype from orc_merge5
+POSTHOOK: query: explain insert overwrite table orc_merge5a partition (st) select userid,string1,subtype,decimal1,ts,subtype from orc_merge5
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -361,14 +347,12 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).string1 SIMPLE [(orc_merge5)or
POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).subtype SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:subtype, type:double, comment:null), ]
POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).ts SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:ts, type:timestamp, comment:null), ]
POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ]
-PREHOOK: query: -- 1 file after merging
-analyze table orc_merge5a partition(st=80.0) compute statistics noscan
+PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5a
PREHOOK: Output: default@orc_merge5a
PREHOOK: Output: default@orc_merge5a@st=80.0
-POSTHOOK: query: -- 1 file after merging
-analyze table orc_merge5a partition(st=80.0) compute statistics noscan
+POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
@@ -574,14 +558,12 @@ POSTHOOK: query: alter table orc_merge5a partition(st=0.8) concatenate
POSTHOOK: type: ALTER_PARTITION_MERGE
POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a@st=0.8
-PREHOOK: query: -- 1 file after merging
-analyze table orc_merge5a partition(st=80.0) compute statistics noscan
+PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5a
PREHOOK: Output: default@orc_merge5a
PREHOOK: Output: default@orc_merge5a@st=80.0
-POSTHOOK: query: -- 1 file after merging
-analyze table orc_merge5a partition(st=80.0) compute statistics noscan
+POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_merge9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge9.q.out b/ql/src/test/results/clientpositive/llap/orc_merge9.q.out
index bdf0fd3..28e51b2 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge9.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge9.q.out
@@ -64,15 +64,11 @@ POSTHOOK: Input: default@ts_merge
50000
Found 1 items
#### A masked pattern was here ####
-PREHOOK: query: -- incompatible merge test (stripe statistics missing)
-
-create table a_merge like alltypesorc
+PREHOOK: query: create table a_merge like alltypesorc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@a_merge
-POSTHOOK: query: -- incompatible merge test (stripe statistics missing)
-
-create table a_merge like alltypesorc
+POSTHOOK: query: create table a_merge like alltypesorc
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@a_merge
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out b/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out
index 3f8d559..e5101f4 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+PREHOOK: query: create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@orc_merge5
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+POSTHOOK: query: create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@orc_merge5
@@ -26,11 +22,9 @@ POSTHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' in
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@orc_merge5
-PREHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
+PREHOOK: query: explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
PREHOOK: type: QUERY
-POSTHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
+POSTHOOK: query: explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -160,13 +154,11 @@ POSTHOOK: Lineage: orc_merge5b.string1 SIMPLE [(orc_merge5)orc_merge5.FieldSchem
POSTHOOK: Lineage: orc_merge5b.subtype SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:subtype, type:double, comment:null), ]
POSTHOOK: Lineage: orc_merge5b.ts SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:ts, type:timestamp, comment:null), ]
POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ]
-PREHOOK: query: -- 5 files total
-analyze table orc_merge5b compute statistics noscan
+PREHOOK: query: analyze table orc_merge5b compute statistics noscan
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5b
PREHOOK: Output: default@orc_merge5b
-POSTHOOK: query: -- 5 files total
-analyze table orc_merge5b compute statistics noscan
+POSTHOOK: query: analyze table orc_merge5b compute statistics noscan
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
POSTHOOK: Output: default@orc_merge5b
@@ -206,13 +198,11 @@ POSTHOOK: query: alter table orc_merge5b concatenate
POSTHOOK: type: ALTER_TABLE_MERGE
POSTHOOK: Input: default@orc_merge5b
POSTHOOK: Output: default@orc_merge5b
-PREHOOK: query: -- 3 file after merging - all 0.12 format files will be merged and 0.11 files will be left behind
-analyze table orc_merge5b compute statistics noscan
+PREHOOK: query: analyze table orc_merge5b compute statistics noscan
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5b
PREHOOK: Output: default@orc_merge5b
-POSTHOOK: query: -- 3 file after merging - all 0.12 format files will be merged and 0.11 files will be left behind
-analyze table orc_merge5b compute statistics noscan
+POSTHOOK: query: analyze table orc_merge5b compute statistics noscan
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
POSTHOOK: Output: default@orc_merge5b
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_merge_incompat2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge_incompat2.q.out b/ql/src/test/results/clientpositive/llap/orc_merge_incompat2.q.out
index e6bfd33..6fcb45a 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge_incompat2.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge_incompat2.q.out
@@ -1,16 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- orc merge file tests for dynamic partition case
-
-create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+PREHOOK: query: create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@orc_merge5
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- orc merge file tests for dynamic partition case
-
-create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+POSTHOOK: query: create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@orc_merge5
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_ppd_date.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_date.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_date.q.out
index e07739d..16d94ca 100644
--- a/ql/src/test/results/clientpositive/llap/orc_ppd_date.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_ppd_date.q.out
@@ -18,13 +18,11 @@ POSTHOOK: Lineage: newtypesorc.c EXPRESSION []
POSTHOOK: Lineage: newtypesorc.d EXPRESSION []
POSTHOOK: Lineage: newtypesorc.da EXPRESSION []
POSTHOOK: Lineage: newtypesorc.v EXPRESSION []
-PREHOOK: query: -- date data types (EQUAL, NOT_EQUAL, LESS_THAN, LESS_THAN_EQUALS, IN, BETWEEN tests)
-select sum(hash(*)) from newtypesorc where da='1970-02-20'
+PREHOOK: query: select sum(hash(*)) from newtypesorc where da='1970-02-20'
PREHOOK: type: QUERY
PREHOOK: Input: default@newtypesorc
#### A masked pattern was here ####
-POSTHOOK: query: -- date data types (EQUAL, NOT_EQUAL, LESS_THAN, LESS_THAN_EQUALS, IN, BETWEEN tests)
-select sum(hash(*)) from newtypesorc where da='1970-02-20'
+POSTHOOK: query: select sum(hash(*)) from newtypesorc where da='1970-02-20'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@newtypesorc
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_ppd_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_decimal.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_decimal.q.out
index 6ddff10..b5e8658 100644
--- a/ql/src/test/results/clientpositive/llap/orc_ppd_decimal.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_ppd_decimal.q.out
@@ -18,13 +18,11 @@ POSTHOOK: Lineage: newtypesorc.c EXPRESSION []
POSTHOOK: Lineage: newtypesorc.d EXPRESSION []
POSTHOOK: Lineage: newtypesorc.da EXPRESSION []
POSTHOOK: Lineage: newtypesorc.v EXPRESSION []
-PREHOOK: query: -- decimal data types (EQUAL, NOT_EQUAL, LESS_THAN, LESS_THAN_EQUALS, IN, BETWEEN tests)
-select sum(hash(*)) from newtypesorc where d=0.22
+PREHOOK: query: select sum(hash(*)) from newtypesorc where d=0.22
PREHOOK: type: QUERY
PREHOOK: Input: default@newtypesorc
#### A masked pattern was here ####
-POSTHOOK: query: -- decimal data types (EQUAL, NOT_EQUAL, LESS_THAN, LESS_THAN_EQUALS, IN, BETWEEN tests)
-select sum(hash(*)) from newtypesorc where d=0.22
+POSTHOOK: query: select sum(hash(*)) from newtypesorc where d=0.22
POSTHOOK: type: QUERY
POSTHOOK: Input: default@newtypesorc
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_ppd_timestamp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_timestamp.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_timestamp.q.out
index f1030a9..ab65906 100644
--- a/ql/src/test/results/clientpositive/llap/orc_ppd_timestamp.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_ppd_timestamp.q.out
@@ -18,13 +18,11 @@ POSTHOOK: Lineage: newtypesorc.c EXPRESSION []
POSTHOOK: Lineage: newtypesorc.d EXPRESSION []
POSTHOOK: Lineage: newtypesorc.ts EXPRESSION []
POSTHOOK: Lineage: newtypesorc.v EXPRESSION []
-PREHOOK: query: -- timestamp data types (EQUAL, NOT_EQUAL, LESS_THAN, LESS_THAN_EQUALS, IN, BETWEEN tests)
-select sum(hash(*)) from newtypesorc where cast(ts as string)='2011-01-01 01:01:01'
+PREHOOK: query: select sum(hash(*)) from newtypesorc where cast(ts as string)='2011-01-01 01:01:01'
PREHOOK: type: QUERY
PREHOOK: Input: default@newtypesorc
#### A masked pattern was here ####
-POSTHOOK: query: -- timestamp data types (EQUAL, NOT_EQUAL, LESS_THAN, LESS_THAN_EQUALS, IN, BETWEEN tests)
-select sum(hash(*)) from newtypesorc where cast(ts as string)='2011-01-01 01:01:01'
+POSTHOOK: query: select sum(hash(*)) from newtypesorc where cast(ts as string)='2011-01-01 01:01:01'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@newtypesorc
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_ppd_varchar.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_varchar.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_varchar.q.out
index 3c43b2f..6c9955f 100644
--- a/ql/src/test/results/clientpositive/llap/orc_ppd_varchar.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_ppd_varchar.q.out
@@ -18,13 +18,11 @@ POSTHOOK: Lineage: newtypesorc.c EXPRESSION []
POSTHOOK: Lineage: newtypesorc.d EXPRESSION []
POSTHOOK: Lineage: newtypesorc.da EXPRESSION []
POSTHOOK: Lineage: newtypesorc.v EXPRESSION []
-PREHOOK: query: -- varchar data types (EQUAL, NOT_EQUAL, LESS_THAN, LESS_THAN_EQUALS, IN, BETWEEN tests)
-select sum(hash(*)) from newtypesorc where v="bee"
+PREHOOK: query: select sum(hash(*)) from newtypesorc where v="bee"
PREHOOK: type: QUERY
PREHOOK: Input: default@newtypesorc
#### A masked pattern was here ####
-POSTHOOK: query: -- varchar data types (EQUAL, NOT_EQUAL, LESS_THAN, LESS_THAN_EQUALS, IN, BETWEEN tests)
-select sum(hash(*)) from newtypesorc where v="bee"
+POSTHOOK: query: select sum(hash(*)) from newtypesorc where v="bee"
POSTHOOK: type: QUERY
POSTHOOK: Input: default@newtypesorc
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out b/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out
index 48a86cf..ad1d296 100644
--- a/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out
@@ -1,6 +1,4 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE orc_pred(t tinyint,
+PREHOOK: query: CREATE TABLE orc_pred(t tinyint,
si smallint,
i int,
b bigint,
@@ -15,9 +13,7 @@ STORED AS ORC
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@orc_pred
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE orc_pred(t tinyint,
+POSTHOOK: query: CREATE TABLE orc_pred(t tinyint,
si smallint,
i int,
b bigint,
@@ -99,15 +95,11 @@ POSTHOOK: Lineage: orc_pred.s SIMPLE [(staging)staging.FieldSchema(name:s, type:
POSTHOOK: Lineage: orc_pred.si SIMPLE [(staging)staging.FieldSchema(name:si, type:smallint, comment:null), ]
POSTHOOK: Lineage: orc_pred.t SIMPLE [(staging)staging.FieldSchema(name:t, type:tinyint, comment:null), ]
POSTHOOK: Lineage: orc_pred.ts SIMPLE [(staging)staging.FieldSchema(name:ts, type:timestamp, comment:null), ]
-PREHOOK: query: -- no predicate case. the explain plan should not have filter expression in table scan operator
-
-SELECT SUM(HASH(t)) FROM orc_pred
+PREHOOK: query: SELECT SUM(HASH(t)) FROM orc_pred
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_pred
#### A masked pattern was here ####
-POSTHOOK: query: -- no predicate case. the explain plan should not have filter expression in table scan operator
-
-SELECT SUM(HASH(t)) FROM orc_pred
+POSTHOOK: query: SELECT SUM(HASH(t)) FROM orc_pred
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_pred
#### A masked pattern was here ####
@@ -237,19 +229,11 @@ STAGE PLANS:
Processor Tree:
ListSink
-PREHOOK: query: -- all the following queries have predicates which are pushed down to table scan operator if
--- hive.optimize.index.filter is set to true. the explain plan should show filter expression
--- in table scan operator.
-
-SELECT * FROM orc_pred WHERE t<2 limit 1
+PREHOOK: query: SELECT * FROM orc_pred WHERE t<2 limit 1
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_pred
#### A masked pattern was here ####
-POSTHOOK: query: -- all the following queries have predicates which are pushed down to table scan operator if
--- hive.optimize.index.filter is set to true. the explain plan should show filter expression
--- in table scan operator.
-
-SELECT * FROM orc_pred WHERE t<2 limit 1
+POSTHOOK: query: SELECT * FROM orc_pred WHERE t<2 limit 1
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_pred
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_split_elimination.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_split_elimination.q.out b/ql/src/test/results/clientpositive/llap/orc_split_elimination.q.out
index 7134ff5..b26a28d 100644
--- a/ql/src/test/results/clientpositive/llap/orc_split_elimination.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_split_elimination.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table orc_split_elim (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+PREHOOK: query: create table orc_split_elim (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@orc_split_elim
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table orc_split_elim (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+POSTHOOK: query: create table orc_split_elim (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@orc_split_elim
@@ -18,201 +14,105 @@ POSTHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' in
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@orc_split_elim
-PREHOOK: query: -- The above table will have 5 splits with the followings stats
--- Stripe 1:
--- Column 0: count: 5000
--- Column 1: count: 5000 min: 2 max: 100 sum: 499902
--- Column 2: count: 5000 min: foo max: zebra sum: 24998
--- Column 3: count: 5000 min: 0.8 max: 8.0 sum: 39992.8
--- Column 4: count: 5000 min: 0 max: 1.2 sum: 1.2
--- Column 5: count: 5000
--- Stripe 2:
--- Column 0: count: 5000
--- Column 1: count: 5000 min: 13 max: 100 sum: 499913
--- Column 2: count: 5000 min: bar max: zebra sum: 24998
--- Column 3: count: 5000 min: 8.0 max: 80.0 sum: 40072.0
--- Column 4: count: 5000 min: 0 max: 2.2 sum: 2.2
--- Column 5: count: 5000
--- Stripe 3:
--- Column 0: count: 5000
--- Column 1: count: 5000 min: 29 max: 100 sum: 499929
--- Column 2: count: 5000 min: cat max: zebra sum: 24998
--- Column 3: count: 5000 min: 8.0 max: 8.0 sum: 40000.0
--- Column 4: count: 5000 min: 0 max: 3.3 sum: 3.3
--- Column 5: count: 5000
--- Stripe 4:
--- Column 0: count: 5000
--- Column 1: count: 5000 min: 70 max: 100 sum: 499970
--- Column 2: count: 5000 min: dog max: zebra sum: 24998
--- Column 3: count: 5000 min: 1.8 max: 8.0 sum: 39993.8
--- Column 4: count: 5000 min: 0 max: 4.4 sum: 4.4
--- Column 5: count: 5000
--- Stripe 5:
--- Column 0: count: 5000
--- Column 1: count: 5000 min: 5 max: 100 sum: 499905
--- Column 2: count: 5000 min: eat max: zebra sum: 24998
--- Column 3: count: 5000 min: 0.8 max: 8.0 sum: 39992.8
--- Column 4: count: 5000 min: 0 max: 5.5 sum: 5.5
--- Column 5: count: 5000
-
--- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=0
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=0
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- The above table will have 5 splits with the followings stats
--- Stripe 1:
--- Column 0: count: 5000
--- Column 1: count: 5000 min: 2 max: 100 sum: 499902
--- Column 2: count: 5000 min: foo max: zebra sum: 24998
--- Column 3: count: 5000 min: 0.8 max: 8.0 sum: 39992.8
--- Column 4: count: 5000 min: 0 max: 1.2 sum: 1.2
--- Column 5: count: 5000
--- Stripe 2:
--- Column 0: count: 5000
--- Column 1: count: 5000 min: 13 max: 100 sum: 499913
--- Column 2: count: 5000 min: bar max: zebra sum: 24998
--- Column 3: count: 5000 min: 8.0 max: 80.0 sum: 40072.0
--- Column 4: count: 5000 min: 0 max: 2.2 sum: 2.2
--- Column 5: count: 5000
--- Stripe 3:
--- Column 0: count: 5000
--- Column 1: count: 5000 min: 29 max: 100 sum: 499929
--- Column 2: count: 5000 min: cat max: zebra sum: 24998
--- Column 3: count: 5000 min: 8.0 max: 8.0 sum: 40000.0
--- Column 4: count: 5000 min: 0 max: 3.3 sum: 3.3
--- Column 5: count: 5000
--- Stripe 4:
--- Column 0: count: 5000
--- Column 1: count: 5000 min: 70 max: 100 sum: 499970
--- Column 2: count: 5000 min: dog max: zebra sum: 24998
--- Column 3: count: 5000 min: 1.8 max: 8.0 sum: 39993.8
--- Column 4: count: 5000 min: 0 max: 4.4 sum: 4.4
--- Column 5: count: 5000
--- Stripe 5:
--- Column 0: count: 5000
--- Column 1: count: 5000 min: 5 max: 100 sum: 499905
--- Column 2: count: 5000 min: eat max: zebra sum: 24998
--- Column 3: count: 5000 min: 0.8 max: 8.0 sum: 39992.8
--- Column 4: count: 5000 min: 0 max: 5.5 sum: 5.5
--- Column 5: count: 5000
-
--- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=0
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=0
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-PREHOOK: query: -- 0 mapper
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=0
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=0
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 0 mapper
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=0
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=0
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-PREHOOK: query: -- 5 mappers. count should be 0
-select count(*) from orc_split_elim where userid<=0
+PREHOOK: query: select count(*) from orc_split_elim where userid<=0
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 5 mappers. count should be 0
-select count(*) from orc_split_elim where userid<=0
+POSTHOOK: query: select count(*) from orc_split_elim where userid<=0
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
0
-PREHOOK: query: -- 0 mapper
-select count(*) from orc_split_elim where userid<=0
+PREHOOK: query: select count(*) from orc_split_elim where userid<=0
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 0 mapper
-select count(*) from orc_split_elim where userid<=0
+POSTHOOK: query: select count(*) from orc_split_elim where userid<=0
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
0
-PREHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=2
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=2
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=2
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=2
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
-PREHOOK: query: -- 1 mapper
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=2
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=2
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 1 mapper
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=2
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=2
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
-PREHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=5
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=5
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=5
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=5
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 2 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=5
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=5
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 2 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=5
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=5
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=13
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=13
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=13
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=13
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
13 bar 80.0 2 1969-12-31 16:00:05
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 3 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=13
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=13
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 3 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=13
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=13
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
13 bar 80.0 2 1969-12-31 16:00:05
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=29
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=29
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=29
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=29
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
@@ -220,13 +120,11 @@ POSTHOOK: Input: default@orc_split_elim
2 foo 0.8 1 1969-12-31 16:00:00
29 cat 8.0 3 1969-12-31 16:00:10
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 4 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=29
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=29
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 4 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=29
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=29
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
@@ -234,13 +132,11 @@ POSTHOOK: Input: default@orc_split_elim
2 foo 0.8 1 1969-12-31 16:00:00
29 cat 8.0 3 1969-12-31 16:00:10
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=70
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=70
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=70
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=70
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
@@ -249,13 +145,11 @@ POSTHOOK: Input: default@orc_split_elim
29 cat 8.0 3 1969-12-31 16:00:10
5 eat 0.8 6 1969-12-31 16:00:20
70 dog 1.8 4 1969-12-31 16:00:15
-PREHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=70
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=70
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
-POSTHOOK: query: -- 5 mappers
-select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=70
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim where userid<=70
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim
#### A masked pattern was here ####
@@ -264,13 +158,11 @@ POSTHOOK: Input: default@orc_split_elim
29 cat 8.0 3 1969-12-31 16:00:10
5 eat 0.8 6 1969-12-31 16:00:20
70 dog 1.8 4 1969-12-31 16:00:15
-PREHOOK: query: -- partitioned table
-create table orc_split_elim_part (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) partitioned by (country string, year int) stored as orc
+PREHOOK: query: create table orc_split_elim_part (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) partitioned by (country string, year int) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@orc_split_elim_part
-POSTHOOK: query: -- partitioned table
-create table orc_split_elim_part (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) partitioned by (country string, year int) stored as orc
+POSTHOOK: query: create table orc_split_elim_part (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) partitioned by (country string, year int) stored as orc
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@orc_split_elim_part
@@ -304,15 +196,13 @@ POSTHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' in
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@orc_split_elim_part@country=us/year=2001
-PREHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us'
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us'
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
-POSTHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us'
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
@@ -320,15 +210,13 @@ POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
2 foo 0.8 1 1969-12-31 16:00:00
-PREHOOK: query: -- 2 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us'
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us'
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
-POSTHOOK: query: -- 2 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us'
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
@@ -336,15 +224,13 @@ POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
2 foo 0.8 1 1969-12-31 16:00:00
-PREHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and (year=2000 or year=2001)
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and (year=2000 or year=2001)
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
-POSTHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and (year=2000 or year=2001)
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and (year=2000 or year=2001)
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
@@ -352,15 +238,13 @@ POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
2 foo 0.8 1 1969-12-31 16:00:00
-PREHOOK: query: -- 2 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and (year=2000 or year=2001)
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and (year=2000 or year=2001)
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
-POSTHOOK: query: -- 2 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and (year=2000 or year=2001)
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and (year=2000 or year=2001)
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
@@ -368,41 +252,35 @@ POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
2 foo 0.8 1 1969-12-31 16:00:00
-PREHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and year=2000
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and year=2000
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
#### A masked pattern was here ####
-POSTHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and year=2000
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and year=2000
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
-PREHOOK: query: -- 1 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and year=2000
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and year=2000
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
#### A masked pattern was here ####
-POSTHOOK: query: -- 1 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and year=2000
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us' and year=2000
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
-PREHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us'
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us'
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
-POSTHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us'
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
@@ -412,15 +290,13 @@ POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2001
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 4 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us'
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us'
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
-POSTHOOK: query: -- 4 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us'
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
@@ -430,15 +306,13 @@ POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2001
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and (year=2000 or year=2001)
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and (year=2000 or year=2001)
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
-POSTHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and (year=2000 or year=2001)
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and (year=2000 or year=2001)
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
@@ -448,15 +322,13 @@ POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2001
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 4 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and (year=2000 or year=2001)
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and (year=2000 or year=2001)
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2001
#### A masked pattern was here ####
-POSTHOOK: query: -- 4 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and (year=2000 or year=2001)
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and (year=2000 or year=2001)
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
@@ -466,41 +338,35 @@ POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2001
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and year=2000
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and year=2000
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
#### A masked pattern was here ####
-POSTHOOK: query: -- 10 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and year=2000
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and year=2000
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 2 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and year=2000
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and year=2000
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
PREHOOK: Input: default@orc_split_elim_part@country=us/year=2000
#### A masked pattern was here ####
-POSTHOOK: query: -- 2 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and year=2000
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=5 and country='us' and year=2000
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
POSTHOOK: Input: default@orc_split_elim_part@country=us/year=2000
#### A masked pattern was here ####
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
-PREHOOK: query: -- 0 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=70 and country='in'
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=70 and country='in'
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
#### A masked pattern was here ####
-POSTHOOK: query: -- 0 mapper - no split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=70 and country='in'
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=70 and country='in'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
#### A masked pattern was here ####
@@ -512,13 +378,11 @@ POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_p
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
#### A masked pattern was here ####
-PREHOOK: query: -- 0 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=70 and country='in'
+PREHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=70 and country='in'
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_split_elim_part
#### A masked pattern was here ####
-POSTHOOK: query: -- 0 mapper - split elimination
-select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=70 and country='in'
+POSTHOOK: query: select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=70 and country='in'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_split_elim_part
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/parallel.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/parallel.q.out b/ql/src/test/results/clientpositive/llap/parallel.q.out
index 05220db..7dba122 100644
--- a/ql/src/test/results/clientpositive/llap/parallel.q.out
+++ b/ql/src/test/results/clientpositive/llap/parallel.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table if not exists src_a like src
+PREHOOK: query: create table if not exists src_a like src
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@src_a
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table if not exists src_a like src
+POSTHOOK: query: create table if not exists src_a like src
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@src_a
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
index 3254fb4..94c94dc 100644
--- a/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
@@ -1,5 +1,4 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-CREATE TABLE tbl_pred(t tinyint,
+PREHOOK: query: CREATE TABLE tbl_pred(t tinyint,
si smallint,
i int,
b bigint,
@@ -14,8 +13,7 @@ STORED AS PARQUET
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_pred
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-CREATE TABLE tbl_pred(t tinyint,
+POSTHOOK: query: CREATE TABLE tbl_pred(t tinyint,
si smallint,
i int,
b bigint,
@@ -89,15 +87,11 @@ POSTHOOK: Lineage: tbl_pred.s SIMPLE [(staging)staging.FieldSchema(name:s, type:
POSTHOOK: Lineage: tbl_pred.si SIMPLE [(staging)staging.FieldSchema(name:si, type:smallint, comment:null), ]
POSTHOOK: Lineage: tbl_pred.t SIMPLE [(staging)staging.FieldSchema(name:t, type:tinyint, comment:null), ]
POSTHOOK: Lineage: tbl_pred.ts SIMPLE [(staging)staging.FieldSchema(name:ts, type:timestamp, comment:null), ]
-PREHOOK: query: -- no predicate case. the explain plan should not have filter expression in table scan operator
-
-SELECT SUM(HASH(t)) FROM tbl_pred
+PREHOOK: query: SELECT SUM(HASH(t)) FROM tbl_pred
PREHOOK: type: QUERY
PREHOOK: Input: default@tbl_pred
#### A masked pattern was here ####
-POSTHOOK: query: -- no predicate case. the explain plan should not have filter expression in table scan operator
-
-SELECT SUM(HASH(t)) FROM tbl_pred
+POSTHOOK: query: SELECT SUM(HASH(t)) FROM tbl_pred
POSTHOOK: type: QUERY
POSTHOOK: Input: default@tbl_pred
#### A masked pattern was here ####
@@ -227,19 +221,11 @@ STAGE PLANS:
Processor Tree:
ListSink
-PREHOOK: query: -- all the following queries have predicates which are pushed down to table scan operator if
--- hive.optimize.index.filter is set to true. the explain plan should show filter expression
--- in table scan operator.
-
-SELECT * FROM tbl_pred WHERE t<2 limit 1
+PREHOOK: query: SELECT * FROM tbl_pred WHERE t<2 limit 1
PREHOOK: type: QUERY
PREHOOK: Input: default@tbl_pred
#### A masked pattern was here ####
-POSTHOOK: query: -- all the following queries have predicates which are pushed down to table scan operator if
--- hive.optimize.index.filter is set to true. the explain plan should show filter expression
--- in table scan operator.
-
-SELECT * FROM tbl_pred WHERE t<2 limit 1
+POSTHOOK: query: SELECT * FROM tbl_pred WHERE t<2 limit 1
POSTHOOK: type: QUERY
POSTHOOK: Input: default@tbl_pred
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/parquet_types.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/parquet_types.q.out b/ql/src/test/results/clientpositive/llap/parquet_types.q.out
index ad743ef..a3a5640 100644
--- a/ql/src/test/results/clientpositive/llap/parquet_types.q.out
+++ b/ql/src/test/results/clientpositive/llap/parquet_types.q.out
@@ -214,9 +214,7 @@ uvwzy 5 abcdede 7
vwxyz 5 abcdede 7
wxyza 5 abcde 5
bcdef 5 abcde 5
-PREHOOK: query: -- test types in group by
-
-SELECT ctinyint,
+PREHOOK: query: SELECT ctinyint,
MAX(cint),
MIN(csmallint),
COUNT(cstring1),
@@ -228,9 +226,7 @@ ORDER BY ctinyint
PREHOOK: type: QUERY
PREHOOK: Input: default@parquet_types
#### A masked pattern was here ####
-POSTHOOK: query: -- test types in group by
-
-SELECT ctinyint,
+POSTHOOK: query: SELECT ctinyint,
MAX(cint),
MIN(csmallint),
COUNT(cstring1),
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out b/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
index 30957b7..5082734 100644
--- a/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
+++ b/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
@@ -438,8 +438,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
POSTHOOK: Output: default@partition_test_multilevel@level1=2222/level2=333/level3=44
POSTHOOK: Lineage: partition_test_multilevel PARTITION(level1=2222,level2=333,level3=44).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: partition_test_multilevel PARTITION(level1=2222,level2=333,level3=44).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: -- beginning level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=111/level3=11
@@ -455,8 +454,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
#### A masked pattern was here ####
-POSTHOOK: query: -- beginning level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=111/level3=11
@@ -572,8 +570,7 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3
1111 333 22 20
1111 333 33 21
1111 333 44 22
-PREHOOK: query: -- middle level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level2 = '222' group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 = '222' group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=1111/level2=222/level3=11
@@ -585,8 +582,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=33
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=44
#### A masked pattern was here ####
-POSTHOOK: query: -- middle level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level2 = '222' group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 = '222' group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=222/level3=11
@@ -718,8 +714,7 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
2222 333 22 20
2222 333 33 21
2222 333 44 22
-PREHOOK: query: -- ending level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level3 = '22' group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level3 = '22' group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=1111/level2=111/level3=22
@@ -729,8 +724,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=111/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=22
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=22
#### A masked pattern was here ####
-POSTHOOK: query: -- ending level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level3 = '22' group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level3 = '22' group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=111/level3=22
@@ -870,8 +864,7 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
2222 333 11 19
2222 333 33 21
2222 333 44 22
-PREHOOK: query: -- two different levels of partitions in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level2 >= '222' and level3 = '33' group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 >= '222' and level3 = '33' group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=1111/level2=222/level3=33
@@ -879,8 +872,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=33
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
#### A masked pattern was here ####
-POSTHOOK: query: -- two different levels of partitions in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level2 >= '222' and level3 = '33' group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 >= '222' and level3 = '33' group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=222/level3=33
@@ -918,8 +910,7 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3
1111 222 44 18
1111 333 33 21
1111 333 44 22
-PREHOOK: query: -- all levels of partitions in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' and level2 >= '222' and level3 <= '33' group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' and level2 >= '222' and level3 <= '33' group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=11
@@ -929,8 +920,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=22
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
#### A masked pattern was here ####
-POSTHOOK: query: -- all levels of partitions in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' and level2 >= '222' and level3 <= '33' group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' and level2 >= '222' and level3 <= '33' group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=11
@@ -946,8 +936,7 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
2222 333 11 19
2222 333 22 20
2222 333 33 21
-PREHOOK: query: -- between
-select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=11
@@ -957,8 +946,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=22
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
#### A masked pattern was here ####
-POSTHOOK: query: -- between
-select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=11
@@ -1040,8 +1028,7 @@ STAGE PLANS:
Processor Tree:
ListSink
-PREHOOK: query: -- beginning level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=111/level3=11
@@ -1057,8 +1044,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
#### A masked pattern was here ####
-POSTHOOK: query: -- beginning level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=111/level3=11
@@ -1174,8 +1160,7 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3
1111 333 22 20
1111 333 33 21
1111 333 44 22
-PREHOOK: query: -- middle level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level2 = '222' group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 = '222' group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=1111/level2=222/level3=11
@@ -1187,8 +1172,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=33
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=44
#### A masked pattern was here ####
-POSTHOOK: query: -- middle level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level2 = '222' group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 = '222' group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=222/level3=11
@@ -1320,8 +1304,7 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
2222 333 22 20
2222 333 33 21
2222 333 44 22
-PREHOOK: query: -- ending level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level3 = '22' group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level3 = '22' group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=1111/level2=111/level3=22
@@ -1331,8 +1314,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=111/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=22
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=22
#### A masked pattern was here ####
-POSTHOOK: query: -- ending level partition in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level3 = '22' group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level3 = '22' group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=111/level3=22
@@ -1472,8 +1454,7 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
2222 333 11 19
2222 333 33 21
2222 333 44 22
-PREHOOK: query: -- two different levels of partitions in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level2 >= '222' and level3 = '33' group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 >= '222' and level3 = '33' group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=1111/level2=222/level3=33
@@ -1481,8 +1462,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=33
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
#### A masked pattern was here ####
-POSTHOOK: query: -- two different levels of partitions in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level2 >= '222' and level3 = '33' group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 >= '222' and level3 = '33' group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=222/level3=33
@@ -1520,8 +1500,7 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3
1111 222 44 18
1111 333 33 21
1111 333 44 22
-PREHOOK: query: -- all levels of partitions in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' and level2 >= '222' and level3 <= '33' group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' and level2 >= '222' and level3 <= '33' group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=11
@@ -1531,8 +1510,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=22
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
#### A masked pattern was here ####
-POSTHOOK: query: -- all levels of partitions in predicate
-select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' and level2 >= '222' and level3 <= '33' group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' and level2 >= '222' and level3 <= '33' group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=11
@@ -1548,8 +1526,7 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
2222 333 11 19
2222 333 22 20
2222 333 33 21
-PREHOOK: query: -- between
-select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
+PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
PREHOOK: type: QUERY
PREHOOK: Input: default@partition_test_multilevel
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=11
@@ -1559,8 +1536,7 @@ PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=22
PREHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
#### A masked pattern was here ####
-POSTHOOK: query: -- between
-select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
+POSTHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@partition_test_multilevel
POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=11
http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
index fa7abcb..989f25d 100644
--- a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
+++ b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
@@ -1,10 +1,6 @@
-PREHOOK: query: -- test predicate pushdown on a view with a union
-
-drop view v
+PREHOOK: query: drop view v
PREHOOK: type: DROPVIEW
-POSTHOOK: query: -- test predicate pushdown on a view with a union
-
-drop view v
+POSTHOOK: query: drop view v
POSTHOOK: type: DROPVIEW
PREHOOK: query: create table t1_new (key string, value string) partitioned by (ds string)
PREHOOK: type: CREATETABLE