You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by zs...@apache.org on 2009/06/24 06:05:05 UTC

svn commit: r787898 [1/19] - in /hadoop/hive/trunk: ./ conf/ ql/src/java/org/apache/hadoop/hive/ql/ppd/ ql/src/test/results/clientpositive/ ql/src/test/results/compiler/plan/

Author: zshao
Date: Wed Jun 24 04:05:02 2009
New Revision: 787898

URL: http://svn.apache.org/viewvc?rev=787898&view=rev
Log:
HIVE-516. Enable predicate pushdown for junit tests. (Prasad Chakka via zshao)

Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/conf/hive-default.xml
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java
    hadoop/hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/cast1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/cluster.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/implicit_cast1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input11.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input11_limit.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input23.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input24.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input25.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input26.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input6.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input9.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input_part1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input_part5.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input_part6.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input_part7.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input_testxpath2.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join0.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join11.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join12.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join13.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join14.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join16.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join19.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join20.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join21.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join23.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join26.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join28.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join32.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join33.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join34.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join35.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join4.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join5.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join6.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join7.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join8.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join9.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/no_hooks.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/noalias_subq1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/notable_alias1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/notable_alias2.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup2.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/nullgroup4.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/quote1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/regex_col.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample3.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample5.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample6.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample7.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample8.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/subq.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/subq2.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/udf1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/udf9.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_10_trims.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_like.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_lower.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_parse_url.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_size.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/union.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/union20.q.out
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Wed Jun 24 04:05:02 2009
@@ -89,6 +89,9 @@
 
     HIVE-439. Merge small files after a map-only job. (Namit Jain via zshao)
 
+    HIVE-516. Enable predicate pushdown for junit tests.
+    (Prasad Chakka via zshao)
+
   OPTIMIZATIONS
 
     HIVE-279. Predicate Pushdown support (Prasad Chakka via athusoo).

Modified: hadoop/hive/trunk/conf/hive-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/conf/hive-default.xml?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/conf/hive-default.xml (original)
+++ hadoop/hive/trunk/conf/hive-default.xml Wed Jun 24 04:05:02 2009
@@ -154,7 +154,7 @@
 
 <property>
   <name>hive.optimize.ppd</name>
-  <value>false</value>
+  <value>true</value>
   <description>Whether to enable predicate pushdown</description>
 </property>
 
@@ -193,7 +193,7 @@
   <value>0.0.0.0</value>
   <description>This is the host address the Hive Web Interface will listen on</description>
 </property>
- 
+
 <property>
   <name>hive.hwi.listen.port</name>
   <value>9999</value>

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java Wed Jun 24 04:05:02 2009
@@ -106,13 +106,13 @@
       
       // combine all predicates into a single expression
       List<exprNodeDesc> preds = null;
