hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1631586 [1/2] - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/optimizer/ test/results/clientpositive/ test/results/clientpositive/tez/ test/results/compiler/plan/
Date Mon, 13 Oct 2014 22:23:08 GMT
Author: hashutosh
Date: Mon Oct 13 22:23:06 2014
New Revision: 1631586

URL: http://svn.apache.org/r1631586
Log:
HIVE-8358 : Constant folding should happen before PCR (Ashutosh Chauhan via Prashanth J)

Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
    hive/trunk/ql/src/test/results/clientpositive/annotate_stats_part.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket3.q.out
    hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
    hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
    hive/trunk/ql/src/test/results/clientpositive/constprog_dp.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_stale_partitioned.q.out
    hive/trunk/ql/src/test/results/clientpositive/input23.q.out
    hive/trunk/ql/src/test/results/clientpositive/input25.q.out
    hive/trunk/ql/src/test/results/clientpositive/input26.q.out
    hive/trunk/ql/src/test/results/clientpositive/input42.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part0.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part1.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part3.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part5.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part7.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part8.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part9.q.out
    hive/trunk/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out
    hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch.q.out
    hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out
    hive/trunk/ql/src/test/results/clientpositive/parallel.q.out
    hive/trunk/ql/src/test/results/clientpositive/pcr.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd2.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_udf_case.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out
    hive/trunk/ql/src/test/results/clientpositive/quotedid_partition.q.out
    hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out
    hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample1.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample8.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/bucket3.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/sample1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
    hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out
    hive/trunk/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_remove_25.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_view.q.out
    hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java Mon Oct 13 22:23:06 2014
@@ -64,6 +64,12 @@ public class Optimizer {
       transformations.add(new SyntheticJoinPredicate());
       transformations.add(new PredicatePushDown());
       transformations.add(new PartitionPruner());
+    }
+    if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTCONSTANTPROPAGATION)) {
+        transformations.add(new ConstantPropagate());
+    }
+
+    if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTPPD)) {
       transformations.add(new PartitionConditionRemover());
       if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTLISTBUCKETING)) {
         /* Add list bucketing pruner. */
@@ -71,9 +77,6 @@ public class Optimizer {
       }
     }
 
