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 2010/01/25 19:49:05 UTC

svn commit: r902921 [16/26] - in /hadoop/hive/trunk: ./ contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/ contrib/src/java/org/apache/hadoop/hive/contrib/udtf/example/ ql/src/java/org/apache/hadoop/hive/ql/ ql/src/java/org/apache/hado...

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml?rev=902921&r1=902920&r2=902921&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml Mon Jan 25 18:48:58 2010
@@ -37,23 +37,23 @@
                    <string>Stage-3</string> 
                   </void> 
                   <void property="work"> 
-                   <object id="mapredWork0" class="org.apache.hadoop.hive.ql.plan.mapredWork"> 
+                   <object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork"> 
                     <void property="aliasToWork"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/614459204/10002</string> 
+                       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1440419779/10002</string> 
                        <object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator"> 
                         <void property="childOperators"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
                            <object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator"> 
                             <void property="conf"> 
-                             <object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc"> 
+                             <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
                               <void property="keyCols"> 
                                <object class="java.util.ArrayList"/> 
                               </void> 
                               <void property="keySerializeInfo"> 
-                               <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                               <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                                 <void property="deserializerClass"> 
                                  <class>org.apache.hadoop.hive.serde2.binarysortable.BinarySortableSerDe</class> 
                                 </void> 
@@ -100,7 +100,7 @@
                               <void property="partitionCols"> 
                                <object class="java.util.ArrayList"> 
                                 <void method="add"> 
-                                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                                 <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                                   <void property="childExprs"> 
                                    <object class="java.util.ArrayList"/> 
                                   </void> 
@@ -131,7 +131,7 @@
                               <void property="valueCols"> 
                                <object class="java.util.ArrayList"> 
                                 <void method="add"> 
-                                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                                 <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                                   <void property="column"> 
                                    <string>key</string> 
                                   </void> 
@@ -148,7 +148,7 @@
                                  </object> 
                                 </void> 
                                 <void method="add"> 
-                                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                                 <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                                   <void property="column"> 
                                    <string>value</string> 
                                   </void> 
@@ -163,7 +163,7 @@
                                </object> 
                               </void> 
                               <void property="valueSerializeInfo"> 
-                               <object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                               <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                                 <void property="deserializerClass"> 
                                  <class>org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe</class> 
                                 </void> 
@@ -278,7 +278,7 @@
                      </object> 
                     </void> 
                     <void property="keyDesc"> 
-                     <object idref="tableDesc0"/> 
+                     <object idref="TableDesc0"/> 
                     </void> 
                     <void property="numReduceTasks"> 
                      <int>-1</int> 
@@ -286,10 +286,10 @@
                     <void property="pathToAliases"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/614459204/10002</string> 
+                       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1440419779/10002</string> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/614459204/10002</string> 
+                         <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1440419779/10002</string> 
                         </void> 
                        </object> 
                       </void> 
@@ -298,8 +298,8 @@
                     <void property="pathToPartitionInfo"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/614459204/10002</string> 
-                       <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+                       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1440419779/10002</string> 
+                       <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
                         <void property="deserializerClass"> 
                          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
                         </void> 
@@ -349,11 +349,11 @@
                           </void> 
                           <void method="put"> 
                            <string>location</string> 
-                           <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/dest1</string> 
+                           <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/dest1</string> 
                           </void> 
                           <void method="put"> 
                            <string>transient_lastDdlTime</string> 
-                           <string>1263595125</string> 
+                           <string>1264444472</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -361,7 +361,7 @@
                          <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
                         </void> 
                         <void property="tableDesc"> 
-                         <object id="tableDesc2" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                         <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                           <void property="deserializerClass"> 
                            <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
                           </void> 
@@ -390,12 +390,12 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
                           <void property="conf"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc"> 
                             <void property="dirName"> 
-                             <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/446729307/10000</string> 
+                             <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/746314432/10000</string> 
                             </void> 
                             <void property="tableInfo"> 
-                             <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                             <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                               <void property="deserializerClass"> 
                                <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
                               </void> 
@@ -441,7 +441,7 @@
                                 </void> 
                                 <void method="put"> 
                                  <string>location</string> 
-                                 <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/dest1</string> 
+                                 <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/dest1</string> 
                                 </void> 
                                 <void method="put"> 
                                  <string>file.outputformat</string> 
@@ -449,7 +449,7 @@
                                 </void> 
                                 <void method="put"> 
                                  <string>transient_lastDdlTime</string> 
-                                 <string>1263595125</string> 
+                                 <string>1264444472</string> 
                                 </void> 
                                </object> 
                               </void> 
@@ -494,9 +494,9 @@
                        </object> 
                       </void> 
                       <void property="conf"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.extractDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExtractDesc"> 
                         <void property="col"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                         <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                           <void property="column"> 
                            <string>VALUE</string> 
                           </void> 
@@ -566,7 +566,7 @@
                     <void property="tagToValueDesc"> 
                      <object class="java.util.ArrayList"> 
                       <void method="add"> 