-      exprNodeFuncDesc condn = null; 
+      exprNodeDesc condn = null; 
       Iterator<List<exprNodeDesc>> iterator = pushDownPreds.getFinalCandidates().values().iterator();
       while (iterator.hasNext()) {
         preds = iterator.next();
         int i = 0;
         if(condn == null) {
-          condn = (exprNodeFuncDesc) preds.get(0);
+          condn = preds.get(0);
           i++;
         }
         for(; i < preds.size(); i++) {
@@ -164,7 +164,7 @@
       LOG.info("Processing for " +  nd.getName() + "(" + ((Operator)nd).getIdentifier() + ")");
       OpWalkerInfo owi = (OpWalkerInfo)procCtx;
       Operator<? extends Serializable> op = (Operator<? extends Serializable>) nd;
-      exprNodeFuncDesc predicate = (exprNodeFuncDesc) (((FilterOperator)nd).getConf()).getPredicate();
+      exprNodeDesc predicate = (((FilterOperator)nd).getConf()).getPredicate();
       // get pushdown predicates for this operato's predicate
       ExprWalkerInfo ewi = ExprWalkerProcFactory.extractPushdownPreds(owi, op, predicate);
       if (!ewi.isDeterministic()) {

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out Wed Jun 24 04:05:02 2009
@@ -19,20 +19,24 @@
               predicate:
                   expr: (lint[0] > 0)
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: lint[1]
-                      type: int
-                      expr: lintstring[0].MYSTRING
-                      type: string
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  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
-                      name: dest1
+              Filter Operator
+                predicate:
+                    expr: (lint[0] > 0)
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: lint[1]
+                        type: int
+                        expr: lintstring[0].MYSTRING
+                        type: string
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 1
+                    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
+                        name: dest1
 
   Stage: Stage-4
     Conditional Operator
@@ -40,10 +44,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1309415480/10000
+                destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1902470066/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/njain/hive4/hive4/build/ql/tmp/855962366/10002 
+              file:/data/users/pchakka/workspace/oshive/build/ql/tmp/2096411960/10002 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -83,7 +87,7 @@
 Output: default/dest1
 query: SELECT DEST1.* FROM Dest1
 Input: default/dest1
-Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/582181856/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/287581142/10000
 2	1
 4	8
 6	27

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/cast1.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/cast1.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/cast1.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/cast1.q.out Wed Jun 24 04:05:02 2009
@@ -18,30 +18,34 @@
               predicate:
                   expr: (UDFToDouble(key) = UDFToDouble(86))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: (3 + 2)
-                      type: int
-                      expr: (3.0 + UDFToDouble(2))
-                      type: double
-                      expr: (UDFToDouble(3) + 2.0)
-                      type: double
-                      expr: (3.0 + 2.0)
-                      type: double
-                      expr: ((3 + UDFToInteger(2.0)) + UDFToInteger(UDFToShort(0)))
-                      type: int
-                      expr: UDFToBoolean(1)
-                      type: boolean
-                      expr: UDFToInteger(true)
-                      type: int
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  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
-                      name: dest1
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) = UDFToDouble(86))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: (3 + 2)
+                        type: int
+                        expr: (3.0 + UDFToDouble(2))
+                        type: double
+                        expr: (UDFToDouble(3) + 2.0)
+                        type: double
+                        expr: (3.0 + 2.0)
+                        type: double
+                        expr: ((3 + UDFToInteger(2.0)) + UDFToInteger(UDFToShort(0)))
+                        type: int
+                        expr: UDFToBoolean(1)
+                        type: boolean
+                        expr: UDFToInteger(true)
+                        type: int
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 1
+                    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
+                        name: dest1
 
   Stage: Stage-4
     Conditional Operator
@@ -49,10 +53,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1186595197/10000
+                destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/949972588/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/njain/hive4/hive4/build/ql/tmp/1645239744/10002 
+              file:/data/users/pchakka/workspace/oshive/build/ql/tmp/348197295/10002 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -101,5 +105,5 @@
 Output: default/dest1
 query: select dest1.* FROM dest1
 Input: default/dest1
-Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/479828947/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/360541335/10000
 5	5.0	5.0	5.0	5	true	1

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/cluster.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/cluster.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/cluster.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/cluster.q.out Wed Jun 24 04:05:02 2009
@@ -16,26 +16,30 @@
               predicate:
                   expr: (UDFToDouble(key) = UDFToDouble(10))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) = UDFToDouble(10))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
                         type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
+                        expr: value
                         type: string
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -52,7 +56,7 @@
 
 query: SELECT * FROM SRC x where x.key = 10 CLUSTER BY x.key
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/775179415/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/469446419/10000
 10	val_10
 query: EXPLAIN
 SELECT * FROM SRC x  where x.key = 20 CLUSTER BY key
@@ -72,26 +76,30 @@
               predicate:
                   expr: (UDFToDouble(key) = UDFToDouble(20))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col0
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) = UDFToDouble(20))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
                         type: string