-    if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTCONSTANTPROPAGATION)) {
-      transformations.add(new ConstantPropagate());
-    }
     if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTGROUPBY) ||
         HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVE_MAP_GROUPBY_SORT)) {
       transformations.add(new GroupByOptimizer());

Modified: hive/trunk/ql/src/test/results/clientpositive/annotate_stats_part.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/annotate_stats_part.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/annotate_stats_part.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/annotate_stats_part.q.out Mon Oct 13 22:23:06 2014
@@ -135,11 +135,11 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: loc_orc
-          Statistics: Num rows: 2 Data size: 323 Basic stats: COMPLETE Column stats: PARTIAL
+          Statistics: Num rows: 2 Data size: 323 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: state (type: string), locid (type: int), zip (type: bigint), year (type: string)
+            expressions: state (type: string), locid (type: int), zip (type: bigint), '__HIVE_DEFAULT_PARTITION__' (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
-            Statistics: Num rows: 2 Data size: 323 Basic stats: COMPLETE Column stats: PARTIAL
+            Statistics: Num rows: 2 Data size: 323 Basic stats: COMPLETE Column stats: NONE
             ListSink
 
 PREHOOK: query: -- basicStatState: PARTIAL colStatState: NONE
@@ -181,11 +181,11 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: loc_orc
-          Statistics: Num rows: 7 Data size: 400 Basic stats: COMPLETE Column stats: PARTIAL
+          Statistics: Num rows: 7 Data size: 400 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: state (type: string), locid (type: int), zip (type: bigint), year (type: string)
+            expressions: state (type: string), locid (type: int), zip (type: bigint), '2001' (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
-            Statistics: Num rows: 7 Data size: 400 Basic stats: COMPLETE Column stats: PARTIAL
+            Statistics: Num rows: 7 Data size: 400 Basic stats: COMPLETE Column stats: NONE
             ListSink
 
 PREHOOK: query: -- partition level analyze statistics for all partitions
@@ -222,11 +222,11 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: loc_orc
-          Statistics: Num rows: 1 Data size: 323 Basic stats: COMPLETE Column stats: PARTIAL
+          Statistics: Num rows: 1 Data size: 323 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: state (type: string), locid (type: int), zip (type: bigint), year (type: string)
+            expressions: state (type: string), locid (type: int), zip (type: bigint), '__HIVE_DEFAULT_PARTITION__' (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
-            Statistics: Num rows: 1 Data size: 323 Basic stats: COMPLETE Column stats: PARTIAL
+            Statistics: Num rows: 1 Data size: 323 Basic stats: COMPLETE Column stats: NONE
             ListSink
 
 PREHOOK: query: -- basicStatState: COMPLETE colStatState: NONE
@@ -535,14 +535,14 @@ STAGE PLANS:
             Statistics: Num rows: 7 Data size: 400 Basic stats: COMPLETE Column stats: COMPLETE
             Filter Operator
               predicate: (locid > 0) (type: boolean)
-              Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE
+              Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
               Select Operator
-                expressions: locid (type: int), year (type: string)
+                expressions: locid (type: int), '2001' (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 2 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 2 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -571,14 +571,14 @@ STAGE PLANS:
             Statistics: Num rows: 7 Data size: 400 Basic stats: COMPLETE Column stats: COMPLETE
             Filter Operator
               predicate: (locid > 0) (type: boolean)
-              Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE
+              Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
               Select Operator
-                expressions: locid (type: int), year (type: string)
+                expressions: locid (type: int), '2001' (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: hive/trunk/ql/src/test/results/clientpositive/bucket3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucket3.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/bucket3.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/bucket3.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out Mon Oct 13 22:23:06 2014
@@ -85,7 +85,7 @@ STAGE PLANS:
           TableScan
             alias: employee_part
             Select Operator
-              expressions: employeesalary (type: double), country (type: string), employeename (type: string), employeeid (type: int)
+              expressions: 4000.0 (type: double), country (type: string), employeename (type: string), employeeid (type: int)
               outputColumnNames: employeesalary, country, employeename, employeeid
               Group By Operator
                 aggregations: compute_stats(employeename, 16), compute_stats(employeeid, 16)
@@ -158,7 +158,7 @@ STAGE PLANS:
           TableScan
             alias: employee_part
             Select Operator
-              expressions: employeesalary (type: double), country (type: string), employeeid (type: int)
+              expressions: 2000.0 (type: double), country (type: string), employeeid (type: int)
               outputColumnNames: employeesalary, country, employeeid
               Group By Operator
                 aggregations: compute_stats(employeeid, 16)

Modified: hive/trunk/ql/src/test/results/clientpositive/constprog_dp.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/constprog_dp.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/constprog_dp.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/constprog_dp.q.out Mon Oct 13 22:23:06 2014
@@ -32,7 +32,7 @@ STAGE PLANS:
             alias: srcpart
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: key (type: string), value (type: string), ds (type: string)
+              expressions: key (type: string), value (type: string), '2008-04-08' (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
               File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out Mon Oct 13 22:23:06 2014
@@ -371,7 +371,7 @@ STAGE PLANS:
               predicate: (key < 10) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
+                expressions: key (type: string), value (type: string), '2008-04-09' (type: string), '12' (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/index_stale_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_stale_partitioned.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_stale_partitioned.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_stale_partitioned.q.out Mon Oct 13 22:23:06 2014
@@ -95,7 +95,7 @@ STAGE PLANS:
               predicate: (key = 86) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: '86' (type: string), val (type: string), foo (type: string)
+                expressions: '86' (type: string), val (type: string), 'bar' (type: string)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/input23.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input23.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/input23.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/input23.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/input25.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input25.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input25.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input25.q.out Mon Oct 13 22:23:06 2014
@@ -48,8 +48,8 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Select Operator
-              expressions: a (type: int), b (type: int), d (type: string)
-              outputColumnNames: _col0, _col1, _col2
+              expressions: a (type: int), b (type: int)
+              outputColumnNames: _col0, _col1
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Limit
                 Number of rows: 10
@@ -57,10 +57,10 @@ STAGE PLANS:
                 Reduce Output Operator
                   sort order: 
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-                  value expressions: _col0 (type: int), _col1 (type: int), _col2 (type: string)
+                  value expressions: _col0 (type: int), _col1 (type: int)
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: string)
+          expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), '2009-01-01' (type: string)
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Limit
@@ -112,8 +112,8 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Select Operator
-              expressions: a (type: int), b (type: int), d (type: string)
-              outputColumnNames: _col0, _col1, _col2
+              expressions: a (type: int), b (type: int)
+              outputColumnNames: _col0, _col1
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Limit
                 Number of rows: 10
@@ -121,10 +121,10 @@ STAGE PLANS:
                 Reduce Output Operator
                   sort order: 
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-                  value expressions: _col0 (type: int), _col1 (type: int), _col2 (type: string)
+                  value expressions: _col0 (type: int), _col1 (type: int)
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: string)
+          expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), '2009-02-02' (type: string)
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Limit

Modified: hive/trunk/ql/src/test/results/clientpositive/input26.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input26.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input26.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input26.q.out Mon Oct 13 22:23:06 2014
@@ -26,18 +26,18 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
-              outputColumnNames: _col0, _col1, _col2, _col3
+              expressions: key (type: string), value (type: string)
+              outputColumnNames: _col0, _col1
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: string)
                 sort order: +
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: string), _col2 (type: string), _col3 (type: string)
+                value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string)
-          outputColumnNames: _col0, _col1, _col2, _col3
+          expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), '11' (type: string)
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 5
@@ -56,7 +56,7 @@ STAGE PLANS:
             Union
               Statistics: Num rows: 5 Data size: 50 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string)
