hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhr...@apache.org
Subject svn commit: r712905 [24/38] - in /hadoop/core/trunk: ./ src/contrib/hive/ src/contrib/hive/cli/src/java/org/apache/hadoop/hive/cli/ src/contrib/hive/common/src/java/org/apache/hadoop/hive/conf/ src/contrib/hive/conf/ src/contrib/hive/data/files/ src/co...
Date Tue, 11 Nov 2008 01:50:18 GMT
Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join1.q.xml?rev=712905&r1=712904&r2=712905&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join1.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join1.q.xml Mon Nov
10 17:50:06 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/108001173/349936017.10000.insclause-0</string>

+             <string>/tmp/hive-njain/810786628.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc">

@@ -80,7 +80,7 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>

+                 <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string>

                 </void> 
                </object> 
               </void> 
@@ -108,15 +108,15 @@
      <object class="java.util.HashMap"> 
       <void method="put"> 
        <string>src2</string> 
-       <object class="org.apache.hadoop.hive.ql.exec.ForwardOperator"> 
+       <object id="ForwardOperator0" class="org.apache.hadoop.hive.ql.exec.ForwardOperator">

         <void property="childOperators"> 
          <object class="java.util.ArrayList"> 
           <void method="add"> 
-           <object class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator"> 
+           <object id="ReduceSinkOperator0" class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator">

             <void property="conf"> 
              <object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc"> 
               <void property="keyCols"> 
-               <object class="java.util.ArrayList"> 
+               <object id="ArrayList0" class="java.util.ArrayList"> 
                 <void method="add"> 
                  <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">

                   <void property="column"> 
@@ -136,34 +136,38 @@
               <void property="keySerializeInfo"> 
                <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
                 <void property="deserializerClass"> 
-                 <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>

+                 <class>org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe</class>

                 </void> 
                 <void property="inputFileFormatClass"> 
-                 <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                 <class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>

                 </void> 
                 <void property="outputFileFormatClass"> 
-                 <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>

+                 <class>org.apache.hadoop.mapred.SequenceFileOutputFormat</class>

                 </void> 
                 <void property="properties"> 
                  <object class="java.util.Properties"> 
                   <void method="put"> 
-                   <string>columns</string> 
-                   <string>0</string> 
+                   <string>name</string> 
+                   <string>binary_sortable_table</string> 
+                  </void> 
+                  <void method="put"> 
+                   <string>serialization.ddl</string> 
+                   <string>struct binary_sortable_table { string joinkey0}</string>

                   </void> 
                   <void method="put"> 
                    <string>serialization.format</string> 
-                   <string>1</string> 
+                   <string>org.apache.hadoop.hive.serde2.thrift.TBinarySortableProtocol</string>

                   </void> 
                  </object> 
                 </void> 
                </object> 
               </void> 
-              <void property="numPartitionFields"> 
-               <int>1</int> 
-              </void> 
               <void property="numReducers"> 
                <int>-1</int> 
               </void> 
+              <void property="partitionCols"> 
+               <object idref="ArrayList0"/> 
+              </void> 
               <void property="tag"> 
                <int>1</int> 
               </void> 
@@ -192,25 +196,29 @@
                </object> 
               </void> 
               <void property="valueSerializeInfo"> 
-               <object 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.MetadataTypedColumnsetSerDe</class>

+                 <class>org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe</class>

                 </void> 
                 <void property="inputFileFormatClass"> 
-                 <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                 <class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>

                 </void> 
                 <void property="outputFileFormatClass"> 
-                 <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>

+                 <class>org.apache.hadoop.mapred.SequenceFileOutputFormat</class>

                 </void> 
                 <void property="properties"> 
                  <object class="java.util.Properties"> 
                   <void method="put"> 
-                   <string>columns</string> 
-                   <string>0,1</string> 
+                   <string>name</string> 
+                   <string>binary_table</string> 
+                  </void> 
+                  <void method="put"> 
+                   <string>serialization.ddl</string> 
+                   <string>struct binary_table { string reducesinkvalue0, string reducesinkvalue1}</string>

                   </void> 
                   <void method="put"> 
                    <string>serialization.format</string> 
