hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r1097980 [11/11] - in /hive/trunk: common/src/java/org/apache/hadoop/hive/conf/ conf/ ql/src/java/org/apache/hadoop/hive/ql/io/ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ ql/src/java/org/apache/hadoop/hive/ql/parse/ ql/src/java/org/ap...
Date Fri, 29 Apr 2011 22:51:47 GMT
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml?rev=1097980&r1=1097979&r2=1097980&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml Fri Apr 29 22:51:44 2011
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_23" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-3</string> 
@@ -62,11 +62,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/dest1</string>

+          <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1</string>

          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1300721892</string> 
+          <string>1304060332</string> 
          </void> 
         </object> 
        </void> 
@@ -124,11 +124,11 @@
            </void> 
            <void method="put"> 
             <string>location</string> 
-            <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/dest1</string>

+            <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1</string>

            </void> 
            <void method="put"> 
             <string>transient_lastDdlTime</string> 
-            <string>1300721892</string> 
+            <string>1304060332</string> 
            </void> 
           </object> 
          </void> 
@@ -156,13 +156,13 @@
                 <void property="conf"> 
                  <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc"> 
                   <void property="dirName"> 
-                   <string>file:/tmp/krishnak/hive_2011-03-21_08-38-12_369_4625527435879701983/-ext-10001</string>

+                   <string>file:/tmp/sdong/hive_2011-04-28_23-58-52_993_5880503968024471683/-ext-10001</string>

                   </void> 
                   <void property="numFiles"> 
                    <int>1</int> 
                   </void> 
                   <void property="statsAggPrefix"> 
-                   <string>file:/tmp/krishnak/hive_2011-03-21_08-38-12_369_4625527435879701983/-ext-10001/</string>

+                   <string>file:/tmp/sdong/hive_2011-04-28_23-58-52_993_5880503968024471683/-ext-10001/</string>

                   </void> 
                   <void property="tableInfo"> 
                    <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
@@ -1755,10 +1755,13 @@
       </void> 
      </object> 
     </void> 
+    <void property="nameToSplitSample"> 
+     <object class="java.util.HashMap"/> 
+    </void> 
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/dest1</string>

+       <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1</string>

        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>dest1</string> 
@@ -1770,7 +1773,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/dest1</string>

+       <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1</string>

        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="baseFileName"> 
          <string>dest1</string> 
@@ -1827,11 +1830,11 @@
           </void> 
           <void method="put"> 
            <string>location</string> 
-           <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/dest1</string>

+           <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1</string>

           </void> 
           <void method="put"> 
            <string>transient_lastDdlTime</string> 
-           <string>1300721892</string> 
+           <string>1304060332</string> 
           </void> 
          </object> 
         </void> 
@@ -1889,11 +1892,11 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/dest1</string>

+             <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1</string>

             </void> 
             <void method="put"> 
              <string>transient_lastDdlTime</string> 
-             <string>1300721892</string> 
+             <string>1304060332</string> 
             </void> 
            </object> 
           </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml?rev=1097980&r1=1097979&r2=1097980&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml Fri Apr 29 22:51:44 2011
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_23" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-3</string> 
@@ -62,11 +62,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+          <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1300721894</string> 
+          <string>1304060340</string> 
          </void> 
         </object> 
        </void> 
@@ -124,11 +124,11 @@
            </void> 
            <void method="put"> 
             <string>location</string> 
-            <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+            <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

            </void> 
            <void method="put"> 
             <string>transient_lastDdlTime</string> 
-            <string>1300721894</string> 
+            <string>1304060340</string> 
            </void> 
           </object> 
          </void> 
@@ -156,13 +156,13 @@
                 <void property="conf"> 
                  <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc"> 
                   <void property="dirName"> 
-                   <string>file:/tmp/krishnak/hive_2011-03-21_08-38-14_602_3781855501673956945/-ext-10001</string>

+                   <string>file:/tmp/sdong/hive_2011-04-28_23-59-03_071_7503340157388853266/-ext-10001</string>

                   </void> 
                   <void property="numFiles"> 
                    <int>1</int> 
                   </void> 
                   <void property="statsAggPrefix"> 