-                       <object idref="tableDesc1"/> 
+                       <object idref="TableDesc1"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -577,9 +577,9 @@
                </object> 
               </void> 
               <void property="work"> 
-               <object class="org.apache.hadoop.hive.ql.plan.moveWork"> 
+               <object class="org.apache.hadoop.hive.ql.plan.MoveWork"> 
                 <void property="loadTableWork"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.loadTableDesc"> 
+                 <object class="org.apache.hadoop.hive.ql.plan.LoadTableDesc"> 
                   <void property="partitionSpec"> 
                    <object class="java.util.HashMap"/> 
                   </void> 
@@ -587,13 +587,13 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="sourceDir"> 
-                   <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/446729307/10000</string> 
+                   <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/746314432/10000</string> 
                   </void> 
                   <void property="table"> 
-                   <object idref="tableDesc2"/> 
+                   <object idref="TableDesc2"/> 
                   </void> 
                   <void property="tmpDir"> 
-                   <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/446729307/10001</string> 
+                   <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/746314432/10001</string> 
                   </void> 
                  </object> 
                 </void> 
@@ -607,17 +607,17 @@
            <string>Stage-4</string> 
           </void> 
           <void property="work"> 
-           <object id="moveWork0" class="org.apache.hadoop.hive.ql.plan.moveWork"> 
+           <object id="MoveWork0" class="org.apache.hadoop.hive.ql.plan.MoveWork"> 
             <void property="loadFileWork"> 
-             <object class="org.apache.hadoop.hive.ql.plan.loadFileDesc"> 
+             <object class="org.apache.hadoop.hive.ql.plan.LoadFileDesc"> 
               <void property="isDfsDir"> 
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/614459204/10002</string> 
+               <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1440419779/10002</string> 
               </void> 
               <void property="targetDir"> 
-               <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/446729307/10000</string> 
+               <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/746314432/10000</string> 
               </void> 
              </object> 
             </void> 
@@ -643,7 +643,7 @@
       <void property="resolverCtx"> 
        <object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx"> 
         <void property="dir"> 
-         <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/614459204/10002</string> 
+         <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1440419779/10002</string> 
         </void> 
         <void property="listTasks"> 
          <object idref="ArrayList0"/> 
@@ -655,10 +655,10 @@
         <void property="listWorks"> 
          <object class="java.util.ArrayList"> 
           <void method="add"> 
-           <object idref="moveWork0"/> 
+           <object idref="MoveWork0"/> 
           </void> 
           <void method="add"> 
-           <object idref="mapredWork0"/> 
+           <object idref="MapredWork0"/> 
           </void> 
          </object> 
         </void> 
@@ -672,11 +672,11 @@
    <string>Stage-2</string> 
   </void> 
   <void property="work"> 
-   <object class="org.apache.hadoop.hive.ql.plan.mapredWork"> 
+   <object class="org.apache.hadoop.hive.ql.plan.MapredWork"> 
     <void property="aliasToPartnInfo"> 
      <void method="put"> 
       <string>src1</string> 
-      <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+      <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
        <void property="deserializerClass"> 
         <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
        </void> 
@@ -729,11 +729,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/src1</string> 
+          <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src1</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1263595124</string> 
+          <string>1264444472</string> 
          </void> 
         </object> 
        </void> 
@@ -741,7 +741,7 @@
         <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
        </void> 
        <void property="tableDesc"> 
-        <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+        <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
          <void property="deserializerClass"> 
           <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
          </void> 
@@ -784,15 +784,15 @@
                       <void method="add"> 
                        <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
                         <void property="conf"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
+                         <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc"> 
                           <void property="destTableId"> 
                            <int>1</int> 
                           </void> 
                           <void property="dirName"> 
-                           <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/614459204/10002</string> 
+                           <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1440419779/10002</string> 
                           </void> 
                           <void property="tableInfo"> 
-                           <object idref="tableDesc2"/> 
+                           <object idref="TableDesc2"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -833,7 +833,7 @@
                      <object class="java.util.HashMap"> 
                       <void method="put"> 
                        <string>_col1</string> 
-                       <object id="exprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                       <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                         <void property="column"> 
                          <string>key</string> 
                         </void> 
@@ -847,7 +847,7 @@
                       </void> 
                       <void method="put"> 
                        <string>_col0</string> 
-                       <object id="exprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                       <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
                         <void property="typeInfo"> 
                          <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
@@ -856,14 +856,14 @@
                      </object> 
                     </void> 
                     <void property="conf"> 
-                     <object class="org.apache.hadoop.hive.ql.plan.selectDesc"> 
+                     <object class="org.apache.hadoop.hive.ql.plan.SelectDesc"> 
                       <void property="colList"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <object idref="exprNodeConstantDesc0"/> 
+                         <object idref="ExprNodeConstantDesc0"/> 
                         </void> 
                         <void method="add"> 
-                         <object idref="exprNodeColumnDesc0"/> 
+                         <object idref="ExprNodeColumnDesc0"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -938,20 +938,20 @@
                  </object> 
                 </void> 
                 <void property="conf"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.filterDesc"> 