+                expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), _col3 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 5 Data size: 50 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
@@ -70,7 +70,7 @@ STAGE PLANS:
             Union
               Statistics: Num rows: 5 Data size: 50 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string)
+                expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), _col3 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 5 Data size: 50 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
@@ -85,8 +85,8 @@ STAGE PLANS:
     Map Reduce
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), '2008-04-08' (type: string), '14' (type: string)
-          outputColumnNames: _col0, _col1, _col2, _col3
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), '14' (type: string)
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Limit
             Number of rows: 5

Modified: hive/trunk/ql/src/test/results/clientpositive/input42.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input42.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/input42.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/input42.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/input_part0.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_part0.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input_part0.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input_part0.q.out Mon Oct 13 22:23:06 2014
@@ -16,7 +16,7 @@ STAGE PLANS:
           alias: x
           Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
+            expressions: key (type: string), value (type: string), '2008-04-08' (type: string), hr (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             ListSink

Modified: hive/trunk/ql/src/test/results/clientpositive/input_part1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_part1.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/input_part1.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/input_part1.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/input_part3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_part3.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input_part3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input_part3.q.out Mon Oct 13 22:23:06 2014
@@ -16,7 +16,7 @@ STAGE PLANS:
           alias: x
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
+            expressions: key (type: string), value (type: string), '2008-04-08' (type: string), '11' (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             ListSink

Modified: hive/trunk/ql/src/test/results/clientpositive/input_part5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_part5.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input_part5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input_part5.q.out Mon Oct 13 22:23:06 2014
@@ -35,7 +35,7 @@ STAGE PLANS:
               predicate: (key < 100) (type: boolean)
               Statistics: Num rows: 333 Data size: 3537 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
+                expressions: key (type: string), value (type: string), '2008-04-08' (type: string), hr (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 333 Data size: 3537 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/input_part7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_part7.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/input_part7.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/input_part7.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/input_part8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_part8.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input_part8.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input_part8.q.out Mon Oct 13 22:23:06 2014
@@ -16,7 +16,7 @@ STAGE PLANS:
           alias: x
           Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
+            expressions: key (type: string), value (type: string), '2008-04-08' (type: string), hr (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Limit

Modified: hive/trunk/ql/src/test/results/clientpositive/input_part9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_part9.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/input_part9.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/input_part9.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out Mon Oct 13 22:23:06 2014
@@ -14,7 +14,7 @@ STAGE PLANS:
           alias: srcpart
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: ds (type: string)
+            expressions: '2008-04-08' (type: string)
             outputColumnNames: _col0
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             ListSink

Modified: hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out Mon Oct 13 22:23:06 2014
@@ -1291,7 +1291,7 @@ STAGE PLANS:
             alias: srcpart_merge_dp
             Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
+              expressions: key (type: string), value (type: string), '2008-04-08' (type: string), '11' (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
               File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch.q.out Mon Oct 13 22:23:06 2014
@@ -58,7 +58,7 @@ STAGE PLANS:
           alias: srcpart
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
+            expressions: key (type: string), value (type: string), '2008-04-08' (type: string), '11' (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Limit
@@ -313,7 +313,7 @@ STAGE PLANS:
           alias: srcpart
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
+            expressions: key (type: string), value (type: string), '2008-04-08' (type: string), '11' (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Limit

Modified: hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out Mon Oct 13 22:23:06 2014
@@ -14,7 +14,7 @@ STAGE PLANS:
           alias: srcpart
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
+            expressions: key (type: string), value (type: string), '2008-04-08' (type: string), '11' (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Limit
@@ -64,7 +64,7 @@ STAGE PLANS:
           alias: srcpart
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
+            expressions: key (type: string), value (type: string), '2008-04-08' (type: string), '11' (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Limit

Modified: hive/trunk/ql/src/test/results/clientpositive/parallel.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/parallel.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/parallel.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/parallel.q.out Mon Oct 13 22:23:06 2014
@@ -161,7 +161,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@src_a
 POSTHOOK: Output: default@src_b
-POSTHOOK: Lineage: src_a.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: src_a.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: src_b.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: src_b.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/trunk/ql/src/test/results/clientpositive/pcr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/pcr.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/pcr.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/pcr.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd2.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd2.q.out Mon Oct 13 22:23:06 2014
@@ -455,25 +455,22 @@ STAGE PLANS:
           TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: ((ds = '2008-04-08') and (hr = '11')) (type: boolean)
+            Select Operator
+              expressions: key (type: string), value (type: string)
+              outputColumnNames: key, value
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: key (type: string), value (type: string)
-                outputColumnNames: key, value
+              Group By Operator
+                aggregations: count(value)
+                keys: key (type: string)
+                mode: hash
+                outputColumnNames: _col0, _col1
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                Group By Operator
-                  aggregations: count(value)
-                  keys: key (type: string)
-                  mode: hash
-                  outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string)
-                    sort order: +
-                    Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: bigint)
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_udf_case.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_udf_case.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_udf_case.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_udf_case.q.out Mon Oct 13 22:23:06 2014
@@ -44,7 +44,7 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-                value expressions: value (type: string), ds (type: string), hr (type: string)
+                value expressions: value (type: string), hr (type: string)
           TableScan
             alias: a
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
@@ -56,23 +56,23 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-                value expressions: value (type: string), ds (type: string), hr (type: string)
+                value expressions: value (type: string), hr (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1} {VALUE._col2}
-            1 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1} {VALUE._col2}
-          outputColumnNames: _col0, _col1, _col2, _col3, _col7, _col8, _col9, _col10
+            0 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col2}
+            1 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col2}
+          outputColumnNames: _col0, _col1, _col3, _col7, _col8, _col10
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Filter Operator
-            predicate: (((_col2 = '2008-04-08') and (_col9 = '2008-04-08')) and CASE (_col0) WHEN ('27') THEN (true) WHEN ('38') THEN (false) ELSE (null) END) (type: boolean)
-            Statistics: Num rows: 34 Data size: 361 Basic stats: COMPLETE Column stats: NONE
+            predicate: CASE (_col0) WHEN ('27') THEN (true) WHEN ('38') THEN (false) ELSE (null) END (type: boolean)
+            Statistics: Num rows: 137 Data size: 1455 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string), _col3 (type: string), _col7 (type: string), _col8 (type: string), _col10 (type: string)
               outputColumnNames: _col0, _col1, _col3, _col4, _col5, _col7
-              Statistics: Num rows: 34 Data size: 361 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 137 Data size: 1455 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
                 compressed: false
                 table:
@@ -87,15 +87,15 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), '2008-04-08' (type: string), _col7 (type: string)
               sort order: ++++++++
-              Statistics: Num rows: 34 Data size: 361 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 137 Data size: 1455 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string), '2008-04-08' (type: string), KEY.reducesinkkey3 (type: string), KEY.reducesinkkey4 (type: string), KEY.reducesinkkey5 (type: string), '2008-04-08' (type: string), KEY.reducesinkkey7 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
-          Statistics: Num rows: 34 Data size: 361 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 137 Data size: 1455 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 34 Data size: 361 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 137 Data size: 1455 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -189,7 +189,7 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-                value expressions: value (type: string), ds (type: string), hr (type: string)
+                value expressions: value (type: string), hr (type: string)
           TableScan
             alias: a
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
@@ -201,19 +201,19 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-                value expressions: value (type: string), ds (type: string), hr (type: string)
+                value expressions: value (type: string), hr (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1} {VALUE._col2}
-            1 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1} {VALUE._col2}
-          outputColumnNames: _col0, _col1, _col2, _col3, _col7, _col8, _col9, _col10
+            0 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col2}
+            1 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col2}
+          outputColumnNames: _col0, _col1, _col3, _col7, _col8, _col10
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: string), _col10 (type: string)
-            outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
+            expressions: _col0 (type: string), _col1 (type: string), _col3 (type: string), _col7 (type: string), _col8 (type: string), _col10 (type: string)
+            outputColumnNames: _col0, _col1, _col3, _col4, _col5, _col7
             Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
               compressed: false