-                   <string>file:/tmp/krishnak/hive_2011-03-21_08-38-14_602_3781855501673956945/-ext-10001/</string>

+                   <string>file:/tmp/sdong/hive_2011-04-28_23-59-03_071_7503340157388853266/-ext-10001/</string>

                   </void> 
                   <void property="tableInfo"> 
                    <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
@@ -559,10 +559,13 @@
       </void> 
      </object> 
     </void> 
+    <void property="nameToSplitSample"> 
+     <object class="java.util.HashMap"/> 
+    </void> 
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+       <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -574,7 +577,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+       <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="baseFileName"> 
          <string>src</string> 
@@ -631,11 +634,11 @@
           </void> 
           <void method="put"> 
            <string>location</string> 
-           <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+           <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

           </void> 
           <void method="put"> 
            <string>transient_lastDdlTime</string> 
-           <string>1300721894</string> 
+           <string>1304060340</string> 
           </void> 
          </object> 
         </void> 
@@ -693,11 +696,11 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+             <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

             </void> 
             <void method="put"> 
              <string>transient_lastDdlTime</string> 
-             <string>1300721894</string> 
+             <string>1304060340</string> 
             </void> 
            </object> 
           </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=1097980&r1=1097979&r2=1097980&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml Fri Apr 29 22:51:44 2011
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_23" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-3</string> 
@@ -62,11 +62,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+          <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1300721896</string> 
+          <string>1304060350</string> 
          </void> 
         </object> 
        </void> 
@@ -124,11 +124,11 @@
            </void> 
            <void method="put"> 
             <string>location</string> 
-            <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+            <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

            </void> 
            <void method="put"> 
             <string>transient_lastDdlTime</string> 
-            <string>1300721896</string> 
+            <string>1304060350</string> 
            </void> 
           </object> 
          </void> 
@@ -160,13 +160,13 @@
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc"> 
                       <void property="dirName"> 
-                       <string>file:/tmp/krishnak/hive_2011-03-21_08-38-16_658_4905554545446471145/-ext-10001</string>

+                       <string>file:/tmp/sdong/hive_2011-04-28_23-59-13_016_4418197678415872532/-ext-10001</string>

                       </void> 
                       <void property="numFiles"> 
                        <int>1</int> 
                       </void> 
                       <void property="statsAggPrefix"> 
-                       <string>file:/tmp/krishnak/hive_2011-03-21_08-38-16_658_4905554545446471145/-ext-10001/</string>

+                       <string>file:/tmp/sdong/hive_2011-04-28_23-59-13_016_4418197678415872532/-ext-10001/</string>

                       </void> 
                       <void property="tableInfo"> 
                        <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
@@ -656,10 +656,13 @@
       </void> 
      </object> 
     </void> 
+    <void property="nameToSplitSample"> 
+     <object class="java.util.HashMap"/> 
+    </void> 
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+       <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -671,7 +674,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+       <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="baseFileName"> 
          <string>src</string> 
@@ -728,11 +731,11 @@
           </void> 
           <void method="put"> 
            <string>location</string> 
-           <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+           <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

           </void> 
           <void method="put"> 
            <string>transient_lastDdlTime</string> 
-           <string>1300721896</string> 
+           <string>1304060350</string> 
           </void> 
          </object> 
         </void> 
@@ -790,11 +793,11 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+             <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

             </void> 
             <void method="put"> 
              <string>transient_lastDdlTime</string> 
-             <string>1300721896</string> 
+             <string>1304060350</string> 
             </void> 
            </object> 
           </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=1097980&r1=1097979&r2=1097980&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml Fri Apr 29 22:51:44 2011
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_23" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-3</string> 
@@ -62,11 +62,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+          <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1300721898</string> 
+          <string>1304060360</string> 
          </void> 
         </object> 
        </void> 
@@ -124,11 +124,11 @@
            </void> 
            <void method="put"> 
             <string>location</string> 
