Return-Path: 
 <core-commits-return-6604-apmail-hadoop-core-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org
Received: (qmail 41857 invoked from network); 21 Oct 2008 18:13:36 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Oct 2008 18:13:36 -0000
Received: (qmail 48765 invoked by uid 500); 21 Oct 2008 18:13:38 -0000
Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org
Received: (qmail 48732 invoked by uid 500); 21 Oct 2008 18:13:38 -0000
Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:core-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:core-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:core-commits@hadoop.apache.org>
List-Id: <core-commits.hadoop.apache.org>
Reply-To: core-dev@hadoop.apache.org
Delivered-To: mailing list core-commits@hadoop.apache.org
Received: (qmail 48723 invoked by uid 99); 21 Oct 2008 18:13:38 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Oct 2008 11:13:38 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Oct 2008 18:12:34 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 03F812388ADD; Tue, 21 Oct 2008 11:11:54 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r706704 [13/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...
Date: Tue, 21 Oct 2008 18:11:18 -0000
To: core-commits@hadoop.apache.org
From: dhruba@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081021181154.03F812388ADD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input6.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input6.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input6.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/111172075.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/301573619/12587577.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/111172075.10000.insclause-0</string> 
+                       <string>/tmp/hive-zshao/301573619/12587577.10000.insclause-0</string> 
                       </void> 
                       <void property="tableInfo"> 
                        <object idref="tableDesc0"/> 
@@ -222,7 +218,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> 
@@ -298,7 +294,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/src1</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src1</string> 
@@ -310,7 +306,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/src1</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -333,8 +329,8 @@
              <string>src1</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct src1 { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -345,16 +341,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> 
@@ -366,12 +358,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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/input7.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input7.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input7.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input7.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/305356690.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/182607732/631207979.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/305356690.10000.insclause-0</string> 
+                   <string>/tmp/hive-zshao/182607732/631207979.10000.insclause-0</string> 
                   </void> 
                   <void property="tableInfo"> 
                    <object idref="tableDesc0"/> 
@@ -141,9 +137,9 @@
                        <string>0</string> 
                       </void> 
                       <void property="type"> 
-                       <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                       <object class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
                         <void property="primitiveClass"> 
-                         <class>java.lang.String</class> 
+                         <class>java.lang.Void</class> 
                         </void> 
                        </object> 
                       </void> 
@@ -155,7 +151,11 @@
                        <string>1</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="PrimitiveTypeInfo0"/> 
+                       <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                        <void property="primitiveClass"> 
+                         <class>java.lang.String</class> 
+                        </void> 
+                       </object> 
                       </void> 
                      </object> 
                     </void> 
@@ -238,7 +238,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/src1</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src1</string> 
@@ -250,7 +250,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/src1</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -273,8 +273,8 @@
              <string>src1</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct src1 { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -285,16 +285,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> 
@@ -306,12 +302,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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/input8.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input8.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input8.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input8.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/339241232.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/243084011/767326882.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/339241232.10000.insclause-0</string> 
+                   <string>/tmp/hive-zshao/243084011/767326882.10000.insclause-0</string> 
                   </void> 
                   <void property="tableInfo"> 
                    <object idref="tableDesc0"/> 
@@ -143,7 +139,7 @@
                       <void property="type"> 
                        <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
                         <void property="primitiveClass"> 
-                         <class>java.lang.String</class> 
+                         <class>java.lang.Integer</class> 
                         </void> 
                        </object> 
                       </void> 
@@ -155,7 +151,11 @@
                        <string>1</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="PrimitiveTypeInfo0"/> 
+                       <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                        <void property="primitiveClass"> 
+                         <class>java.lang.Double</class> 
+                        </void> 
+                       </object> 
                       </void> 
                      </object> 
                     </void> 
@@ -165,7 +165,11 @@
                        <string>2</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="PrimitiveTypeInfo0"/> 
+                       <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                        <void property="primitiveClass"> 
+                         <class>java.lang.Byte</class> 
+                        </void> 
+                       </object> 
                       </void> 
                      </object> 
                     </void> 
@@ -204,11 +208,7 @@
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                       <void property="typeInfo"> 
-                       <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
-                        <void property="primitiveClass"> 
-                         <class>java.lang.Integer</class> 
-                        </void> 
-                       </object> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                       <void property="value"> 
                        <int>4</int> 
@@ -218,14 +218,14 @@
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
                    </object> 
                   </void> 
                   <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo1"/> 
+                   <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -272,32 +272,32 @@
                            <string>key</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                            <void property="primitiveClass"> 
+                             <class>java.lang.String</class> 
+                            </void> 
+                           </object> 
                           </void> 
                          </object> 
                         </void> 
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
-                        <void property="primitiveClass"> 
-                         <class>java.lang.Double</class> 
-                        </void> 
-                       </object> 
+                       <object idref="PrimitiveTypeInfo1"/> 
                       </void> 
                      </object> 
                     </void> 
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo2"/> 
+                       <object idref="PrimitiveTypeInfo1"/> 
                       </void> 
                      </object> 
                     </void> 
                    </object> 
                   </void> 
                   <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo2"/> 
+                   <object idref="PrimitiveTypeInfo1"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -324,25 +324,21 @@
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                       <void property="typeInfo"> 
-                       <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
-                        <void property="primitiveClass"> 
-                         <class>java.lang.Byte</class> 
-                        </void> 
-                       </object> 
+                       <object idref="PrimitiveTypeInfo2"/> 
                       </void> 
                      </object> 
                     </void> 
                     <void method="add"> 
                      <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo3"/> 
+                       <object idref="PrimitiveTypeInfo2"/> 
                       </void> 
                      </object> 
                     </void> 
                    </object> 
                   </void> 
                   <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo3"/> 
+                   <object idref="PrimitiveTypeInfo2"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -371,7 +367,7 @@
                <string>key</string> 
               </void> 
               <void property="type"> 
-               <object idref="PrimitiveTypeInfo0"/> 
+               <object idref="PrimitiveTypeInfo3"/> 
               </void> 
              </object> 
             </void> 
@@ -381,7 +377,7 @@
                <string>value</string> 
               </void> 
               <void property="type"> 
-               <object idref="PrimitiveTypeInfo0"/> 
+               <object idref="PrimitiveTypeInfo3"/> 
               </void> 
              </object> 
             </void> 
@@ -396,7 +392,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/src1</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src1</string> 
@@ -408,7 +404,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/src1</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -431,8 +427,8 @@
              <string>src1</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct src1 { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -443,16 +439,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> 
@@ -464,12 +456,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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/input9.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input9.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input9.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/350289238.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/1031500531/592905830.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/350289238.10000.insclause-0</string> 
+                       <string>/tmp/hive-zshao/1031500531/592905830.10000.insclause-0</string> 
                       </void> 
                       <void property="tableInfo"> 
                        <object idref="tableDesc0"/> 
@@ -145,9 +141,9 @@
                            <string>0</string> 
                           </void> 
                           <void property="type"> 
-                           <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                           <object class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
                             <void property="primitiveClass"> 
-                             <class>java.lang.String</class> 
+                             <class>java.lang.Void</class> 
                             </void> 
                            </object> 
                           </void> 
@@ -159,7 +155,11 @@
                            <string>1</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                            <void property="primitiveClass"> 
+                             <class>java.lang.String</class> 
+                            </void> 
+                           </object> 
                           </void> 
                          </object> 
                         </void> 
@@ -302,7 +302,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/src1</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src1</string> 
@@ -314,7 +314,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/src1</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -337,8 +337,8 @@
              <string>src1</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct src1 { string key, string value}</string> 
             </void> 
             <void method="put"> 
              <string>serialization.format</string> 
@@ -349,16 +349,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> 
@@ -370,12 +366,12 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src1</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/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_part1.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/476762580.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/587528285/609899583.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/476762580.10000.insclause-0</string> 
+                       <string>/tmp/hive-zshao/587528285/609899583.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> 
@@ -492,9 +482,6 @@
                   <void property="internalName"> 
                    <string>ds</string> 
                   </void> 
-                  <void property="isVirtual"> 
-                   <boolean>true</boolean> 
-                  </void> 
                   <void property="type"> 
                    <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
@@ -505,9 +492,6 @@
                   <void property="internalName"> 
                    <string>hr</string> 
                   </void> 
-                  <void property="isVirtual"> 
-                   <boolean>true</boolean> 
-                  </void> 
                   <void property="type"> 
                    <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
@@ -535,7 +519,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=12</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=12</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>srcpart</string> 
@@ -547,7 +531,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=12</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=12</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"> 
@@ -579,8 +563,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> 
@@ -595,16 +579,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> 
@@ -616,12 +596,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/input_testsequencefile.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/238032349.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/1185059341/85219314.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -51,8 +51,8 @@
                  <string>dest4_sequencefile</string> 
                 </void> 
                 <void method="put"> 
-                 <string>bucket_field_name</string> 
-                 <string></string> 
+                 <string>serialization.ddl</string> 
+                 <string>struct dest4_sequencefile { 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/dest4_sequencefile</string> 
+                 <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest4_sequencefile</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/238032349.10000.insclause-0</string> 
+                   <string>/tmp/hive-zshao/1185059341/85219314.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/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>src</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/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"/> 
@@ -276,8 +272,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> 
@@ -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>-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> 
@@ -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/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> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testxpath.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testxpath.q.xml?rev=706704&r1=706703&r2=706704&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testxpath.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/input_testxpath.q.xml Tue Oct 21 11:11:05 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/638994494.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/780638111/964614278.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/638994494.10000.insclause-0</string> 
+                   <string>/tmp/hive-zshao/780638111/964614278.10000.insclause-0</string> 
                   </void> 
                   <void property="tableInfo"> 
                    <object idref="tableDesc0"/> 
@@ -143,7 +139,7 @@
                       <void property="type"> 
                        <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
                         <void property="primitiveClass"> 
-                         <class>java.lang.String</class> 
+                         <class>java.lang.Integer</class> 
                         </void> 
                        </object> 
                       </void> 
@@ -155,7 +151,21 @@
                        <string>1</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="PrimitiveTypeInfo0"/> 
+                       <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                        <void property="primitiveClass"> 
+                         <class>java.lang.String</class> 
+                        </void> 
+                       </object> 
+                      </void> 
+                     </object> 
+                    </void> 
+                    <void method="add"> 
+                     <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+                      <void property="internalName"> 
+                       <string>2</string> 
+                      </void> 
+                      <void property="type"> 
+                       <object idref="PrimitiveTypeInfo1"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -181,11 +191,7 @@
                     <void property="typeInfo"> 
                      <object id="ListTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.ListTypeInfo"> 
                       <void property="listElementTypeInfo"> 
-                       <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
-                        <void property="primitiveClass"> 
-                         <class>java.lang.Integer</class> 
-                        </void> 
-                       </object> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -194,7 +200,7 @@
                   <void property="index"> 
                    <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                     <void property="typeInfo"> 
-                     <object idref="PrimitiveTypeInfo1"/> 
+                     <object idref="PrimitiveTypeInfo0"/> 
                     </void> 
                     <void property="value"> 
                      <int>1</int> 
@@ -202,7 +208,7 @@
                    </object> 
                   </void> 
                   <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo1"/> 
+                   <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -227,7 +233,7 @@
                     <void property="index"> 
                      <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                       <void property="value"> 
                        <int>0</int> 
@@ -242,8 +248,45 @@
                   <void property="fieldName"> 
                    <string>mystring</string> 
                   </void> 
+                  <void property="isList"> 
+                   <boolean>false</boolean> 
+                  </void> 
                   <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
+                   <object idref="PrimitiveTypeInfo1"/> 
+                  </void> 
+                 </object> 
+                </void> 
+                <void method="add"> 
+                 <object class="org.apache.hadoop.hive.ql.plan.exprNodeIndexDesc"> 
+                  <void property="desc"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc"> 
+                    <void property="column"> 
+                     <string>mstringstring</string> 
+                    </void> 
+                    <void property="typeInfo"> 
+                     <object id="MapTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.MapTypeInfo"> 
+                      <void property="mapKeyTypeInfo"> 
+                       <object idref="PrimitiveTypeInfo1"/> 
+                      </void> 
+                      <void property="mapValueTypeInfo"> 
+                       <object idref="PrimitiveTypeInfo1"/> 
+                      </void> 
+                     </object> 
+                    </void> 
+                   </object> 
+                  </void> 
+                  <void property="index"> 
+                   <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
+                    <void property="typeInfo"> 
+                     <object idref="PrimitiveTypeInfo1"/> 
+                    </void> 
+                    <void property="value"> 
+                     <string>key_2</string> 
+                    </void> 
+                   </object> 
+                  </void> 
+                  <void property="typeInfo"> 
+                   <object idref="PrimitiveTypeInfo1"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -272,7 +315,7 @@
                <string>aint</string> 
               </void> 
               <void property="type"> 
-               <object idref="PrimitiveTypeInfo1"/> 
+               <object idref="PrimitiveTypeInfo0"/> 
               </void> 
              </object> 
             </void> 
@@ -282,7 +325,7 @@
                <string>astring</string> 
               </void> 
               <void property="type"> 
-               <object idref="PrimitiveTypeInfo0"/> 
+               <object idref="PrimitiveTypeInfo1"/> 
               </void> 
              </object> 
             </void> 
@@ -304,7 +347,7 @@
               <void property="type"> 
                <object class="org.apache.hadoop.hive.ql.typeinfo.ListTypeInfo"> 
                 <void property="listElementTypeInfo"> 
-                 <object idref="PrimitiveTypeInfo0"/> 
+                 <object idref="PrimitiveTypeInfo1"/> 
                 </void> 
                </object> 
               </void> 
@@ -326,14 +369,7 @@
                <string>mstringstring</string> 
               </void> 
               <void property="type"> 
-               <object class="org.apache.hadoop.hive.ql.typeinfo.MapTypeInfo"> 
-                <void property="mapKeyTypeInfo"> 
-                 <object idref="PrimitiveTypeInfo0"/> 
-                </void> 
-                <void property="mapValueTypeInfo"> 
-                 <object idref="PrimitiveTypeInfo0"/> 
-                </void> 
-               </object> 
+               <object idref="MapTypeInfo0"/> 
               </void> 
              </object> 
             </void> 
@@ -348,7 +384,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_thrift</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src_thrift</string> 
@@ -360,7 +396,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_thrift</string> 
+       <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -383,8 +419,8 @@
              <string>src_thrift</string> 
             </void> 
             <void method="put"> 
-             <string>bucket_field_name</string> 
-             <string></string> 
+             <string>serialization.ddl</string> 
+             <string>struct src_thrift { }</string> 
             </void> 
             <void method="put"> 
              <string>columns</string> 
@@ -396,11 +432,7 @@
             </void> 
             <void method="put"> 
              <string>serialization.class</string> 
-             <string>org.apache.hadoop.hive.ql.thrift.Complex</string> 
-            </void> 
-            <void method="put"> 
-             <string>field_to_dimension</string> 
-             <string></string> 
+             <string>org.apache.hadoop.hive.serde2.thrift.test.Complex</string> 
             </void> 
             <void method="put"> 
              <string>bucket_count</string> 
@@ -408,7 +440,7 @@
             </void> 
             <void method="put"> 
              <string>serialization.lib</string> 
-             <string>thrift</string> 
+             <string>org.apache.hadoop.hive.serde2.ThriftDeserializer</string> 
             </void> 
             <void method="put"> 
              <string>file.inputformat</string> 
@@ -420,12 +452,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_thrift</string> 
+             <string>file:/data/users/zshao/tubbs-svnroot/projects/hadoop/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src_thrift</string> 
             </void> 
            </object> 
           </void> 
           <void property="serdeClassName"> 
-           <string>thrift</string> 
+           <string>org.apache.hadoop.hive.serde2.ThriftDeserializer</string> 
           </void> 
          </object> 
         </void>