@@ -227,12 +227,12 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Reduce Output Operator
-              key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: string)
+              key expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), '2008-04-08' (type: string), _col7 (type: string)
               sort order: ++++++++
               Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string), KEY.reducesinkkey2 (type: string), KEY.reducesinkkey3 (type: string), KEY.reducesinkkey4 (type: string), KEY.reducesinkkey5 (type: string), KEY.reducesinkkey6 (type: string), KEY.reducesinkkey7 (type: string)
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string), '2008-04-08' (type: string), KEY.reducesinkkey3 (type: string), KEY.reducesinkkey4 (type: string), KEY.reducesinkkey5 (type: string), '2008-04-08' (type: string), KEY.reducesinkkey7 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/quotedid_partition.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/quotedid_partition.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/quotedid_partition.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/quotedid_partition.q.out Mon Oct 13 22:23:06 2014
@@ -46,7 +46,7 @@ STAGE PLANS:
               predicate: (x+1 = '10') (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: '10' (type: string), y&y (type: string), !@#$%^&*()_q (type: string)
+                expressions: '10' (type: string), y&y (type: string), 'a' (type: string)
                 outputColumnNames: x+1, y&y, !@#$%^&*()_q
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 Group By Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/sample1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample1.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/sample1.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/sample1.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/sample8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample8.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/sample8.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/sample8.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out Mon Oct 13 22:23:06 2014
@@ -314,13 +314,13 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 condition expressions:
                   0 {key}
-                  1 {key} {value} {ds}
+                  1 {key} {value}
                 keys:
                   0 key (type: int)
                   1 key (type: int)
-                outputColumnNames: _col0, _col6, _col7, _col8
+                outputColumnNames: _col0, _col6, _col7
                 Select Operator
-                  expressions: _col6 (type: int), _col7 (type: string), _col8 (type: string), _col0 (type: int)
+                  expressions: _col6 (type: int), _col7 (type: string), '2010-10-15' (type: string), _col0 (type: int)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   File Output Operator
                     compressed: false

Modified: hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out Mon Oct 13 22:23:06 2014
@@ -90,14 +90,14 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 condition expressions:
-                  0 {userid} {pageid} {postid} {type} {ds}
-                  1 {userid} {pageid} {postid} {type} {ds}
+                  0 {userid} {pageid} {postid} {type}
+                  1 {userid} {pageid} {postid} {type}
                 keys:
                   0 userid (type: int), pageid (type: int), postid (type: int), type (type: string)
                   1 userid (type: int), pageid (type: int), postid (type: int), type (type: string)
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col8, _col9, _col10, _col11, _col12
+                outputColumnNames: _col0, _col1, _col2, _col3, _col8, _col9, _col10, _col11
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: string), _col4 (type: string), _col8 (type: int), _col9 (type: int), _col10 (type: int), _col11 (type: string), _col12 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: string), '1' (type: string), _col8 (type: int), _col9 (type: int), _col10 (type: int), _col11 (type: string), '2' (type: string)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9
                   File Output Operator
                     compressed: false

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/bucket3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/bucket3.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/tez/bucket3.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/tez/bucket3.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out Mon Oct 13 22:23:06 2014
@@ -1903,7 +1903,7 @@ STAGE PLANS:
                   filterExpr: (ds is not null and (ds = '2008-04-08')) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: ds (type: string)