-            <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+            <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

            </void> 
            <void method="put"> 
             <string>transient_lastDdlTime</string> 
-            <string>1300721898</string> 
+            <string>1304060360</string> 
            </void> 
           </object> 
          </void> 
@@ -160,13 +160,13 @@
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc"> 
                       <void property="dirName"> 
-                       <string>file:/tmp/krishnak/hive_2011-03-21_08-38-18_729_8085504317489428210/-ext-10001</string>

+                       <string>file:/tmp/sdong/hive_2011-04-28_23-59-23_011_8707825845974734698/-ext-10001</string>

                       </void> 
                       <void property="numFiles"> 
                        <int>1</int> 
                       </void> 
                       <void property="statsAggPrefix"> 
-                       <string>file:/tmp/krishnak/hive_2011-03-21_08-38-18_729_8085504317489428210/-ext-10001/</string>

+                       <string>file:/tmp/sdong/hive_2011-04-28_23-59-23_011_8707825845974734698/-ext-10001/</string>

                       </void> 
                       <void property="tableInfo"> 
                        <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
@@ -736,10 +736,13 @@
       </void> 
      </object> 
     </void> 
+    <void property="nameToSplitSample"> 
+     <object class="java.util.HashMap"/> 
+    </void> 
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+       <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -751,7 +754,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+       <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="baseFileName"> 
          <string>src</string> 
@@ -808,11 +811,11 @@
           </void> 
           <void method="put"> 
            <string>location</string> 
-           <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+           <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

           </void> 
           <void method="put"> 
            <string>transient_lastDdlTime</string> 
-           <string>1300721898</string> 
+           <string>1304060360</string> 
           </void> 
          </object> 
         </void> 
@@ -870,11 +873,11 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+             <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

             </void> 
             <void method="put"> 
              <string>transient_lastDdlTime</string> 
-             <string>1300721898</string> 
+             <string>1304060360</string> 
             </void> 
            </object> 
           </void> 

Modified: hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml?rev=1097980&r1=1097979&r2=1097980&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/union.q.xml Fri Apr 29 22:51:44 2011
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_23" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_07" 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:/home/krishnak/hive-howl/hive-git-apache/build/ql/scratchdir/hive_2011-03-21_08-38-20_785_1638340549922440185/-ext-10001</string>

+                       <string>file:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-59-33_025_642210603550334429/-ext-10001</string>

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

                         <void property="childOperators"> 
                          <object class="java.util.ArrayList"> 
@@ -50,7 +50,7 @@
                             <void property="conf"> 
                              <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">

                               <void property="dirName"> 
-                               <string>file:/home/krishnak/hive-howl/hive-git-apache/build/ql/scratchdir/hive_2011-03-21_08-38-20_785_1638340549922440185/-ext-10000</string>

+                               <string>file:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-59-33_025_642210603550334429/-ext-10000</string>

                               </void> 
                               <void property="numFiles"> 
                                <int>1</int> 
@@ -195,10 +195,10 @@
                     <void property="pathToAliases"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/home/krishnak/hive-howl/hive-git-apache/build/ql/scratchdir/hive_2011-03-21_08-38-20_785_1638340549922440185/-ext-10001</string>

+                       <string>file:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-59-33_025_642210603550334429/-ext-10001</string>

                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
-                         <string>file:/home/krishnak/hive-howl/hive-git-apache/build/ql/scratchdir/hive_2011-03-21_08-38-20_785_1638340549922440185/-ext-10001</string>

+                         <string>file:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-59-33_025_642210603550334429/-ext-10001</string>

                         </void> 
                        </object> 
                       </void> 
@@ -207,7 +207,7 @@
                     <void property="pathToPartitionInfo"> 
                      <object class="java.util.LinkedHashMap"> 
                       <void method="put"> 
-                       <string>file:/home/krishnak/hive-howl/hive-git-apache/build/ql/scratchdir/hive_2011-03-21_08-38-20_785_1638340549922440185/-ext-10001</string>

+                       <string>file:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-59-33_025_642210603550334429/-ext-10001</string>

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

                         <void property="baseFileName"> 
                          <string>-ext-10001</string> 
