http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out 
b/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out
index d24ee16..ce3fad2 100644
--- a/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out
+++ b/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out
@@ -1107,53 +1107,37 @@ Storage Desc Params:
 PREHOOK: query: select count(*) from over1k_part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1k_part
-PREHOOK: Input: default@over1k_part@ds=foo/t=27
-PREHOOK: Input: default@over1k_part@ds=foo/t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from over1k_part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1k_part
-POSTHOOK: Input: default@over1k_part@ds=foo/t=27
-POSTHOOK: Input: default@over1k_part@ds=foo/t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 38
 PREHOOK: query: select count(*) from over1k_part_limit
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1k_part_limit
-PREHOOK: Input: default@over1k_part_limit@ds=foo/t=27
-PREHOOK: Input: default@over1k_part_limit@ds=foo/t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from over1k_part_limit
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1k_part_limit
-POSTHOOK: Input: default@over1k_part_limit@ds=foo/t=27
-POSTHOOK: Input: default@over1k_part_limit@ds=foo/t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 20
 PREHOOK: query: select count(*) from over1k_part_buck
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1k_part_buck
-PREHOOK: Input: default@over1k_part_buck@t=27
-PREHOOK: Input: default@over1k_part_buck@t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from over1k_part_buck
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1k_part_buck
-POSTHOOK: Input: default@over1k_part_buck@t=27
-POSTHOOK: Input: default@over1k_part_buck@t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 38
 PREHOOK: query: select count(*) from over1k_part_buck_sort
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1k_part_buck_sort
-PREHOOK: Input: default@over1k_part_buck_sort@t=27
-PREHOOK: Input: default@over1k_part_buck_sort@t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from over1k_part_buck_sort
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1k_part_buck_sort
-POSTHOOK: Input: default@over1k_part_buck_sort@t=27
-POSTHOOK: Input: default@over1k_part_buck_sort@t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 38
 PREHOOK: query: -- tests for HIVE-6883
@@ -1649,14 +1633,10 @@ POSTHOOK: Input: 
default@over1k_part2@ds=foo/t=__HIVE_DEFAULT_PARTITION__
 PREHOOK: query: select count(*) from over1k_part2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1k_part2
-PREHOOK: Input: default@over1k_part2@ds=foo/t=27
-PREHOOK: Input: default@over1k_part2@ds=foo/t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from over1k_part2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1k_part2
-POSTHOOK: Input: default@over1k_part2@ds=foo/t=27
-POSTHOOK: Input: default@over1k_part2@ds=foo/t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 19
 PREHOOK: query: insert overwrite table over1k_part2 partition(ds="foo",t) 
select si,i,b,f,t from over1k where t is null or t=27 order by i
@@ -1796,14 +1776,10 @@ POSTHOOK: Input: 
default@over1k_part2@ds=foo/t=__HIVE_DEFAULT_PARTITION__
 PREHOOK: query: select count(*) from over1k_part2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1k_part2
-PREHOOK: Input: default@over1k_part2@ds=foo/t=27
-PREHOOK: Input: default@over1k_part2@ds=foo/t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from over1k_part2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1k_part2
-POSTHOOK: Input: default@over1k_part2@ds=foo/t=27
-POSTHOOK: Input: default@over1k_part2@ds=foo/t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 19
 PREHOOK: query: -- hadoop-1 does not honor number of reducers in local mode. 
There is always only 1 reducer irrespective of the number of buckets.
@@ -2083,14 +2059,10 @@ POSTHOOK: Input: 
default@over1k_part_buck_sort2@t=__HIVE_DEFAULT_PARTITION__
 PREHOOK: query: select count(*) from over1k_part_buck_sort2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1k_part_buck_sort2
-PREHOOK: Input: default@over1k_part_buck_sort2@t=27
-PREHOOK: Input: default@over1k_part_buck_sort2@t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from over1k_part_buck_sort2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1k_part_buck_sort2
-POSTHOOK: Input: default@over1k_part_buck_sort2@t=27
-POSTHOOK: Input: default@over1k_part_buck_sort2@t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 19
 PREHOOK: query: insert overwrite table over1k_part_buck_sort2 partition(t) 
select si,i,b,f,t from over1k where t is null or t=27
@@ -2226,14 +2198,10 @@ POSTHOOK: Input: 
default@over1k_part_buck_sort2@t=__HIVE_DEFAULT_PARTITION__
 PREHOOK: query: select count(*) from over1k_part_buck_sort2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1k_part_buck_sort2