+                    expressions: '2008-04-08' (type: string)
                     outputColumnNames: ds
                     Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
@@ -2565,7 +2565,6 @@ STAGE PLANS:
                     sort order: +
                     Map-reduce partition columns: ds (type: string)
                     Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: hr (type: string)
         Map 5 
             Map Operator Tree:
                 TableScan
@@ -2629,14 +2628,12 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 condition expressions:
-                  0 {VALUE._col2}
+                  0 
                   1 
-                outputColumnNames: _col3
                 Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col3 (type: string)
+                  key expressions: '11' (type: string)
                   sort order: +
-                  Map-reduce partition columns: _col3 (type: string)
                   Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
         Reducer 3 
             Reduce Operator Tree:
@@ -4363,7 +4360,7 @@ STAGE PLANS:
                   filterExpr: (ds is not null and (ds = '2008-04-08')) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: ds (type: string)
+                    expressions: '2008-04-08' (type: string)
                     outputColumnNames: ds
                     Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
@@ -4749,12 +4746,11 @@ STAGE PLANS:
                     condition map:
                          Inner Join 0 to 1
                     condition expressions:
-                      0 {hr}
+                      0 
                       1 
                     keys:
                       0 ds (type: string)
                       1 ds (type: string)
-                    outputColumnNames: _col3
                     input vertices:
                       1 Map 4
                     Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