+                 <object class="org.apache.hadoop.hive.ql.plan.FilterDesc"> 
                   <void property="predicate"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                     <void property="childExprs"> 
                      <object class="java.util.ArrayList"> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc"> 
                         <void property="typeInfo"> 
                          <object idref="PrimitiveTypeInfo1"/> 
                         </void> 
                        </object> 
                       </void> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc"> 
                         <void property="typeInfo"> 
                          <object idref="PrimitiveTypeInfo1"/> 
                         </void> 
@@ -1042,20 +1042,20 @@
              </object> 
             </void> 
             <void property="conf"> 
-             <object class="org.apache.hadoop.hive.ql.plan.filterDesc"> 
+             <object class="org.apache.hadoop.hive.ql.plan.FilterDesc"> 
               <void property="predicate"> 
-               <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+               <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                 <void property="childExprs"> 
                  <object class="java.util.ArrayList"> 
                   <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc"> 
                     <void property="typeInfo"> 
                      <object idref="PrimitiveTypeInfo1"/> 
                     </void> 
                    </object> 
                   </void> 
                   <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeNullDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc"> 
                     <void property="typeInfo"> 
                      <object idref="PrimitiveTypeInfo1"/> 
                     </void> 
@@ -1121,7 +1121,7 @@
          </object> 
         </void> 
         <void property="conf"> 
-         <object class="org.apache.hadoop.hive.ql.plan.tableScanDesc"> 
+         <object class="org.apache.hadoop.hive.ql.plan.TableScanDesc"> 
           <void property="alias"> 
            <string>src1</string> 
           </void> 
@@ -1167,7 +1167,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/src1</string> 
+       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src1</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src1</string> 
@@ -1179,8 +1179,8 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/src1</string> 
-       <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src1</string> 
+       <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
         </void> 
@@ -1200,7 +1200,7 @@
          <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
         </void> 
         <void property="tableDesc"> 
-         <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
           <void property="deserializerClass"> 
            <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
           </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=902921&r1=902920&r2=902921&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml Mon Jan 25 18:48:58 2010
@@ -5,11 +5,11 @@
    <string>Stage-2</string> 
   </void> 
   <void property="work"> 
-   <object class="org.apache.hadoop.hive.ql.plan.mapredWork"> 
+   <object class="org.apache.hadoop.hive.ql.plan.MapredWork"> 
     <void property="aliasToPartnInfo"> 
      <void method="put"> 
       <string>srcpart</string> 
-      <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+      <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
        <void property="deserializerClass"> 
         <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
        </void> 
@@ -75,11 +75,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcpart</string> 
+          <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/srcpart</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1263415301</string> 
+          <string>1264444474</string> 
          </void> 
         </object> 
        </void> 
@@ -87,7 +87,7 @@
         <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
        </void> 
        <void property="tableDesc"> 
-        <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+        <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
          <void property="deserializerClass"> 
           <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
          </void> 
@@ -130,12 +130,12 @@
                       <void method="add"> 
                        <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
                         <void property="conf"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
+                         <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc"> 
                           <void property="dirName"> 
-                           <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/61011718/10001</string> 
+                           <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/234154366/10001</string> 
                           </void> 
                           <void property="tableInfo"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                             <void property="deserializerClass"> 
                              <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
                             </void> 
@@ -251,7 +251,7 @@
                      <object class="java.util.HashMap"> 
                       <void method="put"> 
                        <string>_col3</string> 
-                       <object id="exprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                       <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                         <void property="column"> 
                          <string>ds</string> 
                         </void> 
@@ -265,7 +265,7 @@
                       </void> 
                       <void method="put"> 
                        <string>_col2</string> 
-                       <object id="exprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                       <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                         <void property="column"> 
                          <string>hr</string> 
                         </void> 
@@ -279,7 +279,7 @@
                       </void> 
                       <void method="put"> 
                        <string>_col1</string> 
-                       <object id="exprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                       <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                         <void property="column"> 
                          <string>value</string> 
                         </void> 
@@ -293,7 +293,7 @@
                       </void> 
                       <void method="put"> 
                        <string>_col0</string> 
-                       <object id="exprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                       <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                         <void property="column"> 
                          <string>key</string> 
                         </void> 
@@ -308,20 +308,20 @@
                      </object> 
                     </void> 
                     <void property="conf"> 
-                     <object class="org.apache.hadoop.hive.ql.plan.selectDesc"> 
+                     <object class="org.apache.hadoop.hive.ql.plan.SelectDesc"> 
                       <void property="colList"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <object idref="exprNodeColumnDesc3"/> 
+                         <object idref="ExprNodeColumnDesc3"/> 
                         </void> 
                         <void method="add"> 
-                         <object idref="exprNodeColumnDesc2"/> 
+                         <object idref="ExprNodeColumnDesc2"/> 
                         </void> 
                         <void method="add"> 
-                         <object idref="exprNodeColumnDesc1"/> 
+                         <object idref="ExprNodeColumnDesc1"/> 
                         </void> 
                         <void method="add"> 
