hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r925359 [4/4] - in /hadoop/hive/trunk: ./ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ ql/src/test/queries/clientpositive/ ql/src/test/results/clientpositive/ ql/src/test/results/compiler/plan/
Date Fri, 19 Mar 2010 18:08:02 GMT
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml?rev=925359&r1=925358&r2=925359&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml Fri Mar 19 18:08:01
2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_17" class="java.beans.XMLDecoder"> 
  <object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="childTasks"> 
    <object class="java.util.ArrayList"> 
@@ -41,7 +41,7 @@
                     <void property="aliasToWork"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002</string>

+                       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002</string>

                        <object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">

                         <void property="childOperators"> 
                          <object class="java.util.ArrayList"> 
@@ -286,10 +286,10 @@
                     <void property="pathToAliases"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002</string>

+                       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002</string>

                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002</string>

+                         <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002</string>

                         </void> 
                        </object> 
                       </void> 
@@ -298,7 +298,7 @@
                     <void property="pathToPartitionInfo"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002</string>

+                       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002</string>

                        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">

                         <void property="baseFileName"> 
                          <string>10002</string> 
@@ -352,11 +352,11 @@
                           </void> 
                           <void method="put"> 
                            <string>location</string> 
-                           <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1</string>

+                           <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1</string>

                           </void> 
                           <void method="put"> 
                            <string>transient_lastDdlTime</string> 
-                           <string>1266455964</string> 
+                           <string>1268858268</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -395,7 +395,7 @@
                           <void property="conf"> 
                            <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">

                             <void property="dirName"> 
-                             <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10000</string>

+                             <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10000</string>

                             </void> 
                             <void property="numFiles"> 
                              <int>1</int> 
@@ -447,7 +447,7 @@
                                 </void> 
                                 <void method="put"> 
                                  <string>location</string> 
-                                 <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1</string>

+                                 <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1</string>

                                 </void> 
                                 <void method="put"> 
                                  <string>file.outputformat</string> 
@@ -455,7 +455,7 @@
                                 </void> 
                                 <void method="put"> 
                                  <string>transient_lastDdlTime</string> 
-                                 <string>1266455964</string> 
+                                 <string>1268858268</string> 
                                 </void> 
                                </object> 
                               </void> 
@@ -596,13 +596,13 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="sourceDir"> 
-                   <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10000</string>

+                   <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10000</string>

                   </void> 
                   <void property="table"> 
                    <object idref="TableDesc2"/> 
                   </void> 
                   <void property="tmpDir"> 
-                   <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10001</string>

+                   <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10001</string>

                   </void> 
                  </object> 
                 </void> 
@@ -623,10 +623,10 @@
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002</string>

+               <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002</string>

               </void> 
               <void property="targetDir"> 
-               <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10000</string>

+               <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10000</string>

               </void> 
              </object> 
             </void> 
@@ -652,7 +652,7 @@
       <void property="resolverCtx"> 
        <object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">

         <void property="dir"> 
-         <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002</string>

+         <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002</string>

         </void> 
         <void property="listTasks"> 
          <object idref="ArrayList0"/> 
@@ -742,11 +742,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcbucket</string>

+          <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcbucket</string>

          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1266455963</string> 
+          <string>1268858267</string> 
          </void> 
         </object> 
        </void> 
@@ -806,7 +806,7 @@
                                <int>1</int> 
                               </void> 
                               <void property="dirName"> 
-                               <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002</string>

+                               <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002</string>

                               </void> 
                               <void property="numFiles"> 
                                <int>1</int> 
@@ -1053,9 +1053,9 @@
                     <void property="schema"> 
                      <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
                       <void property="signature"> 
-                       <object id="ArrayList1" class="java.util.ArrayList"> 
+                       <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

+                         <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

                           <void property="internalName"> 
                            <string>key</string> 
                           </void> 
@@ -1065,7 +1065,7 @@
                          </object> 
                         </void> 
                         <void method="add"> 
-                         <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

+                         <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

                           <void property="internalName"> 
                            <string>value</string> 
                           </void> 
@@ -1484,7 +1484,14 @@
             <void property="schema"> 
              <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
               <void property="signature"> 
-               <object idref="ArrayList1"/> 
+               <object id="ArrayList1" class="java.util.ArrayList"> 
+                <void method="add"> 
+                 <object idref="ColumnInfo0"/> 
+                </void> 
+                <void method="add"> 
+                 <object idref="ColumnInfo1"/> 
+                </void> 
+               </object> 
               </void> 
              </object> 
             </void> 