-                        expr: _col1
+                        expr: value
                         type: string
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -108,7 +116,7 @@
 
 query: SELECT * FROM SRC x where x.key = 20 CLUSTER BY key
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1647829108/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/918784205/10000
 20	val_20
 query: EXPLAIN
 SELECT x.* FROM SRC x where x.key = 20 CLUSTER BY key
@@ -128,26 +136,30 @@
               predicate:
                   expr: (UDFToDouble(key) = UDFToDouble(20))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) = UDFToDouble(20))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
                         type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
+                        expr: value
                         type: string
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -164,7 +176,7 @@
 
 query: SELECT x.* FROM SRC x where x.key = 20 CLUSTER BY key
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/365690364/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/787341560/10000
 20	val_20
 query: EXPLAIN
 SELECT x.*  FROM SRC x where x.key = 20 CLUSTER BY x.key
@@ -184,26 +196,30 @@
               predicate:
                   expr: (UDFToDouble(key) = UDFToDouble(20))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) = UDFToDouble(20))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
                         type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
+                        expr: value
                         type: string
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -220,7 +236,7 @@
 
 query: SELECT x.*  FROM SRC x where x.key = 20 CLUSTER BY x.key
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1392867261/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/2112333625/10000
 20	val_20
 query: EXPLAIN
 SELECT x.key, x.value as v1 FROM SRC x where x.key = 20 CLUSTER BY key
@@ -240,26 +256,30 @@
               predicate:
                   expr: (UDFToDouble(key) = UDFToDouble(20))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) = UDFToDouble(20))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
                         type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
+                        expr: value
                         type: string
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -276,7 +296,7 @@
 
 query: SELECT x.key, x.value as v1 FROM SRC x where x.key = 20 CLUSTER BY key
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1057006857/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/82082573/10000
 20	val_20
 query: EXPLAIN
 SELECT x.key, x.value as v1 FROM SRC x where x.key = 20 CLUSTER BY x.key
@@ -296,26 +316,30 @@
               predicate:
                   expr: (UDFToDouble(key) = UDFToDouble(20))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col0
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) = UDFToDouble(20))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
                         type: string
-                        expr: _col1
+                        expr: value
                         type: string
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col0
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -332,7 +356,7 @@
 
 query: SELECT x.key, x.value as v1 FROM SRC x where x.key = 20 CLUSTER BY x.key
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1855630481/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/585460645/10000
 20	val_20
 query: EXPLAIN
 SELECT x.key, x.value as v1  FROM SRC x where x.key = 20 CLUSTER BY v1
@@ -352,26 +376,30 @@
               predicate:
                   expr: (UDFToDouble(key) = UDFToDouble(20))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col1
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) = UDFToDouble(20))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
                         type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col1
-                        type: string
-                  tag: -1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
+                        expr: value
                         type: string
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col1
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col1
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -388,7 +416,7 @@
 
 query: SELECT x.key, x.value as v1  FROM SRC x where x.key = 20 CLUSTER BY v1
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1870112839/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1403624942/10000
 20	val_20
 query: EXPLAIN
 SELECT y.* from (SELECT x.* FROM SRC x CLUSTER BY x.key) y where y.key = 20
@@ -450,7 +478,7 @@
 
 query: SELECT y.* from (SELECT x.* FROM SRC x CLUSTER BY x.key) y where y.key = 20
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/980077979/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/595719915/10000
 20	val_20
 query: EXPLAIN 
 SELECT x.key, x.value as v1, y.key  FROM SRC x JOIN SRC y ON (x.key = y.key)  where x.key = 20 CLUSTER BY v1
@@ -482,20 +510,24 @@
                     expr: value
                     type: string
         x 
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 0
-              value expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
+            Filter Operator
+              predicate:
+                  expr: (UDFToDouble(key) = UDFToDouble(20))
+                  type: boolean
+              Reduce Output Operator
+                key expressions:
+                      expr: key
+                      type: string
+                sort order: +
+                Map-reduce partition columns:
+                      expr: key
+                      type: string
+                tag: 0
+                value expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -526,7 +558,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/666021615/10002 
+        file:/data/users/pchakka/workspace/oshive/build/ql/tmp/654289407/10002 
             Reduce Output Operator
               key expressions:
                     expr: _col1