-                         <object idref="exprNodeColumnDesc0"/> 
+                         <object idref="ExprNodeColumnDesc0"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -434,21 +434,21 @@
                  </object> 
                 </void> 
                 <void property="conf"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.filterDesc"> 
+                 <object class="org.apache.hadoop.hive.ql.plan.FilterDesc"> 
                   <void property="predicate"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                     <void property="childExprs"> 
                      <object class="java.util.ArrayList"> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                         <void property="childExprs"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                             <void property="childExprs"> 
                              <object class="java.util.ArrayList"> 
                               <void method="add"> 
-                               <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                               <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                                 <void property="column"> 
                                  <string>key</string> 
                                 </void> 
@@ -461,7 +461,7 @@
                                </object> 
                               </void> 
                               <void method="add"> 
-                               <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                               <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
                                 <void property="typeInfo"> 
                                  <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
                                   <void property="typeName"> 
@@ -499,11 +499,11 @@
                            </object> 
                           </void> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                             <void property="childExprs"> 
                              <object class="java.util.ArrayList"> 
                               <void method="add"> 
-                               <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                               <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                                 <void property="column"> 
                                  <string>ds</string> 
                                 </void> 
@@ -516,7 +516,7 @@
                                </object> 
                               </void> 
                               <void method="add"> 
-                               <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                               <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
                                 <void property="typeInfo"> 
                                  <object idref="PrimitiveTypeInfo0"/> 
                                 </void> 
@@ -566,11 +566,11 @@
                        </object> 
                       </void> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                         <void property="childExprs"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                             <void property="column"> 
                              <string>hr</string> 
                             </void> 
@@ -583,7 +583,7 @@
                            </object> 
                           </void> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
                             <void property="typeInfo"> 
                              <object idref="PrimitiveTypeInfo0"/> 
                             </void> 
@@ -713,21 +713,21 @@
              </object> 
             </void> 
             <void property="conf"> 
-             <object class="org.apache.hadoop.hive.ql.plan.filterDesc"> 
+             <object class="org.apache.hadoop.hive.ql.plan.FilterDesc"> 
               <void property="predicate"> 
-               <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+               <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                 <void property="childExprs"> 
                  <object class="java.util.ArrayList"> 
                   <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                     <void property="childExprs"> 
                      <object class="java.util.ArrayList"> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                         <void property="childExprs"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                             <void property="column"> 
                              <string>key</string> 
                             </void> 
@@ -740,7 +740,7 @@
                            </object> 
                           </void> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
                             <void property="typeInfo"> 
                              <object idref="PrimitiveTypeInfo1"/> 
                             </void> 
@@ -770,11 +770,11 @@
                        </object> 
                       </void> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                         <void property="childExprs"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                             <void property="column"> 
                              <string>ds</string> 
                             </void> 
@@ -787,7 +787,7 @@
                            </object> 
                           </void> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
                             <void property="typeInfo"> 
                              <object idref="PrimitiveTypeInfo0"/> 
                             </void> 
@@ -837,11 +837,11 @@
                    </object> 
                   </void> 
                   <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                     <void property="childExprs"> 
                      <object class="java.util.ArrayList"> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                         <void property="column"> 
                          <string>hr</string> 
                         </void> 
@@ -854,7 +854,7 @@
                        </object> 
                       </void> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
                         <void property="typeInfo"> 
                          <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
@@ -943,7 +943,7 @@
          </object> 
         </void> 
         <void property="conf"> 
-         <object class="org.apache.hadoop.hive.ql.plan.tableScanDesc"> 
+         <object class="org.apache.hadoop.hive.ql.plan.TableScanDesc"> 
           <void property="alias"> 
            <string>srcpart</string> 
           </void> 
@@ -998,7 +998,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12</string> 
+       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>srcpart</string> 
@@ -1010,8 +1010,8 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12</string> 
-       <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12</string> 
+       <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
         </void> 
@@ -1031,7 +1031,7 @@
          <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
         </void> 
         <void property="tableDesc"> 
-         <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
           <void property="deserializerClass"> 
            <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
           </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml?rev=902921&r1=902920&r2=902921&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml Mon Jan 25 18:48:58 2010
@@ -37,23 +37,23 @@
                    <string>Stage-3</string> 
                   </void> 
                   <void property="work"> 
-                   <object id="mapredWork0" class="org.apache.hadoop.hive.ql.plan.mapredWork"> 
+                   <object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork"> 
                     <void property="aliasToWork"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/146949576/10002</string> 
+                       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/765719666/10002</string> 
                        <object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator"> 
                         <void property="childOperators"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
                            <object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator"> 
                             <void property="conf"> 
-                             <object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc"> 
+                             <object class="org.apache.hadoop.hive.ql.plan.ReduceSinkDesc"> 
                               <void property="keyCols"> 
                                <object class="java.util.ArrayList"/> 
                               </void> 
                               <void property="keySerializeInfo"> 
-                               <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                               <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                                 <void property="deserializerClass"> 
                                  <class>org.apache.hadoop.hive.serde2.binarysortable.BinarySortableSerDe</class> 
                                 </void> 