@@ -1542,7 +1549,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt</string>

+       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt</string>

        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>s</string> 
@@ -1554,7 +1561,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt</string>

+       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt</string>

        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="baseFileName"> 
          <string>srcbucket0.txt</string> 
@@ -1615,11 +1622,11 @@
           </void> 
           <void method="put"> 
            <string>location</string> 
-           <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcbucket</string>

+           <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcbucket</string>

           </void> 
           <void method="put"> 
            <string>transient_lastDdlTime</string> 
-           <string>1266455963</string> 
+           <string>1268858267</string> 
           </void> 
          </object> 
         </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml?rev=925359&r1=925358&r2=925359&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml Fri Mar 19 18:08:01 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_17" class="java.beans.XMLDecoder"> 
  <object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="childTasks"> 
    <object class="java.util.ArrayList"> 
@@ -41,7 +41,7 @@
                     <void property="aliasToWork"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001</string>

+                       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001</string>

                        <object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">

                         <void property="childOperators"> 
                          <object class="java.util.ArrayList"> 
@@ -286,10 +286,10 @@
                     <void property="pathToAliases"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001</string>

+                       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001</string>

                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001</string>

+                         <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001</string>

                         </void> 
                        </object> 
                       </void> 
@@ -298,7 +298,7 @@
                     <void property="pathToPartitionInfo"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001</string>

+                       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001</string>

                        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">

                         <void property="baseFileName"> 
                          <string>10001</string> 
@@ -357,7 +357,7 @@
                           <void property="conf"> 
                            <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">

                             <void property="dirName"> 
-                             <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10000</string>

+                             <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10000</string>

                             </void> 
                             <void property="numFiles"> 
                              <int>1</int> 
@@ -522,7 +522,7 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="sourceDir"> 
-                   <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10000</string>

+                   <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10000</string>

                   </void> 
                   <void property="targetDir"> 
                    <string>../build/ql/test/data/warehouse/union.out</string>

@@ -546,10 +546,10 @@
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001</string>

+               <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001</string>

               </void> 
               <void property="targetDir"> 
-               <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10000</string>

+               <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10000</string>

               </void> 
              </object> 
             </void> 
@@ -575,7 +575,7 @@
       <void property="resolverCtx"> 
        <object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">

         <void property="dir"> 
-         <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001</string>

+         <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001</string>

         </void> 
         <void property="listTasks"> 
          <object idref="ArrayList0"/> 
@@ -661,11 +661,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+          <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1266455967</string> 
+          <string>1268858270</string> 
          </void> 
         </object> 
        </void> 
@@ -725,7 +725,7 @@
                                <int>1</int> 
                               </void> 
                               <void property="dirName"> 
-                               <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001</string>

+                               <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001</string>

                               </void> 
                               <void property="numFiles"> 
                                <int>1</int> 
@@ -1099,9 +1099,9 @@
                 <void property="schema"> 
                  <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
                   <void property="signature"> 
-                   <object id="ArrayList1" class="java.util.ArrayList"> 
+                   <object class="java.util.ArrayList"> 
                     <void method="add"> 
-                     <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                     <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

                       <void property="internalName"> 
                        <string>key</string> 
                       </void> 
@@ -1111,7 +1111,7 @@
                      </object> 
                     </void> 
                     <void method="add"> 
-                     <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                     <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

                       <void property="internalName"> 
                        <string>value</string> 
                       </void> 
@@ -1208,7 +1208,14 @@
             <void property="schema"> 
              <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
               <void property="signature"> 
-               <object idref="ArrayList1"/> 
+               <object id="ArrayList1" class="java.util.ArrayList"> 
+                <void method="add"> 
+                 <object idref="ColumnInfo0"/> 
+                </void> 
+                <void method="add"> 
+                 <object idref="ColumnInfo1"/> 
+                </void> 
+               </object> 
               </void> 
              </object> 
             </void> 
@@ -1266,7 +1273,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>unioninput:src</string> 
@@ -1278,7 +1285,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="baseFileName"> 
          <string>src</string> 
@@ -1335,11 +1342,11 @@
           </void> 
           <void method="put"> 
            <string>location</string> 