@@ -559,7 +591,7 @@
 
 query: SELECT x.key, x.value as v1, y.key  FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY v1
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1347314676/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1865686895/10000
 20	val_20	20
 query: EXPLAIN 
 SELECT x.key, x.value as v1, y.*  FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY v1
@@ -591,20 +623,24 @@
                     expr: value
                     type: string
         x 
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 0
-              value expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
+            Filter Operator
+              predicate:
+                  expr: (UDFToDouble(key) = UDFToDouble(20))
+                  type: boolean
+              Reduce Output Operator
+                key expressions:
+                      expr: key
+                      type: string
+                sort order: +
+                Map-reduce partition columns:
+                      expr: key
+                      type: string
+                tag: 0
+                value expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -637,7 +673,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/37635850/10002 
+        file:/data/users/pchakka/workspace/oshive/build/ql/tmp/782657504/10002 
             Reduce Output Operator
               key expressions:
                     expr: _col1
@@ -672,7 +708,7 @@
 
 query: SELECT x.key, x.value as v1, y.*  FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY v1
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/954552739/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1662517786/10000
 20	val_20	20	val_20
 query: EXPLAIN
 SELECT x.key, x.value as v1, y.*  FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY x.key
@@ -704,20 +740,24 @@
                     expr: value
                     type: string
         x 
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 0
-              value expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
+            Filter Operator
+              predicate:
+                  expr: (UDFToDouble(key) = UDFToDouble(20))
+                  type: boolean
+              Reduce Output Operator
+                key expressions:
+                      expr: key
+                      type: string
+                sort order: +
+                Map-reduce partition columns:
+                      expr: key
+                      type: string
+                tag: 0
+                value expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -750,7 +790,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/950425430/10002 
+        file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1094038570/10002 
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -785,7 +825,7 @@
 
 query: SELECT x.key, x.value as v1, y.*  FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY x.key
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/245227185/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1889196452/10000
 20	val_20	20	val_20
 query: EXPLAIN
 SELECT x.key, x.value as v1, y.key as yk  FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY key
@@ -817,20 +857,24 @@
                     expr: value
                     type: string
         x 
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 0
-              value expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
+            Filter Operator
+              predicate:
+                  expr: (UDFToDouble(key) = UDFToDouble(20))
+                  type: boolean
+              Reduce Output Operator
+                key expressions:
+                      expr: key
+                      type: string
+                sort order: +
+                Map-reduce partition columns:
+                      expr: key
+                      type: string
+                tag: 0
+                value expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -861,7 +905,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1181511478/10002 
+        file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1162478443/10002 
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -894,7 +938,7 @@
 
 query: SELECT x.key, x.value as v1, y.key as yk  FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY key
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/350754453/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/681246043/10000
 20	val_20	20
 query: EXPLAIN
 SELECT unioninput.*
@@ -920,65 +964,73 @@
               predicate:
                   expr: (UDFToDouble(key) < UDFToDouble(100))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                Union
-                  Select Operator
-                    expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
-                    Reduce Output Operator
-                      key expressions:
-                            expr: _col0
-                            type: string
-                      sort order: +
-                      Map-reduce partition columns:
-                            expr: _col0
-                            type: string
-                      tag: -1
-                      value expressions:
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) < UDFToDouble(100))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
+                        type: string
+                        expr: value
+                        type: string
+                  Union
+                    Select Operator
+                      expressions:
                             expr: _col0
                             type: string
                             expr: _col1
                             type: string