-                   <string>1</string> 
+                   <string>com.facebook.thrift.protocol.TBinaryProtocol</string>

                   </void> 
                  </object> 
                 </void> 
@@ -218,6 +226,13 @@
               </void> 
              </object> 
             </void> 
+            <void property="parentOperators"> 
+             <object class="java.util.ArrayList"> 
+              <void method="add"> 
+               <object idref="ForwardOperator0"/> 
+              </void> 
+             </object> 
+            </void> 
             <void property="schema"> 
              <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
               <void property="signature"> 
@@ -282,59 +297,143 @@
       </void> 
       <void method="put"> 
        <string>src1</string> 
-       <object class="org.apache.hadoop.hive.ql.exec.ForwardOperator"> 
+       <object id="ForwardOperator1" class="org.apache.hadoop.hive.ql.exec.ForwardOperator">

         <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"> 
-              <void property="keyCols"> 
-               <object class="java.util.ArrayList"> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">

-                  <void property="column"> 
-                   <string>key</string> 
+           <object id="SelectOperator0" class="org.apache.hadoop.hive.ql.exec.SelectOperator">

+            <void property="childOperators"> 
+             <object class="java.util.ArrayList"> 
+              <void method="add"> 
+               <object id="ReduceSinkOperator1" class="org.apache.hadoop.hive.ql.exec.ReduceSinkOperator">

+                <void property="conf"> 
+                 <object class="org.apache.hadoop.hive.ql.plan.reduceSinkDesc"> 
+                  <void property="keyCols"> 
+                   <object id="ArrayList1" class="java.util.ArrayList"> 
+                    <void method="add"> 
+                     <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">

+                      <void property="column"> 
+                       <string>0</string> 
+                      </void> 
+                      <void property="typeInfo"> 
+                       <object idref="PrimitiveTypeInfo0"/> 
+                      </void> 
+                     </object> 
+                    </void> 
+                   </object> 
                   </void> 
-                  <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
+                  <void property="keySerializeInfo"> 
+                   <object id="tableDesc2" class="org.apache.hadoop.hive.ql.plan.tableDesc">

+                    <void property="deserializerClass"> 
+                     <class>org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe</class>

+                    </void> 
+                    <void property="inputFileFormatClass"> 
+                     <class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>

+                    </void> 
+                    <void property="outputFileFormatClass"> 
+                     <class>org.apache.hadoop.mapred.SequenceFileOutputFormat</class>

+                    </void> 
+                    <void property="properties"> 
+                     <object class="java.util.Properties"> 
+                      <void method="put"> 
+                       <string>name</string> 
+                       <string>binary_sortable_table</string> 
+                      </void> 
+                      <void method="put"> 
+                       <string>serialization.ddl</string> 
+                       <string>struct binary_sortable_table { string joinkey0}</string>

+                      </void> 
+                      <void method="put"> 
+                       <string>serialization.format</string> 
+                       <string>org.apache.hadoop.hive.serde2.thrift.TBinarySortableProtocol</string>

+                      </void> 
+                     </object> 
+                    </void> 
+                   </object> 
+                  </void> 
+                  <void property="numReducers"> 
+                   <int>-1</int> 
+                  </void> 
+                  <void property="partitionCols"> 
+                   <object idref="ArrayList1"/> 
+                  </void> 
+                  <void property="valueCols"> 
+                   <object class="java.util.ArrayList"> 
+                    <void method="add"> 
+                     <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">

+                      <void property="column"> 
+                       <string>0</string> 
+                      </void> 
+                      <void property="typeInfo"> 
+                       <object idref="PrimitiveTypeInfo0"/> 
+                      </void> 
+                     </object> 
+                    </void> 
+                   </object> 
+                  </void> 
+                  <void property="valueSerializeInfo"> 
+                   <object id="tableDesc3" class="org.apache.hadoop.hive.ql.plan.tableDesc">

+                    <void property="deserializerClass"> 
+                     <class>org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe</class>

+                    </void> 
+                    <void property="inputFileFormatClass"> 
+                     <class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>

+                    </void> 
+                    <void property="outputFileFormatClass"> 
+                     <class>org.apache.hadoop.mapred.SequenceFileOutputFormat</class>