@@ -100,7 +100,7 @@
                               <void property="partitionCols"> 
                                <object class="java.util.ArrayList"> 
                                 <void method="add"> 
-                                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                                 <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                                   <void property="childExprs"> 
                                    <object class="java.util.ArrayList"/> 
                                   </void> 
@@ -131,7 +131,7 @@
                               <void property="valueCols"> 
                                <object class="java.util.ArrayList"> 
                                 <void method="add"> 
-                                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                                 <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                                   <void property="column"> 
                                    <string>key</string> 
                                   </void> 
@@ -148,7 +148,7 @@
                                  </object> 
                                 </void> 
                                 <void method="add"> 
-                                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                                 <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                                   <void property="column"> 
                                    <string>value</string> 
                                   </void> 
@@ -163,7 +163,7 @@
                                </object> 
                               </void> 
                               <void property="valueSerializeInfo"> 
-                               <object id="tableDesc1" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                               <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                                 <void property="deserializerClass"> 
                                  <class>org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe</class> 
                                 </void> 
@@ -278,7 +278,7 @@
                      </object> 
                     </void> 
                     <void property="keyDesc"> 
-                     <object idref="tableDesc0"/> 
+                     <object idref="TableDesc0"/> 
                     </void> 
                     <void property="numReduceTasks"> 
                      <int>-1</int> 
@@ -286,10 +286,10 @@
                     <void property="pathToAliases"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/146949576/10002</string> 
+                       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/765719666/10002</string> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/146949576/10002</string> 
+                         <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/765719666/10002</string> 
                         </void> 
                        </object> 
                       </void> 
@@ -298,8 +298,8 @@
                     <void property="pathToPartitionInfo"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/146949576/10002</string> 
-                       <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+                       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/765719666/10002</string> 
+                       <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
                         <void property="deserializerClass"> 
                          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
                         </void> 
@@ -349,11 +349,11 @@
                           </void> 
                           <void method="put"> 
                            <string>location</string> 
-                           <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/dest4_sequencefile</string> 
+                           <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/dest4_sequencefile</string> 
                           </void> 
                           <void method="put"> 
                            <string>transient_lastDdlTime</string> 
-                           <string>1263595130</string> 
+                           <string>1264444479</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -361,7 +361,7 @@
                          <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
                         </void> 
                         <void property="tableDesc"> 
-                         <object id="tableDesc2" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                         <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                           <void property="deserializerClass"> 
                            <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
                           </void> 
@@ -390,12 +390,12 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
                           <void property="conf"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc"> 
                             <void property="dirName"> 
-                             <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/462503073/10000</string> 
+                             <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1665845323/10000</string> 
                             </void> 
                             <void property="tableInfo"> 
-                             <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                             <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                               <void property="deserializerClass"> 
                                <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
                               </void> 
@@ -441,7 +441,7 @@
                                 </void> 
                                 <void method="put"> 
                                  <string>location</string> 
-                                 <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/dest4_sequencefile</string> 
+                                 <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/dest4_sequencefile</string> 
                                 </void> 
                                 <void method="put"> 
                                  <string>file.outputformat</string> 
@@ -449,7 +449,7 @@
                                 </void> 
                                 <void method="put"> 
                                  <string>transient_lastDdlTime</string> 
-                                 <string>1263595130</string> 
+                                 <string>1264444479</string> 
                                 </void> 
                                </object> 
                               </void> 
@@ -494,9 +494,9 @@
                        </object> 
                       </void> 
                       <void property="conf"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.extractDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExtractDesc"> 
                         <void property="col"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                         <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                           <void property="column"> 
                            <string>VALUE</string> 
                           </void> 
@@ -562,7 +562,7 @@
                     <void property="tagToValueDesc"> 
                      <object class="java.util.ArrayList"> 
                       <void method="add"> 
-                       <object idref="tableDesc1"/> 
+                       <object idref="TableDesc1"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -573,9 +573,9 @@
                </object> 
               </void> 
               <void property="work"> 
-               <object class="org.apache.hadoop.hive.ql.plan.moveWork"> 
+               <object class="org.apache.hadoop.hive.ql.plan.MoveWork"> 
                 <void property="loadTableWork"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.loadTableDesc"> 
+                 <object class="org.apache.hadoop.hive.ql.plan.LoadTableDesc"> 
                   <void property="partitionSpec"> 
                    <object class="java.util.HashMap"/> 
                   </void> 
@@ -583,13 +583,13 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="sourceDir"> 
-                   <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/462503073/10000</string> 
+                   <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1665845323/10000</string> 
                   </void> 
                   <void property="table"> 
-                   <object idref="tableDesc2"/> 
+                   <object idref="TableDesc2"/> 
                   </void> 
                   <void property="tmpDir"> 
-                   <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/462503073/10001</string> 
+                   <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1665845323/10001</string> 
                   </void> 
                  </object> 
                 </void> 
@@ -603,17 +603,17 @@
            <string>Stage-4</string> 
           </void> 
           <void property="work"> 
-           <object id="moveWork0" class="org.apache.hadoop.hive.ql.plan.moveWork"> 
+           <object id="MoveWork0" class="org.apache.hadoop.hive.ql.plan.MoveWork"> 
             <void property="loadFileWork"> 