+                      Reduce Output Operator
+                        key expressions:
+                              expr: _col0
+                              type: string
+                        sort order: +
+                        Map-reduce partition columns:
+                              expr: _col0
+                              type: string
+                        tag: -1
+                        value expressions:
+                              expr: _col0
+                              type: string
+                              expr: _col1
+                              type: string
         null-subquery2:unioninput-subquery2:src 
             Filter Operator
               predicate:
                   expr: (UDFToDouble(key) > UDFToDouble(100))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                Union
-                  Select Operator
-                    expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
-                    Reduce Output Operator
-                      key expressions:
-                            expr: _col0
-                            type: string
-                      sort order: +
-                      Map-reduce partition columns:
-                            expr: _col0
-                            type: string
-                      tag: -1
-                      value expressions:
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) > UDFToDouble(100))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
+                        type: string
+                        expr: value
+                        type: string
+                  Union
+                    Select Operator
+                      expressions:
                             expr: _col0
                             type: string
                             expr: _col1
                             type: string
+                      Reduce Output Operator
+                        key expressions:
+                              expr: _col0
+                              type: string
+                        sort order: +
+                        Map-reduce partition columns:
+                              expr: _col0
+                              type: string
+                        tag: -1
+                        value expressions:
+                              expr: _col0
+                              type: string
+                              expr: _col1
+                              type: string
       Reduce Operator Tree:
         Extract
           File Output Operator
@@ -1001,7 +1053,7 @@
 ) unioninput
 CLUSTER BY unioninput.key
 Input: default/src
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1288179627/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/571624743/10000
 0	val_0
 0	val_0
 0	val_0

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/implicit_cast1.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/implicit_cast1.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/implicit_cast1.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/implicit_cast1.q.out Wed Jun 24 04:05:02 2009
@@ -19,18 +19,22 @@
               predicate:
                   expr: (UDFToDouble(a) <> UDFToDouble(0))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: a
-                      type: bigint
-                      expr: b
-                      type: string
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(a) <> UDFToDouble(0))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: a
+                        type: bigint
+                        expr: b
+                        type: string
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 0
+                    table:
+                        input format: org.apache.hadoop.mapred.TextInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-0
     Fetch Operator
@@ -41,5 +45,5 @@
 FROM implicit_test1
 WHERE implicit_test1.a <> 0
 Input: default/implicit_test1
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/253022585/673360259.10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/351758098/10000
 query: DROP TABLE implicit_test1

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input11.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input11.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input11.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input11.q.out Wed Jun 24 04:05:02 2009
@@ -19,26 +19,30 @@
               predicate:
                   expr: (UDFToDouble(key) < UDFToDouble(100))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) < UDFToDouble(100))
+                    type: boolean
                 Select Operator
                   expressions:
-                        expr: UDFToInteger(_col0)
-                        type: int
-                        expr: _col1
+                        expr: key
                         type: string
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-                    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
-                        name: dest1
+                        expr: value
+                        type: string
+                  Select Operator
+                    expressions:
+                          expr: UDFToInteger(_col0)
+                          type: int
+                          expr: _col1
+                          type: string
+                    File Output Operator
+                      compressed: false
+                      GlobalTableId: 1
+                      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
+                          name: dest1
 
   Stage: Stage-4
     Conditional Operator
@@ -46,10 +50,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1223432446/10000
+                destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/2128936217/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/njain/hive4/hive4/build/ql/tmp/561416324/10002 
+              file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1543237247/10002 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -89,7 +93,7 @@
 Output: default/dest1
 query: SELECT dest1.* FROM dest1
 Input: default/dest1
-Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/2047953021/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/178293675/10000
 86	val_86
 27	val_27
 98	val_98

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input11_limit.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input11_limit.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input11_limit.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input11_limit.q.out Wed Jun 24 04:05:02 2009
@@ -18,21 +18,25 @@
               predicate:
                   expr: (UDFToDouble(key) < UDFToDouble(100))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                Limit
