You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dh...@apache.org on 2008/10/21 20:11:18 UTC

svn commit: r706704 [15/23] - in /hadoop/core/trunk: ./ src/contrib/hive/ src/contrib/hive/bin/ 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/h...

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join8.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join8.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join8.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join8.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/113642626.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/616083721/271603255.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -51,8 +51,8 @@
                  <string>dest1</string> 
                 </void> 
                 <void method="put"> 
-                 <string>bucket_field_name</string> 
-                 <string></string> 
+                 <string>serialization.ddl</string> 
+                 <string>struct dest1 { string key, string value}</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.format</string> 
@@ -63,16 +63,12 @@
                  <string>key,value</string> 
                 </void> 
                 <void method="put"> 
-                 <string>field_to_dimension</string> 
-                 <string></string> 
-                </void> 
-                <void method="put"> 
                  <string>bucket_count</string> 
                  <string>-1</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.lib</string> 
-                 <string>simple_meta</string> 
+                 <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                 </void> 
                 <void method="put"> 
                  <string>file.inputformat</string> 
@@ -84,12 +80,12 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                 <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                 </void> 
                </object> 
               </void> 
               <void property="serdeClassName"> 
-               <string>simple_meta</string> 
+               <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
               </void> 
              </object> 
             </void> 
@@ -173,6 +169,9 @@
                       <void property="numPartitionFields"> 
                        <int>1</int> 
                       </void> 
+                      <void property="numReducers"> 
+                       <int>-1</int> 
+                      </void> 
                       <void property="tag"> 
                        <int>1</int> 
                       </void> 
@@ -552,6 +551,9 @@
                       <void property="numPartitionFields"> 
                        <int>1</int> 
                       </void> 
+                      <void property="numReducers"> 
+                       <int>-1</int> 
+                      </void> 
                       <void property="valueCols"> 
                        <object class="java.util.ArrayList"> 
                         <void method="add"> 