-             <object class="org.apache.hadoop.hive.ql.plan.loadFileDesc"> 
+             <object class="org.apache.hadoop.hive.ql.plan.LoadFileDesc"> 
               <void property="isDfsDir"> 
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/146949576/10002</string> 
+               <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/765719666/10002</string> 
               </void> 
               <void property="targetDir"> 
-               <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/462503073/10000</string> 
+               <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1665845323/10000</string> 
               </void> 
              </object> 
             </void> 
@@ -639,7 +639,7 @@
       <void property="resolverCtx"> 
        <object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx"> 
         <void property="dir"> 
-         <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/146949576/10002</string> 
+         <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/765719666/10002</string> 
         </void> 
         <void property="listTasks"> 
          <object idref="ArrayList0"/> 
@@ -651,10 +651,10 @@
         <void property="listWorks"> 
          <object class="java.util.ArrayList"> 
           <void method="add"> 
-           <object idref="moveWork0"/> 
+           <object idref="MoveWork0"/> 
           </void> 
           <void method="add"> 
-           <object idref="mapredWork0"/> 
+           <object idref="MapredWork0"/> 
           </void> 
          </object> 
         </void> 
@@ -668,11 +668,11 @@
    <string>Stage-2</string> 
   </void> 
   <void property="work"> 
-   <object class="org.apache.hadoop.hive.ql.plan.mapredWork"> 
+   <object class="org.apache.hadoop.hive.ql.plan.MapredWork"> 
     <void property="aliasToPartnInfo"> 
      <void method="put"> 
       <string>src</string> 
-      <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+      <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
        <void property="deserializerClass"> 
         <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
        </void> 
@@ -725,11 +725,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/src</string> 
+          <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1263595130</string> 
+          <string>1264444478</string> 
          </void> 
         </object> 
        </void> 
@@ -737,7 +737,7 @@
         <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
        </void> 
        <void property="tableDesc"> 
-        <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+        <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
          <void property="deserializerClass"> 
           <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
          </void> 
@@ -772,15 +772,15 @@
               <void method="add"> 
                <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
                 <void property="conf"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
+                 <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc"> 
                   <void property="destTableId"> 
                    <int>1</int> 
                   </void> 
                   <void property="dirName"> 
-                   <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/tmp/146949576/10002</string> 
+                   <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/765719666/10002</string> 
                   </void> 
                   <void property="tableInfo"> 
-                   <object idref="tableDesc2"/> 
+                   <object idref="TableDesc2"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -821,7 +821,7 @@
              <object class="java.util.HashMap"> 
               <void method="put"> 
                <string>_col1</string> 
-               <object id="exprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+               <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                 <void property="column"> 
                  <string>value</string> 
                 </void> 
@@ -835,7 +835,7 @@
               </void> 
               <void method="put"> 
                <string>_col0</string> 
-               <object id="exprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+               <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                 <void property="column"> 
                  <string>key</string> 
                 </void> 
@@ -850,14 +850,14 @@
              </object> 
             </void> 
             <void property="conf"> 
-             <object class="org.apache.hadoop.hive.ql.plan.selectDesc"> 
+             <object class="org.apache.hadoop.hive.ql.plan.SelectDesc"> 
               <void property="colList"> 
                <object class="java.util.ArrayList"> 
                 <void method="add"> 
-                 <object idref="exprNodeColumnDesc1"/> 
+                 <object idref="ExprNodeColumnDesc1"/> 
                 </void> 
                 <void method="add"> 
-                 <object idref="exprNodeColumnDesc0"/> 
+                 <object idref="ExprNodeColumnDesc0"/> 
                 </void> 
                </object> 
               </void> 
@@ -932,7 +932,7 @@
          </object> 
         </void> 
         <void property="conf"> 
-         <object class="org.apache.hadoop.hive.ql.plan.tableScanDesc"> 
+         <object class="org.apache.hadoop.hive.ql.plan.TableScanDesc"> 
           <void property="alias"> 
            <string>src</string> 
           </void> 
@@ -1002,7 +1002,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -1014,8 +1014,8 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/heyongqiang/hive-trunk/.ptest_3/build/ql/test/data/warehouse/src</string> 
-       <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src</string> 
+       <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
         </void> 
@@ -1035,7 +1035,7 @@
          <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
         </void> 
         <void property="tableDesc"> 
-         <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
           <void property="deserializerClass"> 
            <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
           </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml?rev=902921&r1=902920&r2=902921&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml Mon Jan 25 18:48:58 2010
@@ -5,11 +5,11 @@
    <string>Stage-2</string> 
   </void> 
   <void property="work"> 
-   <object class="org.apache.hadoop.hive.ql.plan.mapredWork"> 
+   <object class="org.apache.hadoop.hive.ql.plan.MapredWork"> 
     <void property="aliasToPartnInfo"> 
      <void method="put"> 
       <string>src_thrift</string> 
-      <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+      <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
        <void property="deserializerClass"> 
         <class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class> 
        </void> 
