Return-Path: 
 <core-commits-return-6623-apmail-hadoop-core-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org
Received: (qmail 62381 invoked from network); 21 Oct 2008 18:33:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Oct 2008 18:33:34 -0000
Received: (qmail 72922 invoked by uid 500); 21 Oct 2008 18:33:36 -0000
Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org
Received: (qmail 72884 invoked by uid 500); 21 Oct 2008 18:33:36 -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 72874 invoked by uid 99); 21 Oct 2008 18:33:36 -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:33:36 -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:32:33 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 818DD2388ADD; Tue, 21 Oct 2008 11:31:41 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r706708 [13/13] - in /hadoop/core/branches/branch-0.19:
 ./
 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...
Date: Tue, 21 Oct 2008 18:30:34 -0000
To: core-commits@hadoop.apache.org
From: dhruba@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081021183141.818DD2388ADD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/ql/src/test/results/compiler/plan/udf1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/ql/src/test/results/compiler/plan/udf1.q.xml?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/ql/src/test/results/compiler/plan/udf1.q.xml (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/ql/src/test/results/compiler/plan/udf1.q.xml Tue Oct 21 11:29:18 2008
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-zshao/151420038.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/247949494/314100641.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/151420038.10000.insclause-0</string> 
+                       <string>/tmp/hive-zshao/247949494/314100641.10000.insclause-0</string> 
                       </void> 
                       <void property="tableInfo"> 
                        <object idref="tableDesc0"/> 
@@ -147,7 +143,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.Boolean</class> 
                             </void> 
                            </object> 
                           </void> 
@@ -279,7 +275,11 @@
                            <string>13</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> 
@@ -289,7 +289,7 @@
                            <string>14</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -299,7 +299,7 @@
                            <string>15</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -309,7 +309,7 @@
                            <string>16</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -348,7 +348,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>a</string> 
@@ -358,7 +358,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>%a%</string> 
@@ -368,11 +368,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
-                        <void property="primitiveClass"> 
-                         <class>java.lang.Boolean</class> 
-                        </void> 
-                       </object> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -399,7 +395,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>b</string> 
@@ -409,7 +405,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>%a%</string> 
@@ -419,7 +415,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -446,7 +442,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>ab</string> 
@@ -456,7 +452,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>%a%</string> 
@@ -466,7 +462,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -493,7 +489,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>ab</string> 
@@ -503,7 +499,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>%a_</string> 
@@ -513,7 +509,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -540,7 +536,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>%_</string> 
@@ -550,7 +546,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>\%\_</string> 
@@ -560,7 +556,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -587,7 +583,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>ab</string> 
@@ -597,7 +593,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>\%\_</string> 
@@ -607,7 +603,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -634,7 +630,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>ab</string> 
@@ -644,7 +640,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>_a%</string> 
@@ -654,7 +650,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -681,7 +677,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>ab</string> 
@@ -691,7 +687,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>a</string> 
@@ -701,7 +697,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -728,7 +724,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string></string> 
@@ -738,7 +734,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>.*</string> 
@@ -748,7 +744,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -775,7 +771,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>a</string> 
@@ -785,7 +781,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>[ab]</string> 
@@ -795,7 +791,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -822,7 +818,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string></string> 
@@ -832,7 +828,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>[ab]</string> 
@@ -842,7 +838,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -869,7 +865,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>hadoop</string> 
@@ -879,7 +875,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>[a-z]*</string> 
@@ -889,7 +885,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -916,7 +912,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>hadoop</string> 
@@ -926,7 +922,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>o*</string> 
@@ -936,7 +932,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -966,7 +962,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>abc</string> 
@@ -976,7 +972,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>b</string> 
@@ -986,7 +982,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>c</string> 
@@ -996,7 +992,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo0"/> 
+                       <object idref="PrimitiveTypeInfo1"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -1026,7 +1022,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>abc</string> 
@@ -1036,7 +1032,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>z</string> 
@@ -1046,7 +1042,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>a</string> 
@@ -1056,7 +1052,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo0"/> 
+                       <object idref="PrimitiveTypeInfo1"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -1086,7 +1082,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>abbbb</string> 
@@ -1096,7 +1092,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>bb</string> 
@@ -1106,7 +1102,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>b</string> 
@@ -1116,7 +1112,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo0"/> 
+                       <object idref="PrimitiveTypeInfo1"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -1146,7 +1142,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>hadoop</string> 
@@ -1156,7 +1152,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>(.)[a-z]*</string> 
@@ -1166,7 +1162,7 @@
                         <void method="add"> 
                          <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                           <void property="typeInfo"> 
-                           <object idref="PrimitiveTypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo1"/> 
                           </void> 
                           <void property="value"> 
                            <string>$1ive</string> 
@@ -1176,7 +1172,7 @@
                        </object> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="PrimitiveTypeInfo0"/> 
+                       <object idref="PrimitiveTypeInfo1"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -1223,7 +1219,7 @@
                      <string>key</string> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="PrimitiveTypeInfo0"/> 
+                     <object idref="PrimitiveTypeInfo1"/> 
                     </void> 
                    </object> 
                   </void> 
@@ -1244,7 +1240,7 @@
                  </object> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="PrimitiveTypeInfo1"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1260,7 +1256,7 @@
                    <string>key</string> 
                   </void> 
                   <void property="type"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
+                   <object idref="PrimitiveTypeInfo1"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -1270,7 +1266,7 @@
                    <string>value</string> 
                   </void> 
                   <void property="type"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
+                   <object idref="PrimitiveTypeInfo1"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -1296,7 +1292,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> 
@@ -1308,7 +1304,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"/> 
@@ -1331,8 +1327,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> 
@@ -1343,16 +1339,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> 
@@ -1364,12 +1356,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/branches/branch-0.19/src/contrib/hive/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/ql/src/test/results/compiler/plan/union.q.xml?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/ql/src/test/results/compiler/plan/union.q.xml Tue Oct 21 11:29:18 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/831940234.10000.insclause-0</string> 
+             <string>/tmp/hive-njain/635791418/469963157.10000.insclause-0</string> 
             </void> 
             <void property="targetDir"> 
              <string>../../../../build/contrib/hive/ql/test/data/warehouse/union.out</string> 
@@ -76,7 +79,7 @@
                             <void property="conf"> 
                              <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                               <void property="dirName"> 
-                               <string>/tmp/hive-zshao/831940234.10000.insclause-0</string> 
+                               <string>/tmp/hive-njain/635791418/469963157.10000.insclause-0</string> 
                               </void> 
                               <void property="tableInfo"> 
                                <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -525,7 +528,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>null-subquery1:unioninput-subquery1:src</string> 
@@ -540,7 +543,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"/> 
@@ -563,8 +566,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> 
@@ -575,16 +578,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> 
@@ -596,12 +595,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> 

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/ql/src/test/templates/TestParseNegative.vm
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/ql/src/test/templates/TestParseNegative.vm?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/ql/src/test/templates/TestParseNegative.vm (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/ql/src/test/templates/TestParseNegative.vm Tue Oct 21 11:29:18 2008
@@ -63,10 +63,16 @@
       fail("Unexpected success for query: " + "$fname");
     }
     catch (ParseException pe) {
-      qt.checkNegativeResults("$fname", pe);
+      int ecode = qt.checkNegativeResults("$fname", pe);
+      if (ecode != 0) {
+        fail("failed with error code = " + ecode);
+      }
     }
     catch (SemanticException se) {
-      qt.checkNegativeResults("$fname", se);
+      int ecode = qt.checkNegativeResults("$fname", se);
+      if (ecode != 0) {
+        fail("failed with error code = " + ecode);
+      }
     }
     catch (Throwable e) {
       System.out.println("Exception: " + e.getMessage());

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/build.xml?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/build.xml (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/build.xml Tue Oct 21 11:29:18 2008
@@ -26,8 +26,17 @@
     
   <property name="src.dir"  location="${basedir}/src"/> 
   <import file="../build-common.xml"/>
-  
-  <target name="compile" depends="init">
+
+  <target name="dynamic-serde" depends="init" if="javacc.home">
+    <mkdir dir="${src.dir}/gen-java/org/apache/hadoop/hive/serde2/dynamic_type"/>
+    <javacc
+      target="${src.dir}/gen-java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammar.jj"
+      outputdirectory="${src.dir}/gen-java/org/apache/hadoop/hive/serde2/dynamic_type"
+      javacchome="${javacc.home}"
+    />
+  </target>
+
+  <target name="compile" depends="init, dynamic-serde">
     <echo message="Compiling: ${name}"/>
     <javac
      encoding="${build.encoding}"
@@ -46,6 +55,10 @@
     <exec executable="thrift"  failonerror="true" dir=".">
       <arg line="--gen py -php --gen java -o ${src.dir} if/serde.thrift " />
     </exec>
+    <echo>Executing thrift (which needs to be in your path) to build thrift test classes... </echo>
+    <exec executable="thrift"  failonerror="true" dir=".">
+      <arg line="--gen java -o ${src.dir} if/test/complex.thrift " />
+    </exec>
   </target>
 
 </project>

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/if/serde.thrift
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/if/serde.thrift?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/if/serde.thrift (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/if/serde.thrift Tue Oct 21 11:29:18 2008
@@ -8,6 +8,7 @@
 const string SERIALIZATION_CLASS = "serialization.class"
 const string SERIALIZATION_FORMAT = "serialization.format"
 const string SERIALIZATION_DDL = "serialization.ddl"
+const string SERIALIZATION_NULL_FORMAT = "serialization.null.format"
 
 const string FIELD_DELIM = "field.delim"
 const string COLLECTION_DELIM = "colelction.delim"

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java Tue Oct 21 11:29:18 2008
@@ -23,6 +23,8 @@
 
   public static final String SERIALIZATION_DDL = "serialization.ddl";
 
+  public static final String SERIALIZATION_NULL_FORMAT = "serialization.null.format";
+
   public static final String FIELD_DELIM = "field.delim";
 
   public static final String COLLECTION_DELIM = "colelction.delim";

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/ByteStreamTypedSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/ByteStreamTypedSerDe.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/ByteStreamTypedSerDe.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/ByteStreamTypedSerDe.java Tue Oct 21 11:29:18 2008
@@ -48,6 +48,7 @@
     bos = new ByteStream.Output();
     bis = new ByteStream.Input();
     cachedBw = new BytesWritable();
+    json_serializer = new TSerializer();
   }
 
   public Object deserialize(Writable field) throws SerDeException {

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/ReflectionSerDeField.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/ReflectionSerDeField.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/ReflectionSerDeField.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/ReflectionSerDeField.java Tue Oct 21 11:29:18 2008
@@ -19,6 +19,7 @@
 package org.apache.hadoop.hive.serde;
 
 import java.lang.reflect.*;
+import java.util.HashMap;
 
 /**
  * The default implementation of Hive Field based on Java Reflection.
@@ -35,6 +36,7 @@
   protected Class _valueClass;
   protected Class _keyClass;
 
+  private static HashMap<String, Field[]> cacheFields = new HashMap<String, Field[]>();
 
   public static boolean isClassPrimitive(Class c) {
     return ((c == String.class) || (c == Boolean.class) ||
@@ -46,7 +48,27 @@
   public ReflectionSerDeField(String className, String fieldName) throws SerDeException {
     try {
       _parentClass = Class.forName(className);
-      _field = _parentClass.getDeclaredField(fieldName);
+      
+      // hack for now. Get all the fields and do a case-insensitive search over them
+      //      _field = _parentClass.getDeclaredField(fieldName);
+      Field[] allFields = cacheFields.get(className);
+      if (allFields == null) {
+        allFields = _parentClass.getDeclaredFields();
+        cacheFields.put(className, allFields);
+      }
+
+      boolean found = false;
+      for (Field f: allFields) {
+        if (f.getName().equalsIgnoreCase(fieldName)) {
+          _field = f;
+          found = true;
+          break;
+        }
+      }
+
+      if (!found) 
+        throw new SerDeException("Illegal class or member:"+className+"."+fieldName);
+
       _isList = java.util.List.class.isAssignableFrom(_field.getType());
       _isMap = java.util.Map.class.isAssignableFrom(_field.getType());
       _class = _field.getType();
@@ -123,7 +145,7 @@
   }
 
   public String getName() {
-    return _field.getName();
+    return _field.getName().toLowerCase();
   }
 
 

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/SerDe.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/SerDe.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/SerDe.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/SerDe.java Tue Oct 21 11:29:18 2008
@@ -91,6 +91,4 @@
   public SerDeField getFieldFromExpression(SerDeField parentField, String fieldExpression)
     throws SerDeException;
 
-  public String getShortName() ;
-
 }

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/dynamic_type/DynamicSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/dynamic_type/DynamicSerDe.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/dynamic_type/DynamicSerDe.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/dynamic_type/DynamicSerDe.java Tue Oct 21 11:29:18 2008
@@ -42,25 +42,6 @@
   transient private TProtocol oprot_;
   transient private TProtocol iprot_;
 
-  public  String getShortName() {
-    return shortName();
-  }
-
-  public static String shortName() {
-    return "dynamic_thrift";
-  }
-
-  static {
-    StackTraceElement[] sTrace = new Exception().getStackTrace();
-    String className = sTrace[0].getClassName();
-    try {
-      SerDeUtils.registerSerDe(shortName(), Class.forName(className));
-    } catch(Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-
   public static final String META_TABLE_NAME = "name";
 
     static public void main(String args[]) {

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/jute/JuteSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/jute/JuteSerDe.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/jute/JuteSerDe.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/jute/JuteSerDe.java Tue Oct 21 11:29:18 2008
@@ -34,24 +34,6 @@
 
 public class JuteSerDe implements SerDe {
 
-  public static String shortName() {
-    return "jute";
-  }
-
-  public  String getShortName() {
-    return shortName();
-  }
-
-  static {
-    StackTraceElement[] sTrace = new Exception().getStackTrace();
-    String className = sTrace[0].getClassName();
-    try {
-      SerDeUtils.registerSerDe(shortName(), Class.forName(className));
-    } catch(Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   protected Class<?> type;
   private static final Log LOG = LogFactory.getLog("hive.metastore");
   public void initialize(Configuration job, Properties tbl) throws SerDeException {

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/simple_meta/MetadataTypedColumnsetSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/simple_meta/MetadataTypedColumnsetSerDe.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/simple_meta/MetadataTypedColumnsetSerDe.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/simple_meta/MetadataTypedColumnsetSerDe.java Tue Oct 21 11:29:18 2008
@@ -37,25 +37,6 @@
   protected TIOStreamTransport outTransport, inTransport;
   protected TProtocol outProtocol, inProtocol;
 
-  public String getShortName() {
-    return shortName();
-  }
-
-
-  public static String shortName() {
-    return "simple_meta";
-  }
-
-  static {
-    StackTraceElement[] sTrace = new Exception().getStackTrace();
-    String className = sTrace[0].getClassName();
-    try {
-      SerDeUtils.registerSerDe(shortName(), Class.forName(className));
-    } catch(Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   final public static String DefaultSeparator = "\001";
 
   protected boolean inStreaming;
@@ -92,7 +73,7 @@
     inTransport = new TIOStreamTransport(bis);
     outProtocol = outFactory.getProtocol(outTransport);
     inProtocol = inFactory.getProtocol(inTransport);
-    json_serializer = new TSerializer(new TJSONProtocol.Factory());
+    json_serializer = new TSerializer(new TSimpleJSONProtocol.Factory());
   }
 
   public void initialize(Configuration job, Properties tbl) throws SerDeException {

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftByteStreamTypedSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftByteStreamTypedSerDe.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftByteStreamTypedSerDe.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftByteStreamTypedSerDe.java Tue Oct 21 11:29:18 2008
@@ -45,31 +45,13 @@
     inTransport = new TIOStreamTransport(bis);
     outProtocol = outFactory.getProtocol(outTransport);
     inProtocol = inFactory.getProtocol(inTransport);
-    json_serializer = new TSerializer(new TJSONProtocol.Factory());
+    json_serializer = new TSerializer(new TSimpleJSONProtocol.Factory());
   }
 
   public void initialize(Configuration job, Properties tbl) throws SerDeException {
     throw new SerDeException("ThriftByteStreamTypedSerDe is still semi-abstract");
   }
 
-  public static String shortName() {
-    return "thriftbytestream";
-  }
-
-  public  String getShortName() {
-    return shortName();
-  }
-
-  static {
-    StackTraceElement[] sTrace = new Exception().getStackTrace();
-    String className = sTrace[0].getClassName();
-    try {
-      SerDeUtils.registerSerDe(shortName(), Class.forName(className));
-    } catch(Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   public ThriftByteStreamTypedSerDe(Class<?> argType, TProtocolFactory inFactory,
                                     TProtocolFactory outFactory) throws SerDeException {
     super(argType);

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftSerDe.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftSerDe.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftSerDe.java Tue Oct 21 11:29:18 2008
@@ -32,24 +32,6 @@
   private ThriftByteStreamTypedSerDe tsd;
   private boolean inStreaming;
 
-  public static String shortName() {
-    return "thrift";
-  }
-
-  public  String getShortName() {
-    return shortName();
-  }
-
-  static {
-    StackTraceElement[] sTrace = new Exception().getStackTrace();
-    String className = sTrace[0].getClassName();
-    try {
-      SerDeUtils.registerSerDe(shortName(), Class.forName(className));
-    } catch(Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   public void initialize(Configuration job, Properties tbl) throws SerDeException {
     try {
       // both the classname and the protocol name are Table properties

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftSerDeField.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftSerDeField.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftSerDeField.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/ThriftSerDeField.java Tue Oct 21 11:29:18 2008
@@ -20,6 +20,7 @@
 
 import org.apache.hadoop.hive.serde.*;
 import java.lang.reflect.*;
+import java.util.HashMap;
 
 /**
  * Thrift implementation of SerDeField
@@ -32,12 +33,32 @@
   private Class issetClass;
   private Field issetField;
   private Field fieldIssetField;
+  private static HashMap<String, Field[]> cacheFields = new HashMap<String, Field[]>();
 
   public ThriftSerDeField(String className, String fieldName) throws SerDeException {
     super(className, fieldName);
     try {
       issetClass = Class.forName(className+"$Isset");
-      fieldIssetField = issetClass.getDeclaredField(fieldName);
+      //      fieldIssetField = issetClass.getDeclaredField(fieldName);
+      String name = issetClass.getName();
+      Field[] allFields = cacheFields.get(name);
+      if (allFields == null) {
+        allFields = issetClass.getDeclaredFields();
+        cacheFields.put(name, allFields);
+      }
+
+      boolean found = false;
+      for (Field f: allFields) {
+        if (f.getName().equalsIgnoreCase(fieldName)) {
+          fieldIssetField = f;
+          found = true;
+          break;
+        }
+      }
+
+      if (!found) 
+        throw new SerDeException("Not a Thrift Class?");
+
       issetField = _parentClass.getDeclaredField("__isset");
     } catch (Exception e) {
       throw (new SerDeException("Not a Thrift Class?", e));

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/columnsetSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/columnsetSerDe.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/columnsetSerDe.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde/thrift/columnsetSerDe.java Tue Oct 21 11:29:18 2008
@@ -18,35 +18,26 @@
 
 package org.apache.hadoop.hive.serde.thrift;
 
-import org.apache.hadoop.hive.serde.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Properties;
 
-import com.facebook.thrift.TBase;
-import com.facebook.thrift.TSerializer;
-import com.facebook.thrift.protocol.*;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.*;
-import java.util.*;
-import java.io.*;
+import org.apache.hadoop.hive.serde.ColumnSet;
+import org.apache.hadoop.hive.serde.ComplexSerDeField;
+import org.apache.hadoop.hive.serde.ExpressionUtils;
+import org.apache.hadoop.hive.serde.ReflectionSerDeField;
+import org.apache.hadoop.hive.serde.SerDe;
+import org.apache.hadoop.hive.serde.SerDeException;
+import org.apache.hadoop.hive.serde.SerDeField;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.Writable;
 
-public class columnsetSerDe  extends ThriftByteStreamTypedSerDe implements SerDe {
-
-  public  String getShortName() {
-    return shortName();
-  }
-
-  public static String shortName() {
-    return "columnset";
-  }
+import com.facebook.thrift.protocol.TBinaryProtocol;
 
-  static {
-    StackTraceElement[] sTrace = new Exception().getStackTrace();
-    String className = sTrace[0].getClassName();
-    try {
-      SerDeUtils.registerSerDe(shortName(), Class.forName(className));
-    } catch(Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
+public class columnsetSerDe  extends ThriftByteStreamTypedSerDe implements SerDe {
 
   protected boolean inStreaming;
   private String separator;

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/Deserializer.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/Deserializer.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/Deserializer.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/Deserializer.java Tue Oct 21 11:29:18 2008
@@ -58,6 +58,4 @@
    */
   public ObjectInspector getObjectInspector() throws SerDeException;
 
-  public String getShortName();
-  
 }

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java Tue Oct 21 11:29:18 2008
@@ -18,7 +18,6 @@
 
 package org.apache.hadoop.hive.serde2;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.CharacterCodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -44,33 +43,24 @@
 
   public static final Log LOG = LogFactory.getLog(MetadataTypedColumnsetSerDe.class.getName());
 
-  public String getShortName() {
-    return shortName();
-  }
-
-
-  public static String shortName() {
-    return "simple_meta";
-  }
-
   static {
     StackTraceElement[] sTrace = new Exception().getStackTrace();
     String className = sTrace[0].getClassName();
     try {
-      SerDeUtils.registerSerDe(shortName(), Class.forName(className));
-      // For backward compatibility: this class replaces the following class.
-      SerDeUtils.registerSerDe("org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe", 
+      // For backward compatibility: this class replaces the columnsetSerDe class.
+      SerDeUtils.registerSerDe("org.apache.hadoop.hive.serde.thrift.columnsetSerDe", 
           Class.forName(className));
-    } catch(Exception e) {
+      } catch(Exception e) {
       throw new RuntimeException(e);
     }
   }
   
   final public static String DefaultSeparator = "\001";
-
   private String separator;
-  // constant for now, will make it configurable later.
-  private String nullString = "\\N"; 
+
+  final public static String defaultNullString = "\\N";
+  private String nullString; 
+
   private List<String> columnNames;
   private ObjectInspector cachedObjectInspector;
 
@@ -82,20 +72,36 @@
     separator = DefaultSeparator;
   }
 
-  public void initialize(Configuration job, Properties tbl) throws SerDeException {
-    separator = DefaultSeparator;
-    String alt_sep = tbl.getProperty(Constants.SERIALIZATION_FORMAT);
-    if(alt_sep != null && alt_sep.length() > 0) {
+  private String getByteValue(String altValue, String defaultVal) {
+    if (altValue != null && altValue.length() > 0) {
       try {
         byte b [] = new byte[1];
-        b[0] = Byte.valueOf(alt_sep).byteValue();
-        separator = new String(b);
+        b[0] = Byte.valueOf(altValue).byteValue();
+        return new String(b);
       } catch(NumberFormatException e) {
-        separator = alt_sep;
+        return altValue;
       }
     }
+    return defaultVal;
+  }
+
+  public void initialize(Configuration job, Properties tbl) throws SerDeException {
+    String alt_sep = tbl.getProperty(Constants.SERIALIZATION_FORMAT);
+    separator = getByteValue(alt_sep, DefaultSeparator);
+
+    String alt_null = tbl.getProperty(Constants.SERIALIZATION_NULL_FORMAT);
+    nullString = getByteValue(alt_null, defaultNullString);
+
     String columnProperty = tbl.getProperty("columns");
-    if (columnProperty == null || columnProperty.length() == 0) {
+    String serdeName = tbl.getProperty(Constants.SERIALIZATION_LIB);
+    // tables that were serialized with columnsetSerDe doesn't have metadata 
+    // so this hack applies to all such tables 
+    boolean columnsetSerDe = false;
+    if ((serdeName != null) && serdeName.equals("org.apache.hadoop.hive.serde.thrift.columnsetSerDe")) {
+      columnsetSerDe = true;
+    }
+    if (columnProperty == null || columnProperty.length() == 0 
+        || columnsetSerDe) {
       // Hack for tables with no columns
       // Treat it as a table with a single column called "col" 
       cachedObjectInspector = ObjectInspectorFactory.getReflectionObjectInspector(
@@ -104,9 +110,9 @@
       columnNames = Arrays.asList(columnProperty.split(","));
       cachedObjectInspector = MetadataListStructObjectInspector.getInstance(columnNames);
     }
-    LOG.info(getClass().getName() + ": initialized with columnNames: " + columnNames );
+    LOG.debug(getClass().getName() + ": initialized with columnNames: " + columnNames + " and separator code=" + (int)separator.charAt(0) );
   }
-
+  
   public static Object deserialize(ColumnSet c, String row, String sep, String nullString) throws Exception {
     if (c.col == null) {
       c.col = new ArrayList<String>();

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java Tue Oct 21 11:29:18 2008
@@ -170,7 +170,7 @@
     switch(oi.getCategory()) {
       case PRIMITIVE: {
         if (o == null) {
-          sb.append("\\N");
+          sb.append("null");
         } else if (o instanceof String) {
           sb.append(QUOTE);
           sb.append(escapeString((String)o));
@@ -184,54 +184,66 @@
         break;
       }
       case LIST: {
-        sb.append(LBRACKET);
         ListObjectInspector loi = (ListObjectInspector)oi;
         ObjectInspector listElementObjectInspector = loi.getListElementObjectInspector();
         List<?> olist = loi.getList(o);
-        for (int i=0; i<olist.size(); i++) {
-          if (i>0) sb.append(COMMA);
-          buildJSONString(sb, olist.get(i), listElementObjectInspector);
+        if (olist == null) {
+          sb.append("null");
+        } else {
+          sb.append(LBRACKET);
+          for (int i=0; i<olist.size(); i++) {
+            if (i>0) sb.append(COMMA);
+            buildJSONString(sb, olist.get(i), listElementObjectInspector);
+          }
+          sb.append(RBRACKET);
         }
-        sb.append(RBRACKET);
         break;
       }
       case MAP: {
-        sb.append(LBRACE);
         MapObjectInspector moi = (MapObjectInspector)oi;
         ObjectInspector mapKeyObjectInspector = moi.getMapKeyObjectInspector();
         ObjectInspector mapValueObjectInspector = moi.getMapValueObjectInspector();
         Map<?,?> omap = moi.getMap(o);
-        boolean first = true;
-        for(Object entry : omap.entrySet()) {
-          if (first) {
-            first = false;
-          } else {
-            sb.append(COMMA);
+        if (omap == null) {
+          sb.append("null");
+        } else {
+          sb.append(LBRACE);
+          boolean first = true;
+          for(Object entry : omap.entrySet()) {
+            if (first) {
+              first = false;
+            } else {
+              sb.append(COMMA);
+            }
+            Map.Entry<?,?> e = (Map.Entry<?,?>)entry;
+            buildJSONString(sb, e.getKey(), mapKeyObjectInspector);
+            sb.append(COLON);
+            buildJSONString(sb, e.getValue(), mapValueObjectInspector);
           }
-          Map.Entry<?,?> e = (Map.Entry<?,?>)entry;
-          buildJSONString(sb, e.getKey(), mapKeyObjectInspector);
-          sb.append(COLON);
-          buildJSONString(sb, e.getValue(), mapValueObjectInspector);
+          sb.append(RBRACE);
         }
-        sb.append(RBRACE);
         break;
       }
       case STRUCT: {
-        sb.append(LBRACE);
         StructObjectInspector soi = (StructObjectInspector)oi;
         List<? extends StructField> structFields = soi.getAllStructFieldRefs();
-        for(int i=0; i<structFields.size(); i++) {
-          if (i>0) {
-            sb.append(COMMA);
+        if (structFields == null) {
+          sb.append("null");
+        } else {
+          sb.append(LBRACE);
+          for(int i=0; i<structFields.size(); i++) {
+            if (i>0) {
+              sb.append(COMMA);
+            }
+            sb.append(QUOTE);
+            sb.append(structFields.get(i).getFieldName());
+            sb.append(QUOTE);
+            sb.append(COLON);
+            buildJSONString(sb, soi.getStructFieldData(o, structFields.get(i)), 
+                structFields.get(i).getFieldObjectInspector());          
           }
-          sb.append(QUOTE);
-          sb.append(structFields.get(i).getFieldName());
-          sb.append(QUOTE);
-          sb.append(COLON);
-          buildJSONString(sb, soi.getStructFieldData(o, structFields.get(i)), 
-              structFields.get(i).getFieldObjectInspector());          
+          sb.append(RBRACE);
         }
-        sb.append(RBRACE);
         break;
       }
       default:

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/Serializer.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/Serializer.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/Serializer.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/Serializer.java Tue Oct 21 11:29:18 2008
@@ -54,5 +54,4 @@
    */
   public Writable serialize(Object obj, ObjectInspector objInspector) throws SerDeException;
 
-  public String getShortName();
 }

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/ThriftByteStreamTypedSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/ThriftByteStreamTypedSerDe.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/ThriftByteStreamTypedSerDe.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/ThriftByteStreamTypedSerDe.java Tue Oct 21 11:29:18 2008
@@ -22,9 +22,7 @@
 import java.util.Properties;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
-import org.apache.hadoop.io.BytesWritable;
 import org.apache.hadoop.io.Writable;
 
 import com.facebook.thrift.TBase;
@@ -48,15 +46,6 @@
     throw new SerDeException("ThriftByteStreamTypedSerDe is still semi-abstract");
   }
 
-  public static String shortName() {
-    return "thriftbytestream";
-  }
-
-  public  String getShortName() {
-    return shortName();
-  }
-
-
   public ThriftByteStreamTypedSerDe(Type objectType, TProtocolFactory inFactory,
                                     TProtocolFactory outFactory) throws SerDeException {
     super(objectType);

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/ThriftDeserializer.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/ThriftDeserializer.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/ThriftDeserializer.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/ThriftDeserializer.java Tue Oct 21 11:29:18 2008
@@ -28,26 +28,6 @@
 
 public class ThriftDeserializer implements Deserializer {
 
-  public static String shortName() {
-    return "thrift";
-  }
-
-  public  String getShortName() {
-    return shortName();
-  }
-
-  static {
-    StackTraceElement[] sTrace = new Exception().getStackTrace();
-    String className = sTrace[0].getClassName();
-    try {
-      SerDeUtils.registerSerDe(shortName(), Class.forName(className));
-      // For backward compatibility: this class replaces the following class.
-      SerDeUtils.registerSerDe("org.apache.hadoop.hive.serde.thrift.ThriftSerDe", Class.forName(className));
-    } catch(Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-  
   private ThriftByteStreamTypedSerDe tsd;
 
   public ThriftDeserializer() { }

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ReflectionStructObjectInspector.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ReflectionStructObjectInspector.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ReflectionStructObjectInspector.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ReflectionStructObjectInspector.java Tue Oct 21 11:29:18 2008
@@ -116,11 +116,16 @@
     if (data == null) {
       return null;
     }
+    if (!(fieldRef instanceof MyField)) {
+      throw new RuntimeException("fieldRef has to be of MyField");
+    }
+    MyField f = (MyField) fieldRef;
     try {
-      MyField f = (MyField) fieldRef;
-      return f.field.get(data);
+      Object r = f.field.get(data);
+      return r;
     } catch (Exception e) {
-      throw new RuntimeException(e); 
+      throw new RuntimeException("cannot get field " + f.field + " from " 
+    		  + data.getClass() + " " + data); 
     }
   }
   public List<Object> getStructFieldsDataAsList(Object data) {

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde/TestSerDeUtils.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde/TestSerDeUtils.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde/TestSerDeUtils.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde/TestSerDeUtils.java Tue Oct 21 11:29:18 2008
@@ -31,7 +31,7 @@
 
   public void testLookupSerDe() throws Exception {
     try {
-      String name = ThriftSerDe.shortName();
+      String name = ThriftSerDe.class.getName();
       SerDe s = SerDeUtils.lookupSerDe(name);
       assertTrue(s.getClass().getName().equals(org.apache.hadoop.hive.serde.thrift.ThriftSerDe.class.getName()));
     } catch(Exception e) {

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorUtils.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorUtils.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorUtils.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorUtils.java Tue Oct 21 11:29:18 2008
@@ -22,8 +22,8 @@
 import java.util.List;
 
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
-import org.apache.hadoop.hive.serde2.thrift_test.Complex;
-import org.apache.hadoop.hive.serde2.thrift_test.IntString;
+import org.apache.hadoop.hive.serde2.thrift.test.Complex;
+import org.apache.hadoop.hive.serde2.thrift.test.IntString;
 
 import junit.framework.TestCase;
 
@@ -50,14 +50,14 @@
       // real object
       Complex cc = new Complex();
       cc.aint = 1;
-      cc.astring = "test";
+      cc.aString = "test";
       List<Integer> c2 = Arrays.asList(new Integer[]{1,2,3}); 
       cc.lint =  c2;
       List<String> c3 = Arrays.asList(new String[]{"one", "two"});
-      cc.lstring =  c3;
+      cc.lString =  c3;
       List<IntString> c4 = new ArrayList<IntString>(); 
-      cc.lintstring = c4;
-      cc.mstringstring = null; 
+      cc.lintString = c4;
+      cc.mStringString = null; 
       // standard object
       Object c = ObjectInspectorUtils.getStandardObject(cc, oi1);
       

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestThriftObjectInspectors.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestThriftObjectInspectors.java?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestThriftObjectInspectors.java (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestThriftObjectInspectors.java Tue Oct 21 11:29:18 2008
@@ -22,8 +22,8 @@
 import java.util.List;
 
 import junit.framework.TestCase;
-import org.apache.hadoop.hive.serde2.thrift_test.Complex;
-import org.apache.hadoop.hive.serde2.thrift_test.IntString;
+import org.apache.hadoop.hive.serde2.thrift.test.Complex;
+import org.apache.hadoop.hive.serde2.thrift.test.IntString;
 
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
 
@@ -53,14 +53,14 @@
       // real object
       Complex c = new Complex();
       c.aint = 1;
-      c.astring = "test";
+      c.aString = "test";
       List<Integer> c2 = Arrays.asList(new Integer[]{1,2,3}); 
       c.lint =  c2;
       List<String> c3 = Arrays.asList(new String[]{"one", "two"});
-      c.lstring =  c3;
+      c.lString =  c3;
       List<IntString> c4 = new ArrayList<IntString>(); 
-      c.lintstring = c4;
-      c.mstringstring = null; 
+      c.lintString = c4;
+      c.mStringString = null; 
       
       assertEquals(1, soi.getStructFieldData(c, fields.get(0)));
       assertEquals("test", soi.getStructFieldData(c, fields.get(1)));

Modified: hadoop/core/branches/branch-0.19/src/contrib/hive/testutils/run_tests
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hive/testutils/run_tests?rev=706708&r1=706707&r2=706708&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hive/testutils/run_tests (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hive/testutils/run_tests Tue Oct 21 11:29:18 2008
@@ -2,9 +2,11 @@
 d=`mktemp -d /tmp/hivetest_XXXX`
 for i in `find . -name Test\*\.* | grep -v svn | egrep "java$|vm$" | sed 's/.*\/Test/Test/g' | sed 's/\.java//g' | sed 's/\.vm//g' | sort`;
 do 
-  cmd="ant -lib ../../../lib -Dtestcase=$i clean-test test -logfile $d/$i.log"
-  echo $cmd;
-  $cmd;
+  if [ "$i" != "TestSerDe" ]; then
+    cmd="ant -lib ../../../lib -Dtestcase=$i clean-test test -logfile $d/$i.log"
+    echo $cmd;
+    $cmd;
+  fi
 done
 cat $d/*.log | grep junit | egrep "Running org|Tests run"
 echo Logs at $d