-PREHOOK: Input: default@over1k_part_buck_sort2@t=27
-PREHOOK: Input: default@over1k_part_buck_sort2@t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from over1k_part_buck_sort2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1k_part_buck_sort2
-POSTHOOK: Input: default@over1k_part_buck_sort2@t=27
-POSTHOOK: Input: default@over1k_part_buck_sort2@t=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 19
 PREHOOK: query: create table over1k_part3(

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/explain_dependency2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_dependency2.q.out 
b/ql/src/test/results/clientpositive/explain_dependency2.q.out
index 7973a60..20bed87 100644
--- a/ql/src/test/results/clientpositive/explain_dependency2.q.out
+++ b/ql/src/test/results/clientpositive/explain_dependency2.q.out
@@ -42,7 +42,7 @@ POSTHOOK: query: -- select from a partitioned table which 
involves a map-reduce
 -- and some partitions are being selected
 EXPLAIN DEPENDENCY SELECT count(*) FROM srcpart where ds is not null
 POSTHOOK: type: QUERY
-{"input_tables":[{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}],"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}]}
+{"input_tables":[{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}],"input_partitions":[]}
 PREHOOK: query: -- select from a partitioned table which involves a map-reduce 
job
 -- and none of the partitions are being selected
 EXPLAIN DEPENDENCY SELECT count(*) FROM srcpart where ds = '1'

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/fileformat_mix.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fileformat_mix.q.out 
b/ql/src/test/results/clientpositive/fileformat_mix.q.out
index 7465914..1df6f51 100644
--- a/ql/src/test/results/clientpositive/fileformat_mix.q.out
+++ b/ql/src/test/results/clientpositive/fileformat_mix.q.out
@@ -44,14 +44,10 @@ POSTHOOK: Output: default@fileformat_mix_test
 PREHOOK: query: select count(1) from fileformat_mix_test
 PREHOOK: type: QUERY
 PREHOOK: Input: default@fileformat_mix_test
-PREHOOK: Input: default@fileformat_mix_test@ds=1
-PREHOOK: Input: default@fileformat_mix_test@ds=2
 #### A masked pattern was here ####
 POSTHOOK: query: select count(1) from fileformat_mix_test
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@fileformat_mix_test
-POSTHOOK: Input: default@fileformat_mix_test@ds=1
-POSTHOOK: Input: default@fileformat_mix_test@ds=2
 #### A masked pattern was here ####
 500
 PREHOOK: query: select src from fileformat_mix_test

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/fold_case.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fold_case.q.out 
b/ql/src/test/results/clientpositive/fold_case.q.out
index acf1e4c..304d37a 100644
--- a/ql/src/test/results/clientpositive/fold_case.q.out
+++ b/ql/src/test/results/clientpositive/fold_case.q.out
@@ -158,44 +158,12 @@ POSTHOOK: query: explain
 select count(1) from src where (case key when '238' then true else 1=1 end)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: src
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: COMPLETE
-            Select Operator
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: COMPLETE
-              Group By Operator
-                aggregations: count(1)
-                mode: hash
-                outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
-                Reduce Output Operator
-                  sort order: 
-                  Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
-                  value expressions: _col0 (type: bigint)
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations: count(VALUE._col0)
-          mode: mergepartial
-          outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: COMPLETE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: COMPLETE
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
   Stage: Stage-0
     Fetch Operator
-      limit: -1
+      limit: 1
       Processor Tree:
         ListSink
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/input24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input24.q.out 
b/ql/src/test/results/clientpositive/input24.q.out
index 06df447..935fff4 100644
--- a/ql/src/test/results/clientpositive/input24.q.out
+++ b/ql/src/test/results/clientpositive/input24.q.out
@@ -20,55 +20,21 @@ POSTHOOK: query: explain
 select count(1) from tst x where x.d='2009-01-01'
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: x
-            Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-            Select Operator
-              Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
-              Group By Operator
-                aggregations: count(1)
-                mode: hash
-                outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                Reduce Output Operator
-                  sort order: 
-                  Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                  value expressions: _col0 (type: bigint)
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations: count(VALUE._col0)
-          mode: mergepartial
-          outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
   Stage: Stage-0
     Fetch Operator
-      limit: -1
+      limit: 1
       Processor Tree:
         ListSink
 
 PREHOOK: query: select count(1) from tst x where x.d='2009-01-01'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tst
-PREHOOK: Input: default@tst@d=2009-01-01
 #### A masked pattern was here ####
 POSTHOOK: query: select count(1) from tst x where x.d='2009-01-01'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tst
-POSTHOOK: Input: default@tst@d=2009-01-01
 #### A masked pattern was here ####
 0

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out 
b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
index 7f99f17..e0af0c6 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
@@ -100,12 +100,10 @@ Storage Desc Params:
 PREHOOK: query: SELECT count(1) FROM fact_daily WHERE ds='1' and hr='4'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@fact_daily
-PREHOOK: Input: default@fact_daily@ds=1/hr=4
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT count(1) FROM fact_daily WHERE ds='1' and hr='4'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@fact_daily
-POSTHOOK: Input: default@fact_daily@ds=1/hr=4
 #### A masked pattern was here ####
 500
 PREHOOK: query: -- pruner only pick up skewed-value directory

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out 
b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
index 8c08106..dcc45d6 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
@@ -100,12 +100,10 @@ Storage Desc Params:
 PREHOOK: query: SELECT count(1) FROM fact_daily WHERE ds='1' and hr='4'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@fact_daily
-PREHOOK: Input: default@fact_daily@ds=1/hr=4
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT count(1) FROM fact_daily WHERE ds='1' and hr='4'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@fact_daily
-POSTHOOK: Input: default@fact_daily@ds=1/hr=4
 #### A masked pattern was here ####
 500
 PREHOOK: query: -- pruner only pick up default directory

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out 
b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
index 6a421f3..7da4e7c 100644
--- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
@@ -319,127 +319,22 @@ POSTHOOK: query: explain extended
 select count(*) from fact_daily where ds = '1' and  hr='1'
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: fact_daily
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-            GatherStats: false
-            Select Operator
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-              Group By Operator
-                aggregations: count()
-                mode: hash
-                outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                Reduce Output Operator
-                  null sort order: 
-                  sort order: 
-                  Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                  tag: -1
-                  value expressions: _col0 (type: bigint)
-                  auto parallelism: false
-      Path -> Alias:
-#### A masked pattern was here ####
-      Path -> Partition:
-#### A masked pattern was here ####
-          Partition
-            base file name: hr=1
-            input format: org.apache.hadoop.mapred.TextInputFormat
-            output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-            partition values:
-              ds 1
-              hr 1
-            properties:
-              COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
-              bucket_count -1
-              columns key,value
-              columns.comments 
-              columns.types string:string
-#### A masked pattern was here ####
-              name default.fact_daily
-              numFiles 1
-              numRows 500
-              partition_columns ds/hr
-              partition_columns.types string:string
-              rawDataSize 5312
-              serialization.ddl struct fact_daily { string key, string value}
-              serialization.format 1
-              serialization.lib 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              totalSize 5812
-#### A masked pattern was here ####
-            serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-          
-              input format: org.apache.hadoop.mapred.TextInputFormat
-              output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-              properties:
-                bucket_count -1
-                columns key,value
-                columns.comments 
-                columns.types string:string
-#### A masked pattern was here ####
-                name default.fact_daily
-                partition_columns ds/hr
-                partition_columns.types string:string
-                serialization.ddl struct fact_daily { string key, string value}
-                serialization.format 1
-                serialization.lib 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-#### A masked pattern was here ####
-              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              name: default.fact_daily
-            name: default.fact_daily
-      Truncated Path -> Alias:
-        /fact_daily/ds=1/hr=1 [fact_daily]
-      Needs Tagging: false
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations: count(VALUE._col0)
-          mode: mergepartial
-          outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-          File Output Operator
-            compressed: false
-            GlobalTableId: 0
-#### A masked pattern was here ####
-            NumFilesPerFileSink: 1
-            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-#### A masked pattern was here ####
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                properties:
-                  columns _col0
-                  columns.types bigint
-                  escape.delim \
-                  hive.serialization.extend.additional.nesting.levels true
-                  serialization.escape.crlf true
-                  serialization.format 1
-                  serialization.lib 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-            TotalFiles: 1
-            GatherStats: false
-            MultiFileSpray: false
-
   Stage: Stage-0
     Fetch Operator
-      limit: -1
+      limit: 1
       Processor Tree:
         ListSink
 
 PREHOOK: query: select count(*) from fact_daily where ds = '1' and  hr='1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@fact_daily
-PREHOOK: Input: default@fact_daily@ds=1/hr=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from fact_daily where ds = '1' and  hr='1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@fact_daily
-POSTHOOK: Input: default@fact_daily@ds=1/hr=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: -- query skewed partition

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out 
b/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out
index 86af660..ca168c8 100644
--- a/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out
+++ b/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out
@@ -242,13 +242,9 @@ ds=2008-04-08/hr=b1
 PREHOOK: query: select count(*) from merge_dynamic_part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@merge_dynamic_part
-PREHOOK: Input: default@merge_dynamic_part@ds=2008-04-08/hr=a1
-PREHOOK: Input: default@merge_dynamic_part@ds=2008-04-08/hr=b1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from merge_dynamic_part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@merge_dynamic_part
-POSTHOOK: Input: default@merge_dynamic_part@ds=2008-04-08/hr=a1
-POSTHOOK: Input: default@merge_dynamic_part@ds=2008-04-08/hr=b1
 #### A masked pattern was here ####
 1000

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out 
b/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out
index c1468c1..38e1ad8 100644
--- a/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out
+++ b/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out
@@ -216,13 +216,9 @@ ds=2008-04-08/hr=b1
 PREHOOK: query: select count(*) from merge_dynamic_part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@merge_dynamic_part
-PREHOOK: Input: default@merge_dynamic_part@ds=2008-04-08/hr=a1
-PREHOOK: Input: default@merge_dynamic_part@ds=2008-04-08/hr=b1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from merge_dynamic_part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@merge_dynamic_part
-POSTHOOK: Input: default@merge_dynamic_part@ds=2008-04-08/hr=a1
-POSTHOOK: Input: default@merge_dynamic_part@ds=2008-04-08/hr=b1
 #### A masked pattern was here ####
 618

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/orc_merge1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_merge1.q.out 
b/ql/src/test/results/clientpositive/orc_merge1.q.out
index 3f047da..63dd19c 100644
--- a/ql/src/test/results/clientpositive/orc_merge1.q.out
+++ b/ql/src/test/results/clientpositive/orc_merge1.q.out
@@ -400,40 +400,28 @@ POSTHOOK: Input: default@orcfile_merge1c@ds=1/part=1
 PREHOOK: query: select count(*) from orcfile_merge1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1
-PREHOOK: Input: default@orcfile_merge1@ds=1/part=0
-PREHOOK: Input: default@orcfile_merge1@ds=1/part=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from orcfile_merge1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1
-POSTHOOK: Input: default@orcfile_merge1@ds=1/part=0
-POSTHOOK: Input: default@orcfile_merge1@ds=1/part=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from orcfile_merge1b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1b
-PREHOOK: Input: default@orcfile_merge1b@ds=1/part=0
-PREHOOK: Input: default@orcfile_merge1b@ds=1/part=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from orcfile_merge1b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1b
-POSTHOOK: Input: default@orcfile_merge1b@ds=1/part=0
-POSTHOOK: Input: default@orcfile_merge1b@ds=1/part=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from orcfile_merge1c
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1c
-PREHOOK: Input: default@orcfile_merge1c@ds=1/part=0
-PREHOOK: Input: default@orcfile_merge1c@ds=1/part=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from orcfile_merge1c
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1c
-POSTHOOK: Input: default@orcfile_merge1c@ds=1/part=0
-POSTHOOK: Input: default@orcfile_merge1c@ds=1/part=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: DROP TABLE orcfile_merge1

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/orc_merge10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_merge10.q.out 
b/ql/src/test/results/clientpositive/orc_merge10.q.out
index 1d64ae5..efb5669 100644
--- a/ql/src/test/results/clientpositive/orc_merge10.q.out
+++ b/ql/src/test/results/clientpositive/orc_merge10.q.out
@@ -381,27 +381,19 @@ POSTHOOK: Input: default@orcfile_merge1b@ds=1/part=1
 PREHOOK: query: select count(*) from orcfile_merge1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1
-PREHOOK: Input: default@orcfile_merge1@ds=1/part=0
-PREHOOK: Input: default@orcfile_merge1@ds=1/part=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from orcfile_merge1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1
-POSTHOOK: Input: default@orcfile_merge1@ds=1/part=0
-POSTHOOK: Input: default@orcfile_merge1@ds=1/part=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from orcfile_merge1b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1b
-PREHOOK: Input: default@orcfile_merge1b@ds=1/part=0
-PREHOOK: Input: default@orcfile_merge1b@ds=1/part=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from orcfile_merge1b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1b
-POSTHOOK: Input: default@orcfile_merge1b@ds=1/part=0
-POSTHOOK: Input: default@orcfile_merge1b@ds=1/part=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: -- concatenate
@@ -500,14 +492,10 @@ POSTHOOK: Input: default@orcfile_merge1@ds=1/part=1
 PREHOOK: query: select count(*) from orcfile_merge1c
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1c
-PREHOOK: Input: default@orcfile_merge1c@ds=1/part=0
-PREHOOK: Input: default@orcfile_merge1c@ds=1/part=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from orcfile_merge1c
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1c
-POSTHOOK: Input: default@orcfile_merge1c@ds=1/part=0
-POSTHOOK: Input: default@orcfile_merge1c@ds=1/part=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select * from orcfile_merge1 where ds='1' and part='0' limit 1

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/partition_boolexpr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partition_boolexpr.q.out 
b/ql/src/test/results/clientpositive/partition_boolexpr.q.out
index fe33e18..8e75910 100644
--- a/ql/src/test/results/clientpositive/partition_boolexpr.q.out
+++ b/ql/src/test/results/clientpositive/partition_boolexpr.q.out
@@ -32,44 +32,12 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain select count(1) from srcpart where true
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: srcpart
-            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-              Group By Operator
-                aggregations: count(1)
-                mode: hash
-                outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                Reduce Output Operator
-                  sort order: 
-                  Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                  value expressions: _col0 (type: bigint)
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations: count(VALUE._col0)
-          mode: mergepartial
-          outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
   Stage: Stage-0
     Fetch Operator
-      limit: -1
+      limit: 1
       Processor Tree:
         ListSink
 
@@ -127,44 +95,12 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain select count(1) from srcpart where true and hr='11'
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: srcpart
-            Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
-              Group By Operator
-                aggregations: count(1)
-                mode: hash
-                outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                Reduce Output Operator
-                  sort order: 
-                  Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                  value expressions: _col0 (type: bigint)
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations: count(VALUE._col0)
-          mode: mergepartial
-          outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
   Stage: Stage-0
     Fetch Operator
-      limit: -1
+      limit: 1
       Processor Tree:
         ListSink
 
@@ -173,44 +109,12 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain select count(1) from srcpart where true or hr='11'
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: srcpart
-            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-              Group By Operator
-                aggregations: count(1)
-                mode: hash
-                outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                Reduce Output Operator
-                  sort order: 
-                  Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                  value expressions: _col0 (type: bigint)
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations: count(VALUE._col0)
-          mode: mergepartial
-          outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
   Stage: Stage-0
     Fetch Operator
-      limit: -1
+      limit: 1
       Processor Tree:
         ListSink
 
@@ -219,44 +123,12 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain select count(1) from srcpart where false or hr='11'
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: srcpart
-            Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
-              Group By Operator
-                aggregations: count(1)
-                mode: hash
-                outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                Reduce Output Operator
-                  sort order: 
-                  Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                  value expressions: _col0 (type: bigint)
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations: count(VALUE._col0)
-          mode: mergepartial
-          outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
   Stage: Stage-0
     Fetch Operator
-      limit: -1
+      limit: 1
       Processor Tree:
         ListSink
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/partition_date.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partition_date.q.out 
b/ql/src/test/results/clientpositive/partition_date.q.out
index 9720a48..f6584ee 100644
--- a/ql/src/test/results/clientpositive/partition_date.q.out
+++ b/ql/src/test/results/clientpositive/partition_date.q.out
@@ -110,71 +110,55 @@ PREHOOK: query: -- 15
 select count(*) from partition_date_1 where dt = date '2000-01-01'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
-PREHOOK: Input: default@partition_date_1@dt=2000-01-01/region=2
 #### A masked pattern was here ####
 POSTHOOK: query: -- 15
 select count(*) from partition_date_1 where dt = date '2000-01-01'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
-POSTHOOK: Input: default@partition_date_1@dt=2000-01-01/region=2
 #### A masked pattern was here ####
 15
 PREHOOK: query: -- 15.  Also try with string value in predicate
 select count(*) from partition_date_1 where dt = '2000-01-01'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
-PREHOOK: Input: default@partition_date_1@dt=2000-01-01/region=2
 #### A masked pattern was here ####
 POSTHOOK: query: -- 15.  Also try with string value in predicate
 select count(*) from partition_date_1 where dt = '2000-01-01'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
-POSTHOOK: Input: default@partition_date_1@dt=2000-01-01/region=2
 #### A masked pattern was here ####
 15
 PREHOOK: query: -- 5
 select count(*) from partition_date_1 where dt = date '2000-01-01' and region 
= '2'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2000-01-01/region=2
 #### A masked pattern was here ####
 POSTHOOK: query: -- 5
 select count(*) from partition_date_1 where dt = date '2000-01-01' and region 
= '2'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2000-01-01/region=2
 #### A masked pattern was here ####
 5
 PREHOOK: query: -- 11
 select count(*) from partition_date_1 where dt = date '2013-08-08' and region 
= '10'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2013-08-08/region=10
 #### A masked pattern was here ####
 POSTHOOK: query: -- 11
 select count(*) from partition_date_1 where dt = date '2013-08-08' and region 
= '10'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2013-08-08/region=10
 #### A masked pattern was here ####
 11
 PREHOOK: query: -- 30
 select count(*) from partition_date_1 where region = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
-PREHOOK: Input: default@partition_date_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 30
 select count(*) from partition_date_1 where region = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
-POSTHOOK: Input: default@partition_date_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 30
 PREHOOK: query: -- 0
@@ -205,7 +189,6 @@ PREHOOK: query: -- Try other comparison operations
 select count(*) from partition_date_1 where dt > date '2000-01-01' and region 
= '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- Try other comparison operations
 
@@ -213,72 +196,61 @@ POSTHOOK: query: -- Try other comparison operations
 select count(*) from partition_date_1 where dt > date '2000-01-01' and region 
= '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 20
 PREHOOK: query: -- 10
 select count(*) from partition_date_1 where dt < date '2000-01-02' and region 
= '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 10
 select count(*) from partition_date_1 where dt < date '2000-01-02' and region 
= '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
 #### A masked pattern was here ####
 10
 PREHOOK: query: -- 20
 select count(*) from partition_date_1 where dt >= date '2000-01-02' and region 
= '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 20
 select count(*) from partition_date_1 where dt >= date '2000-01-02' and region 
= '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 20
 PREHOOK: query: -- 10
 select count(*) from partition_date_1 where dt <= date '2000-01-01' and region 
= '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 10
 select count(*) from partition_date_1 where dt <= date '2000-01-01' and region 
= '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
 #### A masked pattern was here ####
 10
 PREHOOK: query: -- 20
 select count(*) from partition_date_1 where dt <> date '2000-01-01' and region 
= '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 20
 select count(*) from partition_date_1 where dt <> date '2000-01-01' and region 
= '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 20
 PREHOOK: query: -- 10
 select count(*) from partition_date_1 where dt between date '1999-12-30' and 
date '2000-01-03' and region = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 10
 select count(*) from partition_date_1 where dt between date '1999-12-30' and 
date '2000-01-03' and region = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2000-01-01/region=1
 #### A masked pattern was here ####
 10
 PREHOOK: query: -- Try a string key with date-like strings
@@ -287,7 +259,6 @@ PREHOOK: query: -- Try a string key with date-like strings
 select count(*) from partition_date_1 where region = '2020-20-20'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2013-12-10/region=2020-20-20
 #### A masked pattern was here ####
 POSTHOOK: query: -- Try a string key with date-like strings
 
@@ -295,20 +266,17 @@ POSTHOOK: query: -- Try a string key with date-like 
strings
 select count(*) from partition_date_1 where region = '2020-20-20'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2013-12-10/region=2020-20-20
 #### A masked pattern was here ####
 5
 PREHOOK: query: -- 5
 select count(*) from partition_date_1 where region > '2010-01-01'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_date_1
-PREHOOK: Input: default@partition_date_1@dt=2013-12-10/region=2020-20-20
 #### A masked pattern was here ####
 POSTHOOK: query: -- 5
 select count(*) from partition_date_1 where region > '2010-01-01'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_date_1
-POSTHOOK: Input: default@partition_date_1@dt=2013-12-10/region=2020-20-20
 #### A masked pattern was here ####
 5
 PREHOOK: query: drop table partition_date_1

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/partition_decode_name.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partition_decode_name.q.out 
b/ql/src/test/results/clientpositive/partition_decode_name.q.out
index 2c700dc..ea60750 100644
--- a/ql/src/test/results/clientpositive/partition_decode_name.q.out
+++ b/ql/src/test/results/clientpositive/partition_decode_name.q.out
@@ -53,16 +53,10 @@ ts=2011-01-11+16%3A18%3A26
 PREHOOK: query: select count(*) from sc_part where ts is not null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@sc_part
-PREHOOK: Input: default@sc_part@ts=2011-01-11+14%3A18%3A26
-PREHOOK: Input: default@sc_part@ts=2011-01-11+15%3A18%3A26
-PREHOOK: Input: default@sc_part@ts=2011-01-11+16%3A18%3A26
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from sc_part where ts is not null
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@sc_part
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+14%3A18%3A26
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+15%3A18%3A26
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+16%3A18%3A26
 #### A masked pattern was here ####
 3
 PREHOOK: query: insert overwrite table sc_part partition(ts) select * from sc
@@ -90,15 +84,9 @@ ts=2011-01-11+16:18:26
 PREHOOK: query: select count(*) from sc_part where ts is not null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@sc_part
-PREHOOK: Input: default@sc_part@ts=2011-01-11+14%3A18%3A26
-PREHOOK: Input: default@sc_part@ts=2011-01-11+15%3A18%3A26
-PREHOOK: Input: default@sc_part@ts=2011-01-11+16%3A18%3A26
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from sc_part where ts is not null
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@sc_part
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+14%3A18%3A26
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+15%3A18%3A26
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+16%3A18%3A26
 #### A masked pattern was here ####
 3

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/partition_special_char.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partition_special_char.q.out 
b/ql/src/test/results/clientpositive/partition_special_char.q.out
index 18ca0c3..c7a8451 100644
--- a/ql/src/test/results/clientpositive/partition_special_char.q.out
+++ b/ql/src/test/results/clientpositive/partition_special_char.q.out
@@ -53,16 +53,10 @@ ts=2011-01-11+16%3A18%3A26
 PREHOOK: query: select count(*) from sc_part where ts is not null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@sc_part
-PREHOOK: Input: default@sc_part@ts=2011-01-11+14%3A18%3A26
-PREHOOK: Input: default@sc_part@ts=2011-01-11+15%3A18%3A26
-PREHOOK: Input: default@sc_part@ts=2011-01-11+16%3A18%3A26
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from sc_part where ts is not null
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@sc_part
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+14%3A18%3A26
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+15%3A18%3A26
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+16%3A18%3A26
 #### A masked pattern was here ####
 3
 PREHOOK: query: insert overwrite table sc_part partition(ts) select * from sc
@@ -90,15 +84,9 @@ ts=2011-01-11+16%3A18%3A26
 PREHOOK: query: select count(*) from sc_part where ts is not null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@sc_part
-PREHOOK: Input: default@sc_part@ts=2011-01-11+14%3A18%3A26
-PREHOOK: Input: default@sc_part@ts=2011-01-11+15%3A18%3A26
-PREHOOK: Input: default@sc_part@ts=2011-01-11+16%3A18%3A26
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from sc_part where ts is not null
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@sc_part
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+14%3A18%3A26
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+15%3A18%3A26
-POSTHOOK: Input: default@sc_part@ts=2011-01-11+16%3A18%3A26
 #### A masked pattern was here ####
 3

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/partition_timestamp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partition_timestamp.q.out 
b/ql/src/test/results/clientpositive/partition_timestamp.q.out
index 566a9fc..b32d98d 100644
--- a/ql/src/test/results/clientpositive/partition_timestamp.q.out
+++ b/ql/src/test/results/clientpositive/partition_timestamp.q.out
@@ -109,67 +109,55 @@ PREHOOK: query: -- 10
 select count(*) from partition_timestamp_1 where dt = timestamp '2000-01-01 
01:00:00'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 10
 select count(*) from partition_timestamp_1 where dt = timestamp '2000-01-01 
01:00:00'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 10
 PREHOOK: query: -- 10.  Also try with string value in predicate
 select count(*) from partition_timestamp_1 where dt = '2000-01-01 01:00:00'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 10.  Also try with string value in predicate
 select count(*) from partition_timestamp_1 where dt = '2000-01-01 01:00:00'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 10
 PREHOOK: query: -- 5
 select count(*) from partition_timestamp_1 where dt = timestamp '2000-01-01 
02:00:00' and region = '2'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
02%3A00%3A00.0/region=2
 #### A masked pattern was here ####
 POSTHOOK: query: -- 5
 select count(*) from partition_timestamp_1 where dt = timestamp '2000-01-01 
02:00:00' and region = '2'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
02%3A00%3A00.0/region=2
 #### A masked pattern was here ####
 5
 PREHOOK: query: -- 11
 select count(*) from partition_timestamp_1 where dt = timestamp '2001-01-01 
03:00:00' and region = '10'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
03%3A00%3A00.0/region=10
 #### A masked pattern was here ####
 POSTHOOK: query: -- 11
 select count(*) from partition_timestamp_1 where dt = timestamp '2001-01-01 
03:00:00' and region = '10'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
03%3A00%3A00.0/region=10
 #### A masked pattern was here ####
 11
 PREHOOK: query: -- 30
 select count(*) from partition_timestamp_1 where region = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
-PREHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
02%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 30
 select count(*) from partition_timestamp_1 where region = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
02%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 30
 PREHOOK: query: -- 0
@@ -200,7 +188,6 @@ PREHOOK: query: -- Try other comparison operations
 select count(*) from partition_timestamp_1 where dt > timestamp '2000-01-01 
01:00:00' and region = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
02%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- Try other comparison operations
 
@@ -208,72 +195,61 @@ POSTHOOK: query: -- Try other comparison operations
 select count(*) from partition_timestamp_1 where dt > timestamp '2000-01-01 
01:00:00' and region = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
02%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 20
 PREHOOK: query: -- 10
 select count(*) from partition_timestamp_1 where dt < timestamp '2000-01-02 
01:00:00' and region = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 10
 select count(*) from partition_timestamp_1 where dt < timestamp '2000-01-02 
01:00:00' and region = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 10
 PREHOOK: query: -- 20
 select count(*) from partition_timestamp_1 where dt >= timestamp '2000-01-02 
01:00:00' and region = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
02%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 20
 select count(*) from partition_timestamp_1 where dt >= timestamp '2000-01-02 
01:00:00' and region = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
02%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 20
 PREHOOK: query: -- 10
 select count(*) from partition_timestamp_1 where dt <= timestamp '2000-01-01 
01:00:00' and region = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 10
 select count(*) from partition_timestamp_1 where dt <= timestamp '2000-01-01 
01:00:00' and region = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 10
 PREHOOK: query: -- 20
 select count(*) from partition_timestamp_1 where dt <> timestamp '2000-01-01 
01:00:00' and region = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
02%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 20
 select count(*) from partition_timestamp_1 where dt <> timestamp '2000-01-01 
01:00:00' and region = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
02%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 20
 PREHOOK: query: -- 10
 select count(*) from partition_timestamp_1 where dt between timestamp 
'1999-12-30 12:00:00' and timestamp '2000-01-03 12:00:00' and region = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 10
 select count(*) from partition_timestamp_1 where dt between timestamp 
'1999-12-30 12:00:00' and timestamp '2000-01-03 12:00:00' and region = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2000-01-01 
01%3A00%3A00.0/region=1
 #### A masked pattern was here ####
 10
 PREHOOK: query: -- Try a string key with timestamp-like strings
@@ -282,7 +258,6 @@ PREHOOK: query: -- Try a string key with timestamp-like 
strings
 select count(*) from partition_timestamp_1 where region = '2020-20-20'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
01%3A00%3A00.0/region=2020-20-20
 #### A masked pattern was here ####
 POSTHOOK: query: -- Try a string key with timestamp-like strings
 
@@ -290,20 +265,17 @@ POSTHOOK: query: -- Try a string key with timestamp-like 
strings
 select count(*) from partition_timestamp_1 where region = '2020-20-20'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
01%3A00%3A00.0/region=2020-20-20
 #### A masked pattern was here ####
 5
 PREHOOK: query: -- 5
 select count(*) from partition_timestamp_1 where region > '2010-01-01'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_timestamp_1
-PREHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
01%3A00%3A00.0/region=2020-20-20
 #### A masked pattern was here ####
 POSTHOOK: query: -- 5
 select count(*) from partition_timestamp_1 where region > '2010-01-01'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_timestamp_1
-POSTHOOK: Input: default@partition_timestamp_1@dt=2001-01-01 
01%3A00%3A00.0/region=2020-20-20
 #### A masked pattern was here ####
 5
 PREHOOK: query: drop table partition_timestamp_1

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/partition_varchar1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/partition_varchar1.q.out 
b/ql/src/test/results/clientpositive/partition_varchar1.q.out
index 5b6649f..e6e770a 100644
--- a/ql/src/test/results/clientpositive/partition_varchar1.q.out
+++ b/ql/src/test/results/clientpositive/partition_varchar1.q.out
@@ -95,56 +95,44 @@ PREHOOK: query: -- 15
 select count(*) from partition_varchar_1 where dt = '2000-01-01'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_varchar_1
-PREHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=1
-PREHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=2
 #### A masked pattern was here ####
 POSTHOOK: query: -- 15
 select count(*) from partition_varchar_1 where dt = '2000-01-01'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_varchar_1
-POSTHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=1
-POSTHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=2
 #### A masked pattern was here ####
 15
 PREHOOK: query: -- 5
 select count(*) from partition_varchar_1 where dt = '2000-01-01' and region = 2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_varchar_1
-PREHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=2
 #### A masked pattern was here ####
 POSTHOOK: query: -- 5
 select count(*) from partition_varchar_1 where dt = '2000-01-01' and region = 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_varchar_1
-POSTHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=2
 #### A masked pattern was here ####
 5
 PREHOOK: query: -- 11
 select count(*) from partition_varchar_1 where dt = '2013-08-08' and region = 
10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_varchar_1
-PREHOOK: Input: default@partition_varchar_1@dt=2013-08-08/region=10
 #### A masked pattern was here ####
 POSTHOOK: query: -- 11
 select count(*) from partition_varchar_1 where dt = '2013-08-08' and region = 
10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_varchar_1
-POSTHOOK: Input: default@partition_varchar_1@dt=2013-08-08/region=10
 #### A masked pattern was here ####
 11
 PREHOOK: query: -- 30
 select count(*) from partition_varchar_1 where region = 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_varchar_1
-PREHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=1
-PREHOOK: Input: default@partition_varchar_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 30
 select count(*) from partition_varchar_1 where region = 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_varchar_1
-POSTHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=1
-POSTHOOK: Input: default@partition_varchar_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 30
 PREHOOK: query: -- 0
@@ -175,7 +163,6 @@ PREHOOK: query: -- Try other comparison operations
 select count(*) from partition_varchar_1 where dt > '2000-01-01' and region = 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_varchar_1
-PREHOOK: Input: default@partition_varchar_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- Try other comparison operations
 
@@ -183,59 +170,50 @@ POSTHOOK: query: -- Try other comparison operations
 select count(*) from partition_varchar_1 where dt > '2000-01-01' and region = 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_varchar_1
-POSTHOOK: Input: default@partition_varchar_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 20
 PREHOOK: query: -- 10
 select count(*) from partition_varchar_1 where dt < '2000-01-02' and region = 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_varchar_1
-PREHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 10
 select count(*) from partition_varchar_1 where dt < '2000-01-02' and region = 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_varchar_1
-POSTHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=1
 #### A masked pattern was here ####
 10
 PREHOOK: query: -- 20
 select count(*) from partition_varchar_1 where dt >= '2000-01-02' and region = 
1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_varchar_1
-PREHOOK: Input: default@partition_varchar_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 20
 select count(*) from partition_varchar_1 where dt >= '2000-01-02' and region = 
1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_varchar_1
-POSTHOOK: Input: default@partition_varchar_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 20
 PREHOOK: query: -- 10
 select count(*) from partition_varchar_1 where dt <= '2000-01-01' and region = 
1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_varchar_1
-PREHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 10
 select count(*) from partition_varchar_1 where dt <= '2000-01-01' and region = 
1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_varchar_1
-POSTHOOK: Input: default@partition_varchar_1@dt=2000-01-01/region=1
 #### A masked pattern was here ####
 10
 PREHOOK: query: -- 20
 select count(*) from partition_varchar_1 where dt <> '2000-01-01' and region = 
1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_varchar_1
-PREHOOK: Input: default@partition_varchar_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- 20
 select count(*) from partition_varchar_1 where dt <> '2000-01-01' and region = 
1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@partition_varchar_1
-POSTHOOK: Input: default@partition_varchar_1@dt=2013-08-08/region=1
 #### A masked pattern was here ####
 20
 PREHOOK: query: drop table partition_varchar_1

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/plan_json.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/plan_json.q.out 
b/ql/src/test/results/clientpositive/plan_json.q.out
index 98c6626..e28c239 100644
--- a/ql/src/test/results/clientpositive/plan_json.q.out
+++ b/ql/src/test/results/clientpositive/plan_json.q.out
@@ -8,4 +8,4 @@ POSTHOOK: query: -- explain plan json:  the query gets the 
formatted json output
 
 EXPLAIN FORMATTED SELECT count(1) FROM src
 POSTHOOK: type: QUERY
-{"STAGE DEPENDENCIES":{"Stage-1":{"ROOT STAGE":"TRUE"},"Stage-0":{"DEPENDENT 
STAGES":"Stage-1"}},"STAGE PLANS":{"Stage-1":{"Map Reduce":{"Map Operator 
Tree:":[{"TableScan":{"alias:":"src","Statistics:":"Num rows: 500 Data size: 
5312 Basic stats: COMPLETE Column stats: COMPLETE","children":{"Select 
Operator":{"Statistics:":"Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: COMPLETE","children":{"Group By 
Operator":{"aggregations:":["count(1)"],"mode:":"hash","outputColumnNames:":["_col0"],"Statistics:":"Num
 rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: 
COMPLETE","children":{"Reduce Output Operator":{"sort 
order:":"","Statistics:":"Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: COMPLETE","value expressions:":"_col0 (type: bigint)"}}}}}}}}],"Reduce 
Operator Tree:":{"Group By 
Operator":{"aggregations:":["count(VALUE._col0)"],"mode:":"mergepartial","outputColumnNames:":["_col0"],"Statistics:":"Num
 rows: 1 Data size: 8 Basic stats: COMPLETE Column 
 stats: COMPLETE","children":{"File Output 
Operator":{"compressed:":"false","Statistics:":"Num rows: 1 Data size: 8 Basic 
stats: COMPLETE Column stats: COMPLETE","table:":{"input 
format:":"org.apache.hadoop.mapred.SequenceFileInputFormat","output 
format:":"org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}}}}}}},"Stage-0":{"Fetch
 Operator":{"limit:":"-1","Processor Tree:":{"ListSink":{}}}}}}
+{"STAGE DEPENDENCIES":{"Stage-0":{"ROOT STAGE":"TRUE"}},"STAGE 
PLANS":{"Stage-0":{"Fetch Operator":{"limit:":"1","Processor 
Tree:":{"ListSink":{}}}}}}

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/ppd_constant_where.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_constant_where.q.out 
b/ql/src/test/results/clientpositive/ppd_constant_where.q.out
index 0cc8a29..b268300 100644
--- a/ql/src/test/results/clientpositive/ppd_constant_where.q.out
+++ b/ql/src/test/results/clientpositive/ppd_constant_where.q.out
@@ -7,57 +7,21 @@ POSTHOOK: query: -- Test that the partition pruner does not 
fail when there is a
 EXPLAIN SELECT COUNT(*) FROM srcpart WHERE ds = '2008-04-08' and 'a' = 'a'
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: srcpart
-            Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
-              Group By Operator
-                aggregations: count()
-                mode: hash
-                outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                Reduce Output Operator
-                  sort order: 
-                  Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
-                  value expressions: _col0 (type: bigint)
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations: count(VALUE._col0)
-          mode: mergepartial
-          outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
   Stage: Stage-0
     Fetch Operator
-      limit: -1
+      limit: 1
       Processor Tree:
         ListSink
 
 PREHOOK: query: SELECT COUNT(*) FROM srcpart WHERE ds = '2008-04-08' and 'a' = 
'a'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT COUNT(*) FROM srcpart WHERE ds = '2008-04-08' and 'a' 
= 'a'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
 1000

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/rename_partition_location.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/rename_partition_location.q.out 
b/ql/src/test/results/clientpositive/rename_partition_location.q.out
index b83bdd0..52a5fd0 100644
--- a/ql/src/test/results/clientpositive/rename_partition_location.q.out
+++ b/ql/src/test/results/clientpositive/rename_partition_location.q.out
@@ -50,7 +50,6 @@ POSTHOOK: Output: default@rename_partition_table@part=2
 PREHOOK: query: SELECT count(*) FROM rename_partition_table where part = '2'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@rename_partition_table
-PREHOOK: Input: default@rename_partition_table@part=2
 #### A masked pattern was here ####
 500
 PREHOOK: query: DROP TABLE rename_partition_table

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/select_unquote_and.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/select_unquote_and.q.out 
b/ql/src/test/results/clientpositive/select_unquote_and.q.out
index 18e280b..b82b730 100644
--- a/ql/src/test/results/clientpositive/select_unquote_and.q.out
+++ b/ql/src/test/results/clientpositive/select_unquote_and.q.out
@@ -33,14 +33,10 @@ POSTHOOK: Lineage: npe_test PARTITION(ds=2012-12-12).value 
SIMPLE [(src)src.Fiel
 PREHOOK: query: SELECT count(*) FROM npe_test
 PREHOOK: type: QUERY
 PREHOOK: Input: default@npe_test
-PREHOOK: Input: default@npe_test@ds=2012-12-11
-PREHOOK: Input: default@npe_test@ds=2012-12-12
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT count(*) FROM npe_test
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@npe_test
-POSTHOOK: Input: default@npe_test@ds=2012-12-11
-POSTHOOK: Input: default@npe_test@ds=2012-12-12
 #### A masked pattern was here ####
 498
 PREHOOK: query: EXPLAIN SELECT * FROM npe_test WHERE ds > 2012-11-31 AND ds < 
2012-12-15

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/select_unquote_not.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/select_unquote_not.q.out 
b/ql/src/test/results/clientpositive/select_unquote_not.q.out
index 0e59586..1d2bc5f 100644
--- a/ql/src/test/results/clientpositive/select_unquote_not.q.out
+++ b/ql/src/test/results/clientpositive/select_unquote_not.q.out
@@ -33,14 +33,10 @@ POSTHOOK: Lineage: npe_test PARTITION(ds=2012-12-12).value 
SIMPLE [(src)src.Fiel
 PREHOOK: query: SELECT count(*) FROM npe_test
 PREHOOK: type: QUERY
 PREHOOK: Input: default@npe_test
-PREHOOK: Input: default@npe_test@ds=2012-12-11
-PREHOOK: Input: default@npe_test@ds=2012-12-12
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT count(*) FROM npe_test
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@npe_test
-POSTHOOK: Input: default@npe_test@ds=2012-12-11
-POSTHOOK: Input: default@npe_test@ds=2012-12-12
 #### A masked pattern was here ####
 498
 PREHOOK: query: EXPLAIN SELECT * FROM npe_test WHERE NOT ds < 2012-11-31

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/select_unquote_or.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/select_unquote_or.q.out 
b/ql/src/test/results/clientpositive/select_unquote_or.q.out
index e1a6b17..6bf8430 100644
--- a/ql/src/test/results/clientpositive/select_unquote_or.q.out
+++ b/ql/src/test/results/clientpositive/select_unquote_or.q.out
@@ -33,14 +33,10 @@ POSTHOOK: Lineage: npe_test PARTITION(ds=2012-12-12).value 
SIMPLE [(src)src.Fiel
 PREHOOK: query: SELECT count(*) FROM npe_test
 PREHOOK: type: QUERY
 PREHOOK: Input: default@npe_test
-PREHOOK: Input: default@npe_test@ds=2012-12-11
-PREHOOK: Input: default@npe_test@ds=2012-12-12
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT count(*) FROM npe_test
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@npe_test
-POSTHOOK: Input: default@npe_test@ds=2012-12-11
-POSTHOOK: Input: default@npe_test@ds=2012-12-12
 #### A masked pattern was here ####
 498
 PREHOOK: query: EXPLAIN SELECT * FROM npe_test WHERE ds > 2012-11-31 OR ds < 
2012-12-15

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/smb_mapjoin_18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_18.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_18.q.out
index 4b29056..60c329b 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_18.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_18.q.out
@@ -101,12 +101,10 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=1).value 
SIMPLE [(test_table1)a.Fiel
 PREHOOK: query: select count(*) from test_table1 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table1
-PREHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table1 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
-POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table1 where ds = '1' and hash(key) 
% 2 = 0
@@ -156,12 +154,10 @@ POSTHOOK: Input: default@test_table1@ds=1
 PREHOOK: query: select count(*) from test_table2 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
-PREHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table2 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
-POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table2 where ds = '1' and hash(key) 
% 2 = 0
@@ -293,12 +289,10 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=2).value 
SIMPLE [(test_table1)a.Fiel
 PREHOOK: query: select count(*) from test_table2 where ds = '2'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
-PREHOOK: Input: default@test_table2@ds=2
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table2 where ds = '2'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
-POSTHOOK: Input: default@test_table2@ds=2
 #### A masked pattern was here ####
 2
 PREHOOK: query: select count(*) from test_table2 where ds = '2' and hash(key) 
% 2 = 0

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/smb_mapjoin_19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_19.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_19.q.out
index 95137cd..b7d6cdf 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_19.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_19.q.out
@@ -101,12 +101,10 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=1).value 
SIMPLE [(test_table1)a.Fiel
 PREHOOK: query: select count(*) from test_table1 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table1
-PREHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table1 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
-POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table1 where ds = '1' and hash(key) 
% 16 = 0
@@ -178,12 +176,10 @@ POSTHOOK: Input: default@test_table1@ds=1
 PREHOOK: query: select count(*) from test_table2 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
-PREHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table2 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
-POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table2 where ds = '1' and hash(key) 
% 16 = 0

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out
index 0324aa4..0ad9a12 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out
@@ -113,12 +113,10 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=1).value2 
SIMPLE [(test_table1)a.Fie
 PREHOOK: query: select count(*) from test_table2 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
-PREHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table2 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
-POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table2 where ds = '1' and hash(key) 
% 2 = 0
@@ -223,12 +221,10 @@ POSTHOOK: Lineage: test_table3 PARTITION(ds=1).value2 
SIMPLE [(test_table1)a.Fie
 PREHOOK: query: select count(*) from test_table3 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table3 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table3 where ds = '1' and 
hash(value1) % 2 = 0

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out 
b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
index fd46200..dabe1ca 100644
--- a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
@@ -306,25 +306,19 @@ Storage Desc Params:
 PREHOOK: query: select count(1) from srcpart where ds = '2008-04-08'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
 POSTHOOK: query: select count(1) from srcpart where ds = '2008-04-08'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
 1000
 PREHOOK: query: select count(*) from list_bucketing_static_part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@list_bucketing_static_part
-PREHOOK: Input: default@list_bucketing_static_part@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from list_bucketing_static_part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@list_bucketing_static_part
-POSTHOOK: Input: default@list_bucketing_static_part@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
 1000
 PREHOOK: query: explain extended

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out 
b/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out
index bfdd529..d3494de 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out
@@ -104,12 +104,10 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=1).value 
SIMPLE [(test_table1)a.Fiel
 PREHOOK: query: select count(*) from test_table1 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table1
-PREHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table1 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
-POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table1 where ds = '1' and hash(key) 
% 2 = 0
@@ -159,12 +157,10 @@ POSTHOOK: Input: default@test_table1@ds=1
 PREHOOK: query: select count(*) from test_table2 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
-PREHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table2 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
-POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table2 where ds = '1' and hash(key) 
% 2 = 0
@@ -302,12 +298,10 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=2).value 
SIMPLE [(test_table1)a.Fiel
 PREHOOK: query: select count(*) from test_table2 where ds = '2'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
-PREHOOK: Input: default@test_table2@ds=2
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table2 where ds = '2'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
-POSTHOOK: Input: default@test_table2@ds=2
 #### A masked pattern was here ####
 2
 PREHOOK: query: select count(*) from test_table2 where ds = '2' and hash(key) 
% 2 = 0

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out 
b/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out
index 5a47c45..d09daae 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out
@@ -104,12 +104,10 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=1).value 
SIMPLE [(test_table1)a.Fiel
 PREHOOK: query: select count(*) from test_table1 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table1
-PREHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table1 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
-POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table1 where ds = '1' and hash(key) 
% 16 = 0
@@ -181,12 +179,10 @@ POSTHOOK: Input: default@test_table1@ds=1
 PREHOOK: query: select count(*) from test_table2 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
-PREHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table2 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
-POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table2 where ds = '1' and hash(key) 
% 16 = 0

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/spark/smb_mapjoin_20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_20.q.out 
b/ql/src/test/results/clientpositive/spark/smb_mapjoin_20.q.out
index e4a9ba1..8974d14 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_20.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_20.q.out
@@ -119,12 +119,10 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=1).value2 
SIMPLE [(test_table1)a.Fie
 PREHOOK: query: select count(*) from test_table2 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
-PREHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table2 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
-POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table2 where ds = '1' and hash(key) 
% 2 = 0
@@ -232,12 +230,10 @@ POSTHOOK: Lineage: test_table3 PARTITION(ds=1).value2 
SIMPLE [(test_table1)a.Fie
 PREHOOK: query: select count(*) from test_table3 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from test_table3 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
 500
 PREHOOK: query: select count(*) from test_table3 where ds = '1' and 
hash(value1) % 2 = 0

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/spark/stats3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats3.q.out 
b/ql/src/test/results/clientpositive/spark/stats3.q.out
index 7db4fa0..9200eca 100644
--- a/ql/src/test/results/clientpositive/spark/stats3.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats3.q.out
@@ -132,12 +132,10 @@ POSTHOOK: Input: 
default@hive_test_dst@pcol1=test_part/pcol2=test_Part
 PREHOOK: query: select count(1) from hive_test_dst
 PREHOOK: type: QUERY
 PREHOOK: Input: default@hive_test_dst
-PREHOOK: Input: default@hive_test_dst@pcol1=test_part/pcol2=test_Part
 #### A masked pattern was here ####
 POSTHOOK: query: select count(1) from hive_test_dst
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@hive_test_dst
-POSTHOOK: Input: default@hive_test_dst@pcol1=test_part/pcol2=test_Part
 #### A masked pattern was here ####
 6
 PREHOOK: query: insert overwrite table hive_test_dst partition ( 
pCol1='test_part', pcol2='test_Part') select col1 from hive_test_src
@@ -160,12 +158,10 @@ POSTHOOK: Input: default@hive_test_dst
 PREHOOK: query: select count(1) from hive_test_dst
 PREHOOK: type: QUERY
 PREHOOK: Input: default@hive_test_dst
-PREHOOK: Input: default@hive_test_dst@pcol1=test_part/pcol2=test_Part
 #### A masked pattern was here ####
 POSTHOOK: query: select count(1) from hive_test_dst
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@hive_test_dst
-POSTHOOK: Input: default@hive_test_dst@pcol1=test_part/pcol2=test_Part
 #### A masked pattern was here ####
 6
 PREHOOK: query: select * from hive_test_dst where pcol1='test_part'

http://git-wip-us.apache.org/repos/asf/hive/blob/8763c7aa/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out 
b/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
index 887b3fb..40b2a66 100644
--- a/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
@@ -152,12 +152,10 @@ POSTHOOK: Lineage: texternal 
PARTITION(insertdate=2008-01-01).val SIMPLE [(src)s
 PREHOOK: query: select count(*) from texternal where insertdate='2008-01-01'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@texternal
-PREHOOK: Input: default@texternal@insertdate=2008-01-01
 #### A masked pattern was here ####
 POSTHOOK: query: select count(*) from texternal where insertdate='2008-01-01'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@texternal
-POSTHOOK: Input: default@texternal@insertdate=2008-01-01
 #### A masked pattern was here ####
 500
 PREHOOK: query: -- create external table

Reply via email to