-                  Reduce Output Operator
-                    sort order: 
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) < UDFToDouble(100))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
+                        type: string
+                        expr: value
+                        type: string
+                  Limit
+                    Reduce Output Operator
+                      sort order: 
+                      tag: -1
+                      value expressions:
+                            expr: _col0
+                            type: string
+                            expr: _col1
+                            type: string
       Reduce Operator Tree:
         Extract
           Limit
@@ -68,7 +72,7 @@
 Output: default/dest1
 query: SELECT dest1.* FROM dest1
 Input: default/dest1
-Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/754898665/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/600180376/10000
 86	val_86
 27	val_27
 98	val_98

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input23.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input23.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input23.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input23.q.out Wed Jun 24 04:05:02 2009
@@ -12,36 +12,44 @@
     Map Reduce
       Alias -> Map Operator Tree:
         b 
-            Reduce Output Operator
-              sort order: 
-              tag: 1
-              value expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
-                    expr: ds
-                    type: string
-                    expr: hr
-                    type: string
+            Filter Operator
+              predicate:
+                  expr: ((ds = '2008-04-08') and (hr = '14'))
+                  type: boolean
+              Reduce Output Operator
+                sort order: 
+                tag: 1
+                value expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                      expr: ds
+                      type: string
+                      expr: hr
+                      type: string
         a 
-            Reduce Output Operator
-              sort order: 
-              tag: 0
-              value expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
-                    expr: ds
-                    type: string
-                    expr: hr
-                    type: string
+            Filter Operator
+              predicate:
+                  expr: ((ds = '2008-04-08') and (hr = '11'))
+                  type: boolean
+              Reduce Output Operator
+                sort order: 
+                tag: 0
+                value expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                      expr: ds
+                      type: string
+                      expr: hr
+                      type: string
       Needs Tagging: true
       Path -> Alias:
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 
+        file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 
       Path -> Partition:
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 
+        file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 
           Partition
             partition values:
               ds 2008-04-08
@@ -60,7 +68,7 @@
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 file.inputformat org.apache.hadoop.mapred.TextInputFormat
                 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                location file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcpart
+                location file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcpart
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: srcpart
       Reduce Operator Tree:
@@ -96,7 +104,7 @@
                 File Output Operator
                   compressed: false
                   GlobalTableId: 0
-                  directory: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/987896879/10001
+                  directory: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/2018964095/10001
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -111,4 +119,4 @@
 
 query: select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = '11' and b.ds = '2008-04-08' and b.hr = '14' limit 5
 Input: default/srcpart/ds=2008-04-08/hr=11
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1484665177/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/342520994/10000

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input24.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input24.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input24.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input24.q.out Wed Jun 24 04:05:02 2009
@@ -19,17 +19,21 @@
               predicate:
                   expr: (d = '2009-01-01')
                   type: boolean
-              Select Operator
-                Group By Operator
-                  aggregations:
-                        expr: count(1)
-                  mode: hash
-                  Reduce Output Operator
-                    sort order: 
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: bigint
+              Filter Operator
+                predicate:
+                    expr: (d = '2009-01-01')
+                    type: boolean
+                Select Operator
+                  Group By Operator
+                    aggregations:
+                          expr: count(1)
+                    mode: hash
+                    Reduce Output Operator
+                      sort order: 
+                      tag: -1
+                      value expressions:
+                            expr: _col0
+                            type: bigint
       Reduce Operator Tree:
         Group By Operator
           aggregations:
@@ -53,6 +57,6 @@
 
 query: select count(1) from tst x where x.d='2009-01-01'
 Input: default/tst/d=2009-01-01
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/826416972/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1480756599/10000
 0
 query: drop table tst

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input25.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input25.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input25.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input25.q.out Wed Jun 24 04:05:02 2009
@@ -27,25 +27,29 @@
               predicate:
                   expr: (d = '2009-01-01')
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: a
-                      type: int
-                      expr: b
-                      type: int
-                      expr: d
-                      type: string
-                Limit
-                  Reduce Output Operator
-                    sort order: 
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: int
-                          expr: _col1
-                          type: int
-                          expr: _col2
-                          type: string
+              Filter Operator
+                predicate:
+                    expr: (d = '2009-01-01')
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: a
+                        type: int
+                        expr: b
+                        type: int
+                        expr: d
+                        type: string
+                  Limit
+                    Reduce Output Operator
+                      sort order: 
+                      tag: -1
+                      value expressions:
+                            expr: _col0
+                            type: int
+                            expr: _col1
+                            type: int
+                            expr: _col2
+                            type: string
       Reduce Operator Tree:
         Extract
           Limit