-           <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+           <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

           </void> 
           <void method="put"> 
            <string>transient_lastDdlTime</string> 
-           <string>1266455967</string> 
+           <string>1268858270</string> 
           </void> 
          </object> 
         </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml?rev=925359&r1=925358&r2=925359&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml Fri Mar 19 18:08:01 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_17" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-2</string> 
@@ -62,11 +62,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+          <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1266455970</string> 
+          <string>1268858272</string> 
          </void> 
         </object> 
        </void> 
@@ -119,7 +119,7 @@
                         <void property="conf"> 
                          <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">

                           <void property="dirName"> 
-                           <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-30_929_3336844444655306252/10001</string>

+                           <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-53_218_968039224977034805/10001</string>

                           </void> 
                           <void property="numFiles"> 
                            <int>1</int> 
@@ -1628,9 +1628,9 @@
                 <void property="schema"> 
                  <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
                   <void property="signature"> 
-                   <object id="ArrayList0" class="java.util.ArrayList"> 
+                   <object class="java.util.ArrayList"> 
                     <void method="add"> 
-                     <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                     <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

                       <void property="internalName"> 
                        <string>key</string> 
                       </void> 
@@ -1639,16 +1639,6 @@
                       </void> 
                      </object> 
                     </void> 
-                    <void method="add"> 
-                     <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                      <void property="internalName"> 
-                       <string>value</string> 
-                      </void> 
-                      <void property="type"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
-                      </void> 
-                     </object> 
-                    </void> 
                    </object> 
                   </void> 
                  </object> 
@@ -1737,7 +1727,21 @@
             <void property="schema"> 
              <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
               <void property="signature"> 
-               <object idref="ArrayList0"/> 
+               <object id="ArrayList0" class="java.util.ArrayList"> 
+                <void method="add"> 
+                 <object idref="ColumnInfo0"/> 
+                </void> 
+                <void method="add"> 
+                 <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                  <void property="internalName"> 
+                   <string>value</string> 
+                  </void> 
+                  <void property="type"> 
+                   <object idref="PrimitiveTypeInfo1"/> 
+                  </void> 
+                 </object> 
+                </void> 
+               </object> 
               </void> 
              </object> 
             </void> 
@@ -1792,7 +1796,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -1804,7 +1808,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="baseFileName"> 
          <string>src</string> 
@@ -1861,11 +1865,11 @@
           </void> 
           <void method="put"> 
            <string>location</string> 
-           <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+           <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

           </void> 
           <void method="put"> 
            <string>transient_lastDdlTime</string> 
-           <string>1266455970</string> 
+           <string>1268858272</string> 
           </void> 
          </object> 
         </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml?rev=925359&r1=925358&r2=925359&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml Fri Mar 19 18:08:01 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_17" class="java.beans.XMLDecoder"> 
  <object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="childTasks"> 
    <object class="java.util.ArrayList"> 
@@ -41,7 +41,7 @@
                     <void property="aliasToWork"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001</string>

+                       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001</string>

                        <object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">

                         <void property="childOperators"> 
                          <object class="java.util.ArrayList"> 
@@ -286,10 +286,10 @@
                     <void property="pathToAliases"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001</string>

+                       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001</string>

                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001</string>

+                         <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001</string>

                         </void> 
                        </object> 
                       </void> 
@@ -298,7 +298,7 @@
                     <void property="pathToPartitionInfo"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001</string>

+                       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001</string>

                        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">

                         <void property="baseFileName"> 
                          <string>10001</string> 
@@ -357,7 +357,7 @@
                           <void property="conf"> 
                            <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">

                             <void property="dirName"> 
-                             <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10000</string>

+                             <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10000</string>

                             </void> 
                             <void property="numFiles"> 
                              <int>1</int> 
@@ -522,7 +522,7 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="sourceDir"> 
-                   <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10000</string>

+                   <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10000</string>

                   </void> 
                   <void property="targetDir"> 
                    <string>../build/ql/test/data/warehouse/union.out</string>

@@ -546,10 +546,10 @@
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001</string>

+               <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001</string>

               </void> 
               <void property="targetDir"> 
-               <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10000</string>

+               <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10000</string>

               </void> 
              </object> 
             </void> 
@@ -575,7 +575,7 @@
       <void property="resolverCtx"> 
        <object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">

         <void property="dir"> 
-         <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001</string>