@@ -66,11 +66,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/pyang/merge/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
+          <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1263420753</string> 
+          <string>1264444481</string> 
          </void> 
         </object> 
        </void> 
@@ -78,7 +78,7 @@
         <string>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</string> 
        </void> 
        <void property="tableDesc"> 
-        <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+        <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
          <void property="deserializerClass"> 
           <class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class> 
          </void> 
@@ -113,12 +113,12 @@
               <void method="add"> 
                <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
                 <void property="conf"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
+                 <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc"> 
                   <void property="dirName"> 
-                   <string>file:/data/users/pyang/merge/trunk/VENDOR.hive/trunk/build/ql/tmp/1309957807/10001</string> 
+                   <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1081585311/10001</string> 
                   </void> 
                   <void property="tableInfo"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                     <void property="deserializerClass"> 
                      <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
                     </void> 
@@ -228,11 +228,11 @@
              <object class="java.util.HashMap"> 
               <void method="put"> 
                <string>_col2</string> 
-               <object id="exprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+               <object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                 <void property="childExprs"> 
                  <object class="java.util.ArrayList"> 
                   <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                     <void property="column"> 
                      <string>mstringstring</string> 
                     </void> 
@@ -252,7 +252,7 @@
                    </object> 
                   </void> 
                   <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
                     <void property="typeInfo"> 
                      <object idref="PrimitiveTypeInfo1"/> 
                     </void> 
@@ -273,13 +273,13 @@
               </void> 
               <void method="put"> 
                <string>_col1</string> 
-               <object id="exprNodeFieldDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeFieldDesc"> 
+               <object id="ExprNodeFieldDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeFieldDesc"> 
                 <void property="desc"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                 <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                   <void property="childExprs"> 
                    <object class="java.util.ArrayList"> 
                     <void method="add"> 
-                     <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                     <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                       <void property="column"> 
                        <string>lintstring</string> 
                       </void> 
@@ -323,7 +323,7 @@
                      </object> 
                     </void> 
                     <void method="add"> 
-                     <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                     <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
                       <void property="typeInfo"> 
                        <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
@@ -355,11 +355,11 @@
               </void> 
               <void method="put"> 
                <string>_col0</string> 
-               <object id="exprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+               <object id="ExprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                 <void property="childExprs"> 
                  <object class="java.util.ArrayList"> 
                   <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                     <void property="column"> 
                      <string>lint</string> 
                     </void> 
@@ -376,7 +376,7 @@
                    </object> 
                   </void> 
                   <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
                     <void property="typeInfo"> 
                      <object idref="PrimitiveTypeInfo0"/> 
                     </void> 
@@ -398,17 +398,17 @@
              </object> 
             </void> 
             <void property="conf"> 
-             <object class="org.apache.hadoop.hive.ql.plan.selectDesc"> 
+             <object class="org.apache.hadoop.hive.ql.plan.SelectDesc"> 
               <void property="colList"> 
                <object class="java.util.ArrayList"> 
                 <void method="add"> 
-                 <object idref="exprNodeGenericFuncDesc1"/> 
+                 <object idref="ExprNodeGenericFuncDesc1"/> 
                 </void> 
                 <void method="add"> 
-                 <object idref="exprNodeFieldDesc0"/> 
+                 <object idref="ExprNodeFieldDesc0"/> 
                 </void> 
                 <void method="add"> 
-                 <object idref="exprNodeGenericFuncDesc0"/> 
+                 <object idref="ExprNodeGenericFuncDesc0"/> 
                 </void> 
                </object> 
               </void> 
@@ -505,7 +505,7 @@
          </object> 
         </void> 
         <void property="conf"> 
-         <object class="org.apache.hadoop.hive.ql.plan.tableScanDesc"> 
+         <object class="org.apache.hadoop.hive.ql.plan.TableScanDesc"> 
           <void property="alias"> 
            <string>src_thrift</string> 
           </void> 
@@ -622,7 +622,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/pyang/merge/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
+       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src_thrift</string> 
@@ -634,8 +634,8 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/pyang/merge/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
-       <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
+       <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class> 
         </void> 
@@ -655,7 +655,7 @@
          <string>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</string> 
         </void> 
         <void property="tableDesc"> 
-         <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
           <void property="deserializerClass"> 
            <class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class> 
           </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml?rev=902921&r1=902920&r2=902921&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml Mon Jan 25 18:48:58 2010
@@ -5,11 +5,11 @@
    <string>Stage-2</string> 
   </void> 
   <void property="work"> 
-   <object class="org.apache.hadoop.hive.ql.plan.mapredWork"> 
+   <object class="org.apache.hadoop.hive.ql.plan.MapredWork"> 
     <void property="aliasToPartnInfo"> 
      <void method="put"> 
       <string>src_thrift</string> 
-      <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+      <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
        <void property="deserializerClass"> 
         <class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class> 
        </void> 
@@ -66,11 +66,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/pyang/merge/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
+          <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1263421171</string> 
+          <string>1264444484</string> 
          </void> 
         </object> 
        </void> 