@@ -280,7 +280,7 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="sourceDir"> 
-                   <string>file:/home/krishnak/hive-howl/hive-git-apache/build/ql/scratchdir/hive_2011-03-21_08-38-20_785_1638340549922440185/-ext-10000</string>

+                   <string>file:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-59-33_025_642210603550334429/-ext-10000</string>

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

@@ -304,10 +304,10 @@
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/home/krishnak/hive-howl/hive-git-apache/build/ql/scratchdir/hive_2011-03-21_08-38-20_785_1638340549922440185/-ext-10001</string>

+               <string>file:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-59-33_025_642210603550334429/-ext-10001</string>

               </void> 
               <void property="targetDir"> 
-               <string>file:/home/krishnak/hive-howl/hive-git-apache/build/ql/scratchdir/hive_2011-03-21_08-38-20_785_1638340549922440185/-ext-10000</string>

+               <string>file:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-59-33_025_642210603550334429/-ext-10000</string>

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

         <void property="dir"> 
-         <string>file:/home/krishnak/hive-howl/hive-git-apache/build/ql/scratchdir/hive_2011-03-21_08-38-20_785_1638340549922440185/-ext-10001</string>

+         <string>file:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-59-33_025_642210603550334429/-ext-10001</string>

         </void> 
         <void property="listTasks"> 
          <object idref="ArrayList0"/> 
@@ -419,11 +419,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+          <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1300721900</string> 
+          <string>1304060370</string> 
          </void> 
         </object> 
        </void> 
@@ -481,11 +481,11 @@
            </void> 
            <void method="put"> 
             <string>location</string> 
-            <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+            <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

            </void> 
            <void method="put"> 
             <string>transient_lastDdlTime</string> 
-            <string>1300721900</string> 
+            <string>1304060370</string> 
            </void> 
           </object> 
          </void> 
@@ -551,11 +551,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+          <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1300721900</string> 
+          <string>1304060370</string> 
          </void> 
         </object> 
        </void> 
@@ -613,11 +613,11 @@
            </void> 
            <void method="put"> 
             <string>location</string> 
-            <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+            <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

            </void> 
            <void method="put"> 
             <string>transient_lastDdlTime</string> 
-            <string>1300721900</string> 
+            <string>1304060370</string> 
            </void> 
           </object> 
          </void> 
@@ -664,13 +664,13 @@
                                    <int>1</int> 
                                   </void> 
                                   <void property="dirName"> 
-                                   <string>file:/home/krishnak/hive-howl/hive-git-apache/build/ql/scratchdir/hive_2011-03-21_08-38-20_785_1638340549922440185/-ext-10001</string>

+                                   <string>file:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-59-33_025_642210603550334429/-ext-10001</string>

                                   </void> 
                                   <void property="numFiles"> 
                                    <int>1</int> 
                                   </void> 
                                   <void property="statsAggPrefix"> 
-                                   <string>file:/home/krishnak/hive-howl/hive-git-apache/build/ql/scratchdir/hive_2011-03-21_08-38-20_785_1638340549922440185/-ext-10000/</string>

+                                   <string>file:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-59-33_025_642210603550334429/-ext-10000/</string>

                                   </void> 
                                   <void property="tableInfo"> 
                                    <object idref="TableDesc0"/> 
@@ -1711,10 +1711,13 @@
       </void> 
      </object> 
     </void> 
+    <void property="nameToSplitSample"> 
+     <object class="java.util.HashMap"/> 
+    </void> 
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+       <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>null-subquery1:unioninput-subquery1:src</string> 
@@ -1729,7 +1732,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+       <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

        <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc"> 
         <void property="baseFileName"> 
          <string>src</string> 
@@ -1786,11 +1789,11 @@
           </void> 
           <void method="put"> 
            <string>location</string> 
-           <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+           <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

           </void> 
           <void method="put"> 
            <string>transient_lastDdlTime</string> 
-           <string>1300721900</string> 
+           <string>1304060370</string> 
           </void> 
          </object> 
         </void> 