@@ -4765,7 +4761,7 @@ STAGE PLANS:
                         0 
                         1 
                       keys:
-                        0 _col3 (type: string)
+                        0 '11' (type: string)
                         1 '11' (type: string)
                       input vertices:
                         1 Map 3

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out Mon Oct 13 22:23:06 2014
@@ -603,29 +603,26 @@ STAGE PLANS:
                     condition map:
                          Inner Join 0 to 1
                     condition expressions:
-                      0 {amount} {dim_shops_id}
+                      0 {amount}
                       1 
                     keys:
-                      0 dim_shops_id (type: int)
+                      0 1 (type: int)
                       1 1 (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: _col0
                     input vertices:
                       1 Map 1
                     Statistics: Num rows: 3 Data size: 9 Basic stats: COMPLETE Column stats: NONE
-                    Filter Operator
-                      predicate: ((_col1 = 1) and (_col1 = 1)) (type: boolean)
-                      Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-                      Select Operator
-                        expressions: _col0 (type: decimal(10,0))
-                        outputColumnNames: _col0
-                        Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-                        File Output Operator
-                          compressed: false
-                          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-                          table:
-                              input format: org.apache.hadoop.mapred.TextInputFormat
-                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                    Select Operator
+                      expressions: _col0 (type: decimal(10,0))
+                      outputColumnNames: _col0
+                      Statistics: Num rows: 3 Data size: 9 Basic stats: COMPLETE Column stats: NONE
+                      File Output Operator
+                        compressed: false
+                        Statistics: Num rows: 3 Data size: 9 Basic stats: COMPLETE Column stats: NONE
+                        table:
+                            input format: org.apache.hadoop.mapred.TextInputFormat
+                            output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                            serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/sample1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/sample1.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/tez/sample1.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/tez/sample1.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out Mon Oct 13 22:23:06 2014
@@ -1923,7 +1923,7 @@ STAGE PLANS:
                   filterExpr: (ds is not null and (ds = '2008-04-08')) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: ds (type: string)
+                    expressions: '2008-04-08' (type: string)
                     outputColumnNames: ds
                     Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
@@ -2595,7 +2595,6 @@ STAGE PLANS:
                     sort order: +
                     Map-reduce partition columns: ds (type: string)
                     Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: hr (type: string)
         Map 5 
             Map Operator Tree:
                 TableScan
@@ -2660,14 +2659,12 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 condition expressions:
-                  0 {VALUE._col2}
+                  0 
                   1 
-                outputColumnNames: _col3
                 Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col3 (type: string)
+                  key expressions: '11' (type: string)
                   sort order: +
-                  Map-reduce partition columns: _col3 (type: string)
                   Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
         Reducer 3 
             Reduce Operator Tree:
@@ -4410,7 +4407,7 @@ STAGE PLANS:
                   filterExpr: (ds is not null and (ds = '2008-04-08')) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: ds (type: string)
+                    expressions: '2008-04-08' (type: string)
                     outputColumnNames: ds
                     Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
@@ -4803,12 +4800,11 @@ STAGE PLANS:
                     condition map:
                          Inner Join 0 to 1
                     condition expressions:
-                      0 {hr}
+                      0 
                       1 
                     keys:
                       0 ds (type: string)
                       1 ds (type: string)
-                    outputColumnNames: _col3
                     input vertices:
                       1 Map 4
                     Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
@@ -4819,7 +4815,7 @@ STAGE PLANS:
                         0 
                         1 
                       keys:
-                        0 _col3 (type: string)
+                        0 '11' (type: string)
                         1 '11' (type: string)
                       input vertices:
                         1 Map 3

Modified: hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out Mon Oct 13 22:23:06 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/union_remove_25.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union_remove_25.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union_remove_25.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union_remove_25.q.out Mon Oct 13 22:23:06 2014
@@ -292,8 +292,8 @@ STAGE PLANS:
             alias: srcpart
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: key (type: string), value (type: string), ds (type: string)
-              outputColumnNames: _col0, _col1, _col2
+              expressions: key (type: string), value (type: string)
+              outputColumnNames: _col0, _col1
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
               Limit
                 Number of rows: 500
@@ -301,17 +301,17 @@ STAGE PLANS:
                 Reduce Output Operator
                   sort order: 
                   Statistics: Num rows: 500 Data size: 5000 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+                  value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string)