@@ -78,7 +78,7 @@
         <string>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</string> 
        </void> 
        <void property="tableDesc"> 
-        <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+        <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
          <void property="deserializerClass"> 
           <class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class> 
          </void> 
@@ -121,12 +121,12 @@
                       <void method="add"> 
                        <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator"> 
                         <void property="conf"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
+                         <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc"> 
                           <void property="dirName"> 
-                           <string>file:/data/users/pyang/merge/trunk/VENDOR.hive/trunk/build/ql/tmp/1637830196/10001</string> 
+                           <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/scratchdir/1645511985/10001</string> 
                           </void> 
                           <void property="tableInfo"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                             <void property="deserializerClass"> 
                              <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
                             </void> 
@@ -232,11 +232,11 @@
                      <object class="java.util.HashMap"> 
                       <void method="put"> 
                        <string>_col2</string> 
-                       <object id="exprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                       <object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                         <void property="childExprs"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                             <void property="column"> 
                              <string>mstringstring</string> 
                             </void> 
@@ -271,11 +271,11 @@
                       </void> 
                       <void method="put"> 
                        <string>_col1</string> 
-                       <object id="exprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                       <object id="ExprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                         <void property="childExprs"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                             <void property="column"> 
                              <string>lintstring</string> 
                             </void> 
@@ -330,11 +330,11 @@
                       </void> 
                       <void method="put"> 
                        <string>_col0</string> 
-                       <object id="exprNodeGenericFuncDesc2" class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                       <object id="ExprNodeGenericFuncDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                         <void property="childExprs"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                             <void property="column"> 
                              <string>lint</string> 
                             </void> 
@@ -363,17 +363,17 @@
                      </object> 
                     </void> 
                     <void property="conf"> 
-                     <object class="org.apache.hadoop.hive.ql.plan.selectDesc"> 
+                     <object class="org.apache.hadoop.hive.ql.plan.SelectDesc"> 
                       <void property="colList"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <object idref="exprNodeGenericFuncDesc2"/> 
+                         <object idref="ExprNodeGenericFuncDesc2"/> 
                         </void> 
                         <void method="add"> 
-                         <object idref="exprNodeGenericFuncDesc1"/> 
+                         <object idref="ExprNodeGenericFuncDesc1"/> 
                         </void> 
                         <void method="add"> 
-                         <object idref="exprNodeGenericFuncDesc0"/> 
+                         <object idref="ExprNodeGenericFuncDesc0"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -470,17 +470,17 @@
                  </object> 
                 </void> 
                 <void property="conf"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.filterDesc"> 
+                 <object class="org.apache.hadoop.hive.ql.plan.FilterDesc"> 
                   <void property="predicate"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                     <void property="childExprs"> 
                      <object class="java.util.ArrayList"> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                         <void property="childExprs"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                             <void property="column"> 
                              <string>lint</string> 
                             </void> 
@@ -507,15 +507,15 @@
                        </object> 
                       </void> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                         <void property="childExprs"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                             <void property="childExprs"> 
                              <object class="java.util.ArrayList"> 
                               <void method="add"> 
-                               <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                               <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                                 <void property="column"> 
                                  <string>mstringstring</string> 
                                 </void> 
@@ -682,17 +682,17 @@
              </object> 
             </void> 
             <void property="conf"> 
-             <object class="org.apache.hadoop.hive.ql.plan.filterDesc"> 
+             <object class="org.apache.hadoop.hive.ql.plan.FilterDesc"> 
               <void property="predicate"> 
-               <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+               <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                 <void property="childExprs"> 
                  <object class="java.util.ArrayList"> 
                   <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                     <void property="childExprs"> 
                      <object class="java.util.ArrayList"> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                         <void property="column"> 
                          <string>lint</string> 
                         </void> 
@@ -715,15 +715,15 @@
                    </object> 
                   </void> 
                   <void method="add"> 
-                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                     <void property="childExprs"> 
                      <object class="java.util.ArrayList"> 
                       <void method="add"> 
-                       <object class="org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> 
                         <void property="childExprs"> 
                          <object class="java.util.ArrayList"> 
                           <void method="add"> 
-                           <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                           <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                             <void property="column"> 
                              <string>mstringstring</string> 
                             </void> 
@@ -825,7 +825,7 @@
          </object> 
         </void> 
         <void property="conf"> 
-         <object class="org.apache.hadoop.hive.ql.plan.tableScanDesc"> 
+         <object class="org.apache.hadoop.hive.ql.plan.TableScanDesc"> 
           <void property="alias"> 
            <string>src_thrift</string> 
           </void> 
@@ -877,7 +877,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/pyang/merge/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
+       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src_thrift</string> 
@@ -889,8 +889,8 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/pyang/merge/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
-       <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
+       <string>file:/data/users/zshao/hadoop_hive/trunk/build/ql/test/data/warehouse/src_thrift</string> 
+       <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class> 
         </void> 
@@ -910,7 +910,7 @@
          <string>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</string> 
         </void> 
         <void property="tableDesc"> 
-         <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
           <void property="deserializerClass"> 
            <class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class> 
           </void>