@@ -60,7 +64,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/905940285/10002 
+        file:/data/users/pchakka/workspace/oshive/build/ql/tmp/717433292/10002 
           Union
             Select Operator
               expressions:
@@ -76,7 +80,7 @@
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/905940285/10003 
+        file:/data/users/pchakka/workspace/oshive/build/ql/tmp/717433292/10003 
           Union
             Select Operator
               expressions:
@@ -101,25 +105,29 @@
               predicate:
                   expr: (d = '2009-02-02')
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: a
-                      type: int
-                      expr: b
-                      type: int
-                      expr: d
-                      type: string
-                Limit
-                  Reduce Output Operator
-                    sort order: 
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: int
-                          expr: _col1
-                          type: int
-                          expr: _col2
-                          type: string
+              Filter Operator
+                predicate:
+                    expr: (d = '2009-02-02')
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: a
+                        type: int
+                        expr: b
+                        type: int
+                        expr: d
+                        type: string
+                  Limit
+                    Reduce Output Operator
+                      sort order: 
+                      tag: -1
+                      value expressions:
+                            expr: _col0
+                            type: int
+                            expr: _col1
+                            type: int
+                            expr: _col2
+                            type: string
       Reduce Operator Tree:
         Extract
           Limit
@@ -143,5 +151,5 @@
 ) subq
 Input: default/tst/d=2009-01-01
 Input: default/tst/d=2009-02-02
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/2079633835/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/273314648/10000
 query: drop table tst

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input26.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input26.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input26.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input26.q.out Wed Jun 24 04:05:02 2009
@@ -23,31 +23,35 @@
               predicate:
                   expr: ((ds = '2008-04-08') and (hr = '11'))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                      expr: ds
-                      type: string
-                      expr: hr
-                      type: string
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  tag: -1
-                  value expressions:
-                        expr: _col0
+              Filter Operator
+                predicate:
+                    expr: ((ds = '2008-04-08') and (hr = '11'))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
                         type: string
-                        expr: _col1
+                        expr: value
                         type: string
-                        expr: _col2
+                        expr: ds
                         type: string
-                        expr: _col3
+                        expr: hr
                         type: string
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col0
+                          type: string
+                    sort order: +
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
+                          expr: _col2
+                          type: string
+                          expr: _col3
+                          type: string
       Reduce Operator Tree:
         Extract
           Limit
@@ -62,7 +66,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1762363316/10002 
+        file:/data/users/pchakka/workspace/oshive/build/ql/tmp/998416025/10002 
           Union
             Select Operator
               expressions:
@@ -80,7 +84,7 @@
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-        file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1762363316/10003 
+        file:/data/users/pchakka/workspace/oshive/build/ql/tmp/998416025/10003 
           Union
             Select Operator
               expressions:
@@ -107,29 +111,33 @@
               predicate:
                   expr: ((ds = '2008-04-08') and (hr = '14'))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                      expr: ds
-                      type: string
-                      expr: hr
-                      type: string
-                Limit
-                  Reduce Output Operator
-                    sort order: 
-                    tag: -1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
-                          expr: _col2
-                          type: string
-                          expr: _col3
-                          type: string
+              Filter Operator
+                predicate:
+                    expr: ((ds = '2008-04-08') and (hr = '14'))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
+                        type: string
+                        expr: value
+                        type: string
+                        expr: ds
+                        type: string
+                        expr: hr
+                        type: string
+                  Limit
+                    Reduce Output Operator
+                      sort order: 
+                      tag: -1
+                      value expressions:
+                            expr: _col0
+                            type: string
+                            expr: _col1
+                            type: string
+                            expr: _col2
+                            type: string
+                            expr: _col3
+                            type: string
       Reduce Operator Tree:
         Extract
           Limit