+         <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001</string>

         </void> 
         <void property="listTasks"> 
          <object idref="ArrayList0"/> 
@@ -661,11 +661,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+          <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1266455985</string> 
+          <string>1268858283</string> 
          </void> 
         </object> 
        </void> 
@@ -748,11 +748,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+          <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1266455985</string> 
+          <string>1268858283</string> 
          </void> 
         </object> 
        </void> 
@@ -816,7 +816,7 @@
                                    <int>1</int> 
                                   </void> 
                                   <void property="dirName"> 
-                                   <string>file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001</string>

+                                   <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001</string>

                                   </void> 
                                   <void property="numFiles"> 
                                    <int>1</int> 
@@ -1321,7 +1321,7 @@
                                           <void property="signature"> 
                                            <object id="ArrayList1" class="java.util.ArrayList">

                                             <void method="add"> 
-                                             <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

+                                             <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

                                               <void property="internalName"> 
                                                <string>key</string> 
                                               </void> 
@@ -1331,7 +1331,7 @@
                                              </object> 
                                             </void> 
                                             <void method="add"> 
-                                             <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

+                                             <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

                                               <void property="internalName"> 
                                                <string>value</string> 
                                               </void> 
@@ -1362,7 +1362,14 @@
                                 <void property="schema"> 
                                  <object class="org.apache.hadoop.hive.ql.exec.RowSchema">

                                   <void property="signature"> 
-                                   <object idref="ArrayList1"/> 
+                                   <object class="java.util.ArrayList"> 
+                                    <void method="add"> 
+                                     <object idref="ColumnInfo0"/> 
+                                    </void> 
+                                    <void method="add"> 
+                                     <object idref="ColumnInfo1"/> 
+                                    </void> 
+                                   </object> 
                                   </void> 
                                  </object> 
                                 </void> 
@@ -1407,7 +1414,7 @@
                           <void property="signature"> 
                            <object class="java.util.ArrayList"> 
                             <void method="add"> 
-                             <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

+                             <object id="ColumnInfo2" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

                               <void property="internalName"> 
                                <string>_col0</string> 
                               </void> 
@@ -1417,7 +1424,7 @@
                              </object> 
                             </void> 
                             <void method="add"> 
-                             <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

+                             <object id="ColumnInfo3" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

                               <void property="internalName"> 
                                <string>_col1</string> 
                               </void> 
@@ -1521,10 +1528,10 @@
                       <void property="signature"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <object idref="ColumnInfo0"/> 
+                         <object idref="ColumnInfo2"/> 
                         </void> 
                         <void method="add"> 
-                         <object idref="ColumnInfo1"/> 
+                         <object idref="ColumnInfo3"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -1614,9 +1621,9 @@
                 <void property="schema"> 
                  <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
                   <void property="signature"> 
-                   <object id="ArrayList2" class="java.util.ArrayList"> 
+                   <object class="java.util.ArrayList"> 
                     <void method="add"> 
-                     <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                     <object id="ColumnInfo4" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

                       <void property="internalName"> 
                        <string>key</string> 
                       </void> 
@@ -1626,7 +1633,7 @@
                      </object> 
                     </void> 
                     <void method="add"> 
-                     <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                     <object id="ColumnInfo5" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">

                       <void property="internalName"> 
                        <string>value</string> 
                       </void> 
@@ -1723,7 +1730,14 @@
             <void property="schema"> 
              <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
               <void property="signature"> 
-               <object idref="ArrayList2"/> 
+               <object id="ArrayList2" class="java.util.ArrayList"> 
+                <void method="add"> 
+                 <object idref="ColumnInfo4"/> 
+                </void> 
+                <void method="add"> 
+                 <object idref="ColumnInfo5"/> 
+                </void> 
+               </object> 
               </void> 
              </object> 
             </void> 
@@ -1785,7 +1799,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>null-subquery1:unioninput-subquery1:src</string> 
@@ -1800,7 +1814,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+       <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="baseFileName"> 
          <string>src</string> 
@@ -1857,11 +1871,11 @@
           </void> 
           <void method="put"> 
            <string>location</string> 
-           <string>file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src</string>

+           <string>file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src</string>

           </void> 
           <void method="put"> 
            <string>transient_lastDdlTime</string> 
-           <string>1266455985</string> 
+           <string>1268858283</string> 
           </void> 
          </object> 
         </void> 



Mime
View raw message