-          outputColumnNames: _col0, _col1, _col2
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 500 Data size: 5000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 500
             Statistics: Num rows: 500 Data size: 5000 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint), _col2 (type: string)
+              expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint), '2008-04-08' (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5000 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
@@ -342,8 +342,8 @@ STAGE PLANS:
             alias: srcpart
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: key (type: string), value (type: string), ds (type: string)
-              outputColumnNames: _col0, _col1, _col2
+              expressions: key (type: string), value (type: string)
+              outputColumnNames: _col0, _col1
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
               Limit
                 Number of rows: 500
@@ -351,17 +351,17 @@ STAGE PLANS:
                 Reduce Output Operator
                   sort order: 
                   Statistics: Num rows: 500 Data size: 5000 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+                  value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string)
-          outputColumnNames: _col0, _col1, _col2
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 500 Data size: 5000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 500
             Statistics: Num rows: 500 Data size: 5000 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint), _col2 (type: string)
+              expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint), '2008-04-08' (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5000 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
@@ -476,8 +476,8 @@ STAGE PLANS:
             alias: srcpart
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
-              outputColumnNames: _col0, _col1, _col2, _col3
+              expressions: key (type: string), value (type: string), hr (type: string)
+              outputColumnNames: _col0, _col1, _col3
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
               Limit
                 Number of rows: 1000
@@ -485,17 +485,17 @@ STAGE PLANS:
                 Reduce Output Operator
                   sort order: 
                   Statistics: Num rows: 1000 Data size: 10000 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string)