@@ -869,7 +871,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>c:a:src1</string> 
@@ -884,7 +886,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/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"/> 
@@ -907,8 +909,8 @@
              <string>src</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct src { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -919,16 +921,12 @@
              <string>key,value</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>-1</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -940,12 +938,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void> 
@@ -974,7 +972,7 @@
                       <void property="conf"> 
                        <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                         <void property="dirName"> 
-                         <string>/tmp/hive-zshao/113642626.10000.insclause-0</string> 
+                         <string>/tmp/hive-zshao/616083721/271603255.10000.insclause-0</string> 
                         </void> 
                         <void property="tableInfo"> 
                          <object idref="tableDesc0"/> 
@@ -1124,7 +1122,7 @@
                         <string>evaluate</string> 
                         <array class="java.lang.Class" length="1"> 
                          <void index="0"> 
-                          <class>java.lang.String</class> 
+                          <class>java.lang.Object</class> 
                          </void> 
                         </array> 
                        </object> 
@@ -1158,7 +1156,7 @@
                         <string>evaluate</string> 
                         <array class="java.lang.Class" length="1"> 
                          <void index="0"> 
-                          <class>java.lang.String</class> 
+                          <class>java.lang.Object</class> 
                          </void> 
                         </array> 
                        </object> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample1.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample1.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample1.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/299196740.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/130068324/266130293.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -51,8 +51,8 @@
                  <string>dest1</string> 
                 </void> 
                 <void method="put"> 
-                 <string>bucket_field_name</string> 
-                 <string></string> 
+                 <string>serialization.ddl</string> 
+                 <string>struct dest1 { string key, string value}</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.format</string> 
@@ -63,16 +63,12 @@
                  <string>key,value</string> 
                 </void> 
                 <void method="put"> 
-                 <string>field_to_dimension</string> 
-                 <string></string> 
-                </void> 
-                <void method="put"> 
                  <string>bucket_count</string> 
                  <string>-1</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.lib</string> 
-                 <string>simple_meta</string> 
+                 <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                 </void> 
                 <void method="put"> 
                  <string>file.inputformat</string> 
@@ -84,12 +80,12 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                 <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                 </void> 
                </object> 
               </void> 
               <void property="serdeClassName"> 
-               <string>simple_meta</string> 
+               <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
               </void> 
              </object> 
             </void> 
@@ -128,7 +124,7 @@
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                       <void property="dirName"> 
-                       <string>/tmp/hive-zshao/299196740.10000.insclause-0</string> 
+                       <string>/tmp/hive-zshao/130068324/266130293.10000.insclause-0</string> 
                       </void> 
                       <void property="tableInfo"> 
                        <object idref="tableDesc0"/> 
@@ -168,9 +164,6 @@
                           <void property="internalName"> 
                            <string>2</string> 
                           </void> 
-                          <void property="isVirtual"> 
-                           <boolean>true</boolean> 
-                          </void> 
                           <void property="type"> 
                            <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
@@ -181,9 +174,6 @@
                           <void property="internalName"> 
                            <string>3</string> 
                           </void> 
-                          <void property="isVirtual"> 
-                           <boolean>true</boolean> 
-                          </void> 
                           <void property="type"> 
                            <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
@@ -414,9 +404,6 @@
                   <void property="internalName"> 
                    <string>ds</string> 
                   </void> 
-                  <void property="isVirtual"> 
-                   <boolean>true</boolean> 
-                  </void> 
                   <void property="type"> 
                    <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
@@ -427,9 +414,6 @@
                   <void property="internalName"> 
                    <string>hr</string> 
                   </void> 
-                  <void property="isVirtual"> 
-                   <boolean>true</boolean> 
-                  </void> 
                   <void property="type"> 
                    <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
@@ -457,7 +441,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>s</string> 
@@ -469,7 +453,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"> 
@@ -501,8 +485,8 @@
              <string>srcpart</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct srcpart { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -517,16 +501,12 @@
              <string>ds/hr</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>-1</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -538,12 +518,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcpart</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcpart</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample2.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample2.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample2.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/1471624673.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/741118865/96139643.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -51,8 +51,8 @@
                  <string>dest1</string> 
                 </void> 
                 <void method="put"> 
-                 <string>bucket_field_name</string> 
-                 <string></string> 
+                 <string>serialization.ddl</string> 
+                 <string>struct dest1 { string key, string value}</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.format</string> 
@@ -63,16 +63,12 @@
                  <string>key,value</string> 
                 </void> 
                 <void method="put"> 
-                 <string>field_to_dimension</string> 
-                 <string></string> 
-                </void> 
-                <void method="put"> 
                  <string>bucket_count</string> 
                  <string>-1</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.lib</string> 
-                 <string>simple_meta</string> 
+                 <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                 </void> 
                 <void method="put"> 
                  <string>file.inputformat</string> 
@@ -84,12 +80,12 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                 <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                 </void> 
                </object> 
               </void> 
               <void property="serdeClassName"> 
-               <string>simple_meta</string> 
+               <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
               </void> 
              </object> 
             </void> 
@@ -124,7 +120,7 @@
                 <void property="conf"> 
                  <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                   <void property="dirName"> 
-                   <string>/tmp/hive-zshao/1471624673.10000.insclause-0</string> 
+                   <string>/tmp/hive-zshao/741118865/96139643.10000.insclause-0</string> 
                   </void> 
                   <void property="tableInfo"> 
                    <object idref="tableDesc0"/> 
@@ -241,7 +237,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket/kv1.txt</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket/kv1.txt</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>s</string> 
@@ -253,7 +249,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket/kv1.txt</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket/kv1.txt</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -276,8 +272,8 @@
              <string>srcbucket</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct srcbucket { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -288,16 +284,12 @@
              <string>key,value</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>2</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -309,12 +301,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample3.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample3.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample3.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample3.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/426518465.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/1895709606/245717296.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -51,8 +51,8 @@
                  <string>dest1</string> 
                 </void> 
                 <void method="put"> 
-                 <string>bucket_field_name</string> 
-                 <string></string> 
+                 <string>serialization.ddl</string> 
+                 <string>struct dest1 { string key, string value}</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.format</string> 
@@ -63,16 +63,12 @@
                  <string>key,value</string> 
                 </void> 
                 <void method="put"> 
-                 <string>field_to_dimension</string> 
-                 <string></string> 
-                </void> 
-                <void method="put"> 
                  <string>bucket_count</string> 
                  <string>-1</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.lib</string> 
-                 <string>simple_meta</string> 
+                 <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                 </void> 
                 <void method="put"> 
                  <string>file.inputformat</string> 
@@ -84,12 +80,12 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                 <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                 </void> 
                </object> 
               </void> 
               <void property="serdeClassName"> 
-               <string>simple_meta</string> 
+               <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
               </void> 
              </object> 
             </void> 
@@ -128,7 +124,7 @@
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                       <void property="dirName"> 
-                       <string>/tmp/hive-zshao/426518465.10000.insclause-0</string> 
+                       <string>/tmp/hive-zshao/1895709606/245717296.10000.insclause-0</string> 
                       </void> 
                       <void property="tableInfo"> 
                        <object idref="tableDesc0"/> 
@@ -363,7 +359,7 @@
                      <object idref="PrimitiveTypeInfo1"/> 
                     </void> 
                     <void property="value"> 
-                     <int>1</int> 
+                     <int>0</int> 
                     </void> 
                    </object> 
                   </void> 
@@ -419,7 +415,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>s</string> 
@@ -431,7 +427,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -454,8 +450,8 @@
              <string>srcbucket</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct srcbucket { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -466,16 +462,12 @@
              <string>key,value</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>2</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -487,12 +479,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample4.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample4.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample4.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/371950458.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/614066513/551990576.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -51,8 +51,8 @@
                  <string>dest1</string> 
                 </void> 
                 <void method="put"> 
-                 <string>bucket_field_name</string> 
-                 <string></string> 
+                 <string>serialization.ddl</string> 
+                 <string>struct dest1 { string key, string value}</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.format</string> 
@@ -63,16 +63,12 @@
                  <string>key,value</string> 
                 </void> 
                 <void method="put"> 
-                 <string>field_to_dimension</string> 
-                 <string></string> 
-                </void> 
-                <void method="put"> 
                  <string>bucket_count</string> 
                  <string>-1</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.lib</string> 
-                 <string>simple_meta</string> 
+                 <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                 </void> 
                 <void method="put"> 
                  <string>file.inputformat</string> 
@@ -84,12 +80,12 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                 <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                 </void> 
                </object> 
               </void> 
               <void property="serdeClassName"> 
-               <string>simple_meta</string> 
+               <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
               </void> 
              </object> 
             </void> 
@@ -128,7 +124,7 @@
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                       <void property="dirName"> 
-                       <string>/tmp/hive-zshao/371950458.10000.insclause-0</string> 
+                       <string>/tmp/hive-zshao/614066513/551990576.10000.insclause-0</string> 
                       </void> 
                       <void property="tableInfo"> 
                        <object idref="tableDesc0"/> 
@@ -350,7 +346,7 @@
                      <object idref="PrimitiveTypeInfo1"/> 
                     </void> 
                     <void property="value"> 
-                     <int>1</int> 
+                     <int>0</int> 
                     </void> 
                    </object> 
                   </void> 
@@ -406,7 +402,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>s</string> 
@@ -418,7 +414,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -441,8 +437,8 @@
              <string>srcbucket</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct srcbucket { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -453,16 +449,12 @@
              <string>key,value</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>2</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -474,12 +466,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample5.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample5.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample5.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/450613668.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/532954132/21366373.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -51,8 +51,8 @@
                  <string>dest1</string> 
                 </void> 
                 <void method="put"> 
-                 <string>bucket_field_name</string> 
-                 <string></string> 
+                 <string>serialization.ddl</string> 
+                 <string>struct dest1 { string key, string value}</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.format</string> 
@@ -63,16 +63,12 @@
                  <string>key,value</string> 
                 </void> 
                 <void method="put"> 
-                 <string>field_to_dimension</string> 
-                 <string></string> 
-                </void> 
-                <void method="put"> 
                  <string>bucket_count</string> 
                  <string>-1</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.lib</string> 
-                 <string>simple_meta</string> 
+                 <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                 </void> 
                 <void method="put"> 
                  <string>file.inputformat</string> 
@@ -84,12 +80,12 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                 <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                 </void> 
                </object> 
               </void> 
               <void property="serdeClassName"> 
-               <string>simple_meta</string> 
+               <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
               </void> 
              </object> 
             </void> 
@@ -128,7 +124,7 @@
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                       <void property="dirName"> 
-                       <string>/tmp/hive-zshao/450613668.10000.insclause-0</string> 
+                       <string>/tmp/hive-zshao/532954132/21366373.10000.insclause-0</string> 
                       </void> 
                       <void property="tableInfo"> 
                        <object idref="tableDesc0"/> 
@@ -350,7 +346,7 @@
                      <object idref="PrimitiveTypeInfo1"/> 
                     </void> 
                     <void property="value"> 
-                     <int>1</int> 
+                     <int>0</int> 
                     </void> 
                    </object> 
                   </void> 
@@ -406,7 +402,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>s</string> 
@@ -418,7 +414,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -441,8 +437,8 @@
              <string>srcbucket</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct srcbucket { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -453,16 +449,12 @@
              <string>key,value</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>2</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -474,12 +466,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample6.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/5802842.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/554218395/580685485.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -51,8 +51,8 @@
                  <string>dest1</string> 
                 </void> 
                 <void method="put"> 
-                 <string>bucket_field_name</string> 
-                 <string></string> 
+                 <string>serialization.ddl</string> 
+                 <string>struct dest1 { string key, string value}</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.format</string> 
@@ -63,16 +63,12 @@
                  <string>key,value</string> 
                 </void> 
                 <void method="put"> 
-                 <string>field_to_dimension</string> 
-                 <string></string> 
-                </void> 
-                <void method="put"> 
                  <string>bucket_count</string> 
                  <string>-1</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.lib</string> 
-                 <string>simple_meta</string> 
+                 <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                 </void> 
                 <void method="put"> 
                  <string>file.inputformat</string> 
@@ -84,12 +80,12 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                 <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                 </void> 
                </object> 
               </void> 
               <void property="serdeClassName"> 
-               <string>simple_meta</string> 
+               <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
               </void> 
              </object> 
             </void> 
@@ -128,7 +124,7 @@
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                       <void property="dirName"> 
-                       <string>/tmp/hive-zshao/5802842.10000.insclause-0</string> 
+                       <string>/tmp/hive-zshao/554218395/580685485.10000.insclause-0</string> 
                       </void> 
                       <void property="tableInfo"> 
                        <object idref="tableDesc0"/> 
@@ -350,7 +346,7 @@
                      <object idref="PrimitiveTypeInfo1"/> 
                     </void> 
                     <void property="value"> 
-                     <int>1</int> 
+                     <int>0</int> 
                     </void> 
                    </object> 
                   </void> 
@@ -406,7 +402,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>s</string> 
@@ -418,7 +414,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -441,8 +437,8 @@
              <string>srcbucket</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct srcbucket { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -453,16 +449,12 @@
              <string>key,value</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>2</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -474,12 +466,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/sample7.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/33801322.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/393286311/133813526.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -51,8 +51,8 @@
                  <string>dest1</string> 
                 </void> 
                 <void method="put"> 
-                 <string>bucket_field_name</string> 
-                 <string></string> 
+                 <string>serialization.ddl</string> 
+                 <string>struct dest1 { string key, string value}</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.format</string> 
@@ -63,16 +63,12 @@
                  <string>key,value</string> 
                 </void> 
                 <void method="put"> 
-                 <string>field_to_dimension</string> 
-                 <string></string> 
-                </void> 
-                <void method="put"> 
                  <string>bucket_count</string> 
                  <string>-1</string> 
                 </void> 
                 <void method="put"> 
                  <string>serialization.lib</string> 
-                 <string>simple_meta</string> 
+                 <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
                 </void> 
                 <void method="put"> 
                  <string>file.inputformat</string> 
@@ -84,12 +80,12 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                 <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                 </void> 
                </object> 
               </void> 
               <void property="serdeClassName"> 
-               <string>simple_meta</string> 
+               <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
               </void> 
              </object> 
             </void> 
@@ -132,7 +128,7 @@
                         <void property="conf"> 
                          <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                           <void property="dirName"> 
-                           <string>/tmp/hive-zshao/33801322.10000.insclause-0</string> 
+                           <string>/tmp/hive-zshao/393286311/133813526.10000.insclause-0</string> 
                           </void> 
                           <void property="tableInfo"> 
                            <object idref="tableDesc0"/> 
@@ -441,7 +437,7 @@
                      <object idref="PrimitiveTypeInfo1"/> 
                     </void> 
                     <void property="value"> 
-                     <int>1</int> 
+                     <int>0</int> 
                     </void> 
                    </object> 
                   </void> 
@@ -472,7 +468,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>s</string> 
@@ -484,7 +480,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -507,8 +503,8 @@
              <string>srcbucket</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct srcbucket { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -519,16 +515,12 @@
              <string>key,value</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>2</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -540,12 +532,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/srcbucket</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/subq.q.xml Tue Oct 21 11:11:05 2008
@@ -21,11 +21,14 @@
          <object class="java.util.ArrayList"> 
           <void method="add"> 
            <object class="org.apache.hadoop.hive.ql.plan.loadFileDesc"> 
+            <void property="columns"> 
+             <string>key,value</string> 
+            </void> 
             <void property="isDfsDir"> 
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/147290682.10000.insclause-0</string> 
+             <string>/tmp/hive-njain/560916151/1453534343.10000.insclause-0</string> 
             </void> 
             <void property="targetDir"> 
              <string>../../../../build/contrib/hive/ql/test/data/warehouse/union.out</string> 
@@ -72,7 +75,7 @@
                         <void property="conf"> 
                          <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                           <void property="dirName"> 
-                           <string>/tmp/hive-zshao/147290682.10000.insclause-0</string> 
+                           <string>/tmp/hive-njain/560916151/1453534343.10000.insclause-0</string> 
                           </void> 
                           <void property="tableInfo"> 
                            <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -337,7 +340,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/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>unioninput:src</string> 
@@ -349,7 +352,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/zshao/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"/> 
@@ -372,8 +375,8 @@
              <string>src</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct src { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -384,16 +387,12 @@
              <string>key,value</string> 
             </void> 
             <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
-            </void> 
-            <void method="put"> 
              <string>bucket_count</string> 
              <string>-1</string> 
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>simple_meta</string> 
+             <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -405,12 +404,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/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> 
           <void property="serdeClassName"> 
-           <string>simple_meta</string> 
+           <string>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</string> 
           </void> 
          </object> 
         </void>