+                    </void> 
+                    <void property="properties"> 
+                     <object class="java.util.Properties"> 
+                      <void method="put"> 
+                       <string>name</string> 
+                       <string>binary_table</string> 
+                      </void> 
+                      <void method="put"> 
+                       <string>serialization.ddl</string> 
+                       <string>struct binary_table { string reducesinkvalue0}</string>

+                      </void> 
+                      <void method="put"> 
+                       <string>serialization.format</string> 
+                       <string>com.facebook.thrift.protocol.TBinaryProtocol</string>

+                      </void> 
+                     </object> 
+                    </void> 
+                   </object> 
                   </void> 
                  </object> 
                 </void> 
-               </object> 
-              </void> 
-              <void property="keySerializeInfo"> 
-               <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
-                <void property="deserializerClass"> 
-                 <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>

-                </void> 
-                <void property="inputFileFormatClass"> 
-                 <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                </void> 
-                <void property="outputFileFormatClass"> 
-                 <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>

-                </void> 
-                <void property="properties"> 
-                 <object class="java.util.Properties"> 
-                  <void method="put"> 
-                   <string>columns</string> 
-                   <string>0</string> 
+                <void property="parentOperators"> 
+                 <object class="java.util.ArrayList"> 
+                  <void method="add"> 
+                   <object idref="SelectOperator0"/> 
                   </void> 
-                  <void method="put"> 
-                   <string>serialization.format</string> 
-                   <string>1</string> 
+                 </object> 
+                </void> 
+                <void property="schema"> 
+                 <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
+                  <void property="signature"> 
+                   <object class="java.util.Vector"> 
+                    <void method="add"> 
+                     <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                      <void property="internalName"> 
+                       <string>VALUE.0</string> 
+                      </void> 
+                      <void property="type"> 
+                       <object idref="PrimitiveTypeInfo0"/> 
+                      </void> 
+                     </object> 
+                    </void> 
+                   </object> 
                   </void> 
                  </object> 
                 </void> 
                </object> 
               </void> 
-              <void property="numPartitionFields"> 
-               <int>1</int> 
-              </void> 
-              <void property="numReducers"> 
-               <int>-1</int> 
-              </void> 
-              <void property="valueCols"> 
+             </object> 
+            </void> 
+            <void property="conf"> 
+             <object class="org.apache.hadoop.hive.ql.plan.selectDesc"> 
+              <void property="colList"> 
                <object class="java.util.ArrayList"> 
                 <void method="add"> 
                  <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">

@@ -346,42 +445,14 @@
                   </void> 
                  </object> 
                 </void> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc">

-                  <void property="column"> 
-                   <string>value</string> 
-                  </void> 
-                  <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
                </object> 
               </void> 
-              <void property="valueSerializeInfo"> 
-               <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
-                <void property="deserializerClass"> 
-                 <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class>

-                </void> 
-                <void property="inputFileFormatClass"> 
-                 <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                </void> 
-                <void property="outputFileFormatClass"> 
-                 <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class>

-                </void> 
-                <void property="properties"> 
-                 <object class="java.util.Properties"> 
-                  <void method="put"> 
-                   <string>columns</string> 
-                   <string>0,1</string> 
-                  </void> 
-                  <void method="put"> 
-                   <string>serialization.format</string> 
-                   <string>1</string> 
-                  </void> 
-                 </object> 
-                </void> 
-               </object> 
+             </object> 
+            </void> 
+            <void property="parentOperators"> 
+             <object class="java.util.ArrayList"> 
+              <void method="add"> 
+               <object idref="ForwardOperator1"/> 
               </void> 
              </object> 
             </void> 
@@ -392,17 +463,7 @@
                 <void method="add"> 
                  <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
                   <void property="internalName"> 
-                   <string>VALUE.0</string> 
-                  </void> 
-                  <void property="type"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
-                </void> 
-                <void method="add"> 
-                 <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                  <void property="internalName"> 
-                   <string>VALUE.1</string> 
+                   <string>0</string> 
                   </void> 
                   <void property="type"> 
                    <object idref="PrimitiveTypeInfo0"/> 
@@ -449,13 +510,16 @@
       </void> 
      </object> 
     </void> 