+                  value expressions: _col0 (type: string), _col1 (type: string), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), VALUE._col3 (type: string)
-          outputColumnNames: _col0, _col1, _col2, _col3
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col3 (type: string)
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 1000 Data size: 10000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 1000
             Statistics: Num rows: 1000 Data size: 10000 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint), _col2 (type: string), _col3 (type: string)
+              expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint), '2008-04-08' (type: string), _col3 (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 1000 Data size: 10000 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
@@ -527,8 +527,8 @@ STAGE PLANS:
             alias: srcpart
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
-              outputColumnNames: _col0, _col1, _col2, _col3
+              expressions: key (type: string), value (type: string), hr (type: string)
+              outputColumnNames: _col0, _col1, _col3
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
               Limit
                 Number of rows: 1000
@@ -536,17 +536,17 @@ STAGE PLANS:
                 Reduce Output Operator
                   sort order: 
                   Statistics: Num rows: 1000 Data size: 10000 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string)
+                  value expressions: _col0 (type: string), _col1 (type: string), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), VALUE._col3 (type: string)
-          outputColumnNames: _col0, _col1, _col2, _col3
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col3 (type: string)
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 1000 Data size: 10000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 1000
             Statistics: Num rows: 1000 Data size: 10000 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint), _col2 (type: string), _col3 (type: string)
+              expressions: _col0 (type: string), UDFToLong(_col1) (type: bigint), '2008-04-08' (type: string), _col3 (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 1000 Data size: 10000 Basic stats: COMPLETE Column stats: NONE
               File Output Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/union_view.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union_view.q.out?rev=1631586&r1=1631585&r2=1631586&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union_view.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union_view.q.out Mon Oct 13 22:23:06 2014
@@ -85,7 +85,7 @@ STAGE PLANS:
               predicate: (key = 86) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: 86 (type: int), value (type: string), ds (type: string)
+                expressions: 86 (type: int), value (type: string), '1' (type: string)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
@@ -144,7 +144,7 @@ STAGE PLANS:
               predicate: (key = 86) (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: 86 (type: int), value (type: string), ds (type: string)
+                expressions: 86 (type: int), value (type: string), '2' (type: string)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
@@ -203,7 +203,7 @@ STAGE PLANS:
               predicate: (key = 86) (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: 86 (type: int), value (type: string), ds (type: string)
+                expressions: 86 (type: int), value (type: string), '3' (type: string)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
@@ -483,13 +483,13 @@ STAGE PLANS:
               predicate: (key = 86) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: value (type: string), ds (type: string)
-                outputColumnNames: _col1, _col2
+                expressions: value (type: string)
+                outputColumnNames: _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 Union
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: 86 (type: int), _col1 (type: string), _col2 (type: string)
+                    expressions: 86 (type: int), _col1 (type: string), '1' (type: string)
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                     File Output Operator
@@ -548,13 +548,13 @@ STAGE PLANS:
               predicate: (key = 86) (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: value (type: string), ds (type: string)
-                outputColumnNames: _col1, _col2
+                expressions: value (type: string)
+                outputColumnNames: _col1
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                 Union
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: 86 (type: int), _col1 (type: string), _col2 (type: string)
+                    expressions: 86 (type: int), _col1 (type: string), '2' (type: string)
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     File Output Operator
@@ -613,13 +613,13 @@ STAGE PLANS:
               predicate: (key = 86) (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: value (type: string), ds (type: string)
-                outputColumnNames: _col1, _col2
+                expressions: value (type: string)
+                outputColumnNames: _col1
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                 Union
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: 86 (type: int), _col1 (type: string), _col2 (type: string)
+                    expressions: 86 (type: int), _col1 (type: string), '3' (type: string)
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     File Output Operator
@@ -1087,13 +1087,13 @@ STAGE PLANS:
               predicate: (key = 86) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: value (type: string), ds (type: string)
-                outputColumnNames: _col1, _col2
+                expressions: value (type: string)
+                outputColumnNames: _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 Union
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: 86 (type: int), _col1 (type: string), _col2 (type: string)
+                    expressions: 86 (type: int), _col1 (type: string), '4' (type: string)
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                     File Output Operator



Mime
View raw message