@@ -1848,11 +1851,11 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>pfile:/home/krishnak/hive-howl/hive-git-apache/build/ql/test/data/warehouse/src</string>

+             <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>

             </void> 
             <void method="put"> 
              <string>transient_lastDdlTime</string> 
-             <string>1300721900</string> 
+             <string>1304060370</string> 
             </void> 
            </object> 
           </void> 

Modified: hive/trunk/shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java?rev=1097980&r1=1097979&r2=1097980&view=diff
==============================================================================
--- hive/trunk/shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java (original)
+++ hive/trunk/shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java Fri Apr
29 22:51:44 2011
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.security.auth.login.LoginException;
 
 import org.apache.hadoop.conf.Configuration;
@@ -32,7 +33,6 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.PathFilter;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.mapred.FileInputFormat;
 import org.apache.hadoop.mapred.InputFormat;
 import org.apache.hadoop.mapred.InputSplit;
@@ -49,8 +49,8 @@ import org.apache.hadoop.mapred.TaskID;
 import org.apache.hadoop.mapred.lib.CombineFileInputFormat;
 import org.apache.hadoop.mapred.lib.CombineFileSplit;
 import org.apache.hadoop.mapred.lib.NullOutputFormat;
-import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.UnixUserGroupInformation;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.tools.HadoopArchives;
 import org.apache.hadoop.util.ToolRunner;
 
@@ -139,12 +139,48 @@ public class Hadoop20Shims implements Ha
   }
 
   public static class InputSplitShim extends CombineFileSplit implements HadoopShims.InputSplitShim
{
+    long shrinkedLength;
+    boolean _isShrinked;
     public InputSplitShim() {
       super();
+      _isShrinked = false;
     }
 
     public InputSplitShim(CombineFileSplit old) throws IOException {
       super(old);
+      _isShrinked = false;
+    }
+
+    @Override
+    public void shrinkSplit(long length) {
+      _isShrinked = true;
+      shrinkedLength = length;
+    }
+
+    public boolean isShrinked() {
+      return _isShrinked;
+    }
+
+    public long getShrinkedLength() {
+      return shrinkedLength;
+    }
+
+    @Override
+    public void readFields(DataInput in) throws IOException {
+      super.readFields(in);
+      _isShrinked = in.readBoolean();
+      if (_isShrinked) {
+        shrinkedLength = in.readLong();
+      }
+    }
+
+    @Override
+    public void write(DataOutput out) throws IOException {
+      super.write(out);
+      out.writeBoolean(_isShrinked);
+      if (_isShrinked) {
+        out.writeLong(shrinkedLength);
+      }
     }
   }
 
@@ -171,6 +207,8 @@ public class Hadoop20Shims implements Ha
     protected int idx;
     protected long progress;
     protected RecordReader<K, V> curReader;
+    protected boolean isShrinked;
+    protected long shrinkedLength;
 
     public boolean next(K key, V value) throws IOException {
 
@@ -228,6 +266,14 @@ public class Hadoop20Shims implements Ha
       this.curReader = null;
       this.progress = 0;
 
+      isShrinked = false;
+
+      assert (split instanceof InputSplitShim);
+      if (((InputSplitShim) split).isShrinked()) {
+        isShrinked = true;
+        shrinkedLength = ((InputSplitShim) split).getShrinkedLength();
+      }
+
       try {
         rrConstructor = rrClass.getDeclaredConstructor(constructorSignature);
         rrConstructor.setAccessible(true);
@@ -251,8 +297,8 @@ public class Hadoop20Shims implements Ha
         }
       }
 
-      // if all chunks have been processed, nothing more to do.
-      if (idx == split.getNumPaths()) {
+      // if all chunks have been processed or reached the length, nothing more to do.
+      if (idx == split.getNumPaths() || (isShrinked && progress > shrinkedLength))
{
         return false;
       }
 
@@ -424,12 +470,12 @@ public class Hadoop20Shims implements Ha
     }
     return ugi;
   }
-  
+
   @Override
   public boolean isSecureShimImpl() {
     return false;
   }