+    <void property="keyDesc"> 
+     <object idref="tableDesc2"/> 
+    </void> 
     <void property="needsTagging"> 
      <boolean>true</boolean> 
     </void> 
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>

+       <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>

        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src2</string> 
@@ -470,7 +534,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>

+       <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>

        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -522,7 +586,7 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>

+             <string>file:/home/njain/workspace/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string>

             </void> 
            </object> 
           </void> 
@@ -536,11 +600,11 @@
      </object> 
     </void> 
     <void property="reducer"> 
-     <object class="org.apache.hadoop.hive.ql.exec.JoinOperator"> 
+     <object id="JoinOperator0" class="org.apache.hadoop.hive.ql.exec.JoinOperator">

       <void property="childOperators"> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
-         <object class="org.apache.hadoop.hive.ql.exec.SelectOperator"> 
+         <object id="SelectOperator1" class="org.apache.hadoop.hive.ql.exec.SelectOperator">

           <void property="childOperators"> 
            <object class="java.util.ArrayList"> 
             <void method="add"> 
@@ -548,13 +612,20 @@
               <void property="conf"> 
                <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                 <void property="dirName"> 
-                 <string>/tmp/hive-zshao/108001173/349936017.10000.insclause-0</string>

+                 <string>/tmp/hive-njain/810786628.10000.insclause-0</string>

                 </void> 
                 <void property="tableInfo"> 
                  <object idref="tableDesc0"/> 
                 </void> 
                </object> 
               </void> 
+              <void property="parentOperators"> 
+               <object class="java.util.ArrayList"> 
+                <void method="add"> 
+                 <object idref="SelectOperator1"/> 
+                </void> 
+               </object> 
+              </void> 
               <void property="schema"> 
                <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
                 <void property="signature"> 
@@ -604,7 +675,7 @@
               <void method="add"> 
                <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
                 <void property="column"> 
-                 <string>3</string> 
+                 <string>2</string> 
                 </void> 
                 <void property="typeInfo"> 
                  <object idref="PrimitiveTypeInfo0"/> 
@@ -615,6 +686,13 @@
             </void> 
            </object> 
           </void> 
+          <void property="parentOperators"> 
+           <object class="java.util.ArrayList"> 
+            <void method="add"> 
+             <object idref="JoinOperator0"/> 
+            </void> 
+           </object> 
+          </void> 
           <void property="schema"> 
            <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
             <void property="signature"> 
@@ -654,16 +732,6 @@
               </void> 
              </object> 
             </void> 
-            <void method="add"> 
-             <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
-              <void property="column"> 
-               <string>VALUE.1</string> 
-              </void> 
-              <void property="typeInfo"> 
-               <object idref="PrimitiveTypeInfo0"/> 
-              </void> 
-             </object> 
-            </void> 
            </object> 
           </void> 
           <void method="put"> 
@@ -695,6 +763,16 @@
         </void> 
        </object> 
       </void> 
+      <void property="parentOperators"> 
+       <object class="java.util.ArrayList"> 
+        <void method="add"> 
+         <object idref="ReduceSinkOperator1"/> 
+        </void> 
+        <void method="add"> 
+         <object idref="ReduceSinkOperator0"/> 
+        </void> 
+       </object> 
+      </void> 
       <void property="schema"> 
        <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> 
         <void property="signature"> 
@@ -729,22 +807,22 @@
             </void> 
            </object> 
           </void> 
-          <void method="add"> 
-           <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-            <void property="internalName"> 
-             <string>3</string> 
-            </void> 
-            <void property="type"> 
-             <object idref="PrimitiveTypeInfo0"/> 
-            </void> 
-           </object> 
-          </void> 
          </object> 
         </void> 
        </object> 
       </void> 
      </object> 
     </void> 
+    <void property="tagToValueDesc"> 
+     <object class="java.util.ArrayList"> 
+      <void method="add"> 
+       <object idref="tableDesc3"/> 
+      </void> 
+      <void method="add"> 
+       <object idref="tableDesc1"/> 
+      </void> 
+     </object> 
+    </void> 
    </object> 
   </void> 
  </object> 



Mime
View raw message