@@ -152,7 +160,7 @@
   select * from srcpart b where b.ds = '2008-04-08' and b.hr = '14' limit 5
 )subq
 Input: default/srcpart/ds=2008-04-08/hr=11
-Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/987288914/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/122967309/10000
 0	val_0	2008-04-08	11
 0	val_0	2008-04-08	11
 0	val_0	2008-04-08	11

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out Wed Jun 24 04:05:02 2009
@@ -16,19 +16,23 @@
               predicate:
                   expr: (UDFToDouble(key) < UDFToDouble(300))
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                Limit
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Filter Operator
+                predicate:
+                    expr: (UDFToDouble(key) < UDFToDouble(300))
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
+                        type: string
+                        expr: value
+                        type: string
+                  Limit
+                    File Output Operator
+                      compressed: false
+                      GlobalTableId: 0
+                      table:
+                          input format: org.apache.hadoop.mapred.TextInputFormat
+                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-0
     Fetch Operator
@@ -37,7 +41,7 @@
 
 query: SELECT x.* FROM SRC x WHERE x.key < 300 LIMIT 5
 Input: default/src
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/472205870/117610052.10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/455953501/10000
 238	val_238
 86	val_86
 27	val_27

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input6.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input6.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input6.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input6.q.out Wed Jun 24 04:05:02 2009
@@ -19,20 +19,24 @@
               predicate:
                   expr: key is null
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  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
-                      name: dest1
+              Filter Operator
+                predicate:
+                    expr: key is null
+                    type: boolean
+                Select Operator
+                  expressions:
+                        expr: key
+                        type: string
+                        expr: value
+                        type: string
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 1
+                    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
+                        name: dest1
 
   Stage: Stage-4
     Conditional Operator
@@ -40,10 +44,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/2141064929/10000
+                destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1872864364/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/njain/hive4/hive4/build/ql/tmp/1183886471/10002 
+              file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1713625230/10002 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -83,4 +87,4 @@
 Output: default/dest1
 query: SELECT dest1.* FROM dest1
 Input: default/dest1
-Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/461702779/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1551041536/10000

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input9.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input9.q.out?rev=787898&r1=787897&r2=787898&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input9.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input9.q.out Wed Jun 24 04:05:02 2009
@@ -19,26 +19,30 @@
               predicate:
                   expr: (null = null)
                   type: boolean
-              Select Operator
-                expressions:
-                      expr: null
-                      type: string
-                      expr: key
-                      type: string
+              Filter Operator
+                predicate:
+                    expr: (null = null)
+                    type: boolean
                 Select Operator
                   expressions:
-                        expr: _col0
-                        type: void
-                        expr: UDFToInteger(_col1)
-                        type: int
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-                    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
-                        name: dest1
+                        expr: null
+                        type: string
+                        expr: key
+                        type: string
+                  Select Operator
+                    expressions:
+                          expr: _col0
+                          type: void
+                          expr: UDFToInteger(_col1)
+                          type: int
+                    File Output Operator
+                      compressed: false
+                      GlobalTableId: 1
+                      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
+                          name: dest1
 
   Stage: Stage-4
     Conditional Operator
@@ -46,10 +50,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/109033566/10000
+                destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1990045485/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/njain/hive4/hive4/build/ql/tmp/1393752367/10002 
+              file:/data/users/pchakka/workspace/oshive/build/ql/tmp/120431399/10002 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -89,4 +93,4 @@
 Output: default/dest1
 query: SELECT dest1.* FROM dest1
 Input: default/dest1
-Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/523260556/10000
+Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/843563761/10000