-  
+
   @Override
   public String getShortUserName(UserGroupInformation ugi) {
     return ugi.getUserName();

Modified: hive/trunk/shims/src/0.20S/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/0.20S/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java?rev=1097980&r1=1097979&r2=1097980&view=diff
==============================================================================
--- hive/trunk/shims/src/0.20S/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java (original)
+++ hive/trunk/shims/src/0.20S/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java Fri Apr
29 22:51:44 2011
@@ -30,6 +30,9 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.PathFilter;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hive.shims.Hadoop20Shims;
+import org.apache.hadoop.hive.shims.HadoopShims;
+import org.apache.hadoop.hive.shims.Hadoop20Shims.InputSplitShim;
 import org.apache.hadoop.hive.thrift.DelegationTokenSelector;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.WritableComparable;
@@ -141,12 +144,48 @@ public class Hadoop20SShims implements H
   }
 
   public static class InputSplitShim extends CombineFileSplit implements HadoopShims.InputSplitShim
{
+    long shrinkedLength;
+    boolean _isShrinked;
     public InputSplitShim() {
       super();
+      _isShrinked = false;
     }
 
     public InputSplitShim(CombineFileSplit old) throws IOException {
       super(old);
+      _isShrinked = false;
+    }
+
+    @Override
+    public void shrinkSplit(long length) {
+      _isShrinked = true;
+      shrinkedLength = length;
+    }
+
+    public boolean isShrinked() {
+      return _isShrinked;
+    }
+
+    public long getShrinkedLength() {
+      return shrinkedLength;
+    }
+
+    @Override
+    public void readFields(DataInput in) throws IOException {
+      super.readFields(in);
+      _isShrinked = in.readBoolean();
+      if (_isShrinked) {
+        shrinkedLength = in.readLong();
+      }
+    }
+
+    @Override
+    public void write(DataOutput out) throws IOException {
+      super.write(out);
+      out.writeBoolean(_isShrinked);
+      if (_isShrinked) {
+        out.writeLong(shrinkedLength);
+      }
     }
   }
 
@@ -173,6 +212,8 @@ public class Hadoop20SShims implements H
     protected int idx;
     protected long progress;
     protected RecordReader<K, V> curReader;
+    protected boolean isShrinked;
+    protected long shrinkedLength;    
 
     public boolean next(K key, V value) throws IOException {
 
@@ -230,6 +271,14 @@ public class Hadoop20SShims implements H
       this.curReader = null;
       this.progress = 0;
 
+      isShrinked = false;
+
+      assert (split instanceof Hadoop20Shims.InputSplitShim);
+      if (((InputSplitShim) split).isShrinked()) {
+        isShrinked = true;
+        shrinkedLength = ((InputSplitShim) split).getShrinkedLength();
+      }      
+      
       try {
         rrConstructor = rrClass.getDeclaredConstructor(constructorSignature);
         rrConstructor.setAccessible(true);
@@ -254,7 +303,7 @@ public class Hadoop20SShims implements H
       }
 
       // if all chunks have been processed, nothing more to do.
-      if (idx == split.getNumPaths()) {
+      if (idx == split.getNumPaths() || (isShrinked && progress > shrinkedLength))
{
         return false;
       }
 

Modified: hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java?rev=1097980&r1=1097979&r2=1097980&view=diff
==============================================================================
--- hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java (original)
+++ hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java Fri Apr
29 22:51:44 2011
@@ -157,7 +157,7 @@ public interface HadoopShims {
    * access control context's user, ignoring the configuration.
    */
   public UserGroupInformation getUGIForConf(Configuration conf) throws LoginException, IOException;
-  
+
   /**
    * Get the short name corresponding to the subject in the passed UGI
    *
@@ -222,6 +222,8 @@ public interface HadoopShims {
     /** Returns all the Paths where this input-split resides. */
     String[] getLocations() throws IOException;
 
+    void shrinkSplit(long length);
+
     String toString();
 
     void readFields(DataInput in) throws IOException;



Mime
View raw message