hadoop-hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r764994 [9/12] - in /hadoop/hive/trunk: ./ data/conf/ eclipse-templates/ metastore/src/java/org/apache/hadoop/hive/metastore/ ql/ ql/lib/ ql/src/java/org/apache/hadoop/hive/ql/exec/ ql/src/java/org/apache/hadoop/hive/ql/io/ ql/src/java/org/...
Date Tue, 14 Apr 2009 22:54:45 GMT
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml Tue Apr 14 22:54:39 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_03-p3" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
  <object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="childTasks"> 
    <object class="java.util.ArrayList"> 
@@ -31,7 +31,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/Users/char/Documents/workspace/Hive/ql/../build/ql/tmp/7160805/215320256.10000.insclause-0</string> 
+             <string>/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/ql/../build/ql/tmp/400873878/1282167.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -84,7 +84,7 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/dest1</string> 
+                 <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/dest1</string> 
                 </void> 
                </object> 
               </void> 
@@ -135,7 +135,7 @@
                            <int>1</int> 
                           </void> 
                           <void property="dirName"> 
-                           <string>/Users/char/Documents/workspace/Hive/ql/../build/ql/tmp/7160805/215320256.10000.insclause-0</string> 
+                           <string>/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/ql/../build/ql/tmp/400873878/1282167.10000.insclause-0</string> 
                           </void> 
                           <void property="tableInfo"> 
                            <object idref="tableDesc0"/> 
@@ -163,8 +163,8 @@
                               </void> 
                               <void property="type"> 
                                <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                                <void property="primitiveClass"> 
-                                 <class>java.lang.String</class> 
+                                <void property="typeName"> 
+                                 <string>string</string> 
                                 </void> 
                                </object> 
                               </void> 
@@ -264,10 +264,10 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="2"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                        <void index="1"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -284,7 +284,7 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="1"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -305,8 +305,8 @@
                         </void> 
                         <void property="typeInfo"> 
                          <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                          <void property="primitiveClass"> 
-                           <class>java.lang.Double</class> 
+                          <void property="typeName"> 
+                           <string>double</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -322,7 +322,7 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="1"> 
                            <void index="0"> 
-                            <class>java.lang.Integer</class> 
+                            <class>org.apache.hadoop.io.IntWritable</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -333,8 +333,8 @@
                            <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                             <void property="typeInfo"> 
                              <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                              <void property="primitiveClass"> 
-                               <class>java.lang.Integer</class> 
+                              <void property="typeName"> 
+                               <string>int</string> 
                               </void> 
                              </object> 
                             </void> 
@@ -354,8 +354,8 @@
                     </void> 
                     <void property="typeInfo"> 
                      <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                      <void property="primitiveClass"> 
-                       <class>java.lang.Boolean</class> 
+                      <void property="typeName"> 
+                       <string>boolean</string> 
                       </void> 
                      </object> 
                     </void> 
@@ -417,10 +417,10 @@
                   <string>evaluate</string> 
                   <array class="java.lang.Class" length="2"> 
                    <void index="0"> 
-                    <class>java.lang.Integer</class> 
+                    <class>org.apache.hadoop.io.IntWritable</class> 
                    </void> 
                    <void index="1"> 
-                    <class>java.lang.Integer</class> 
+                    <class>org.apache.hadoop.io.IntWritable</class> 
                    </void> 
                   </array> 
                  </object> 
@@ -437,10 +437,10 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="2"> 
                        <void index="0"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                        <void index="1"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -457,10 +457,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.Integer</class> 
+                            <class>org.apache.hadoop.io.IntWritable</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.Integer</class> 
+                            <class>org.apache.hadoop.io.IntWritable</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -585,7 +585,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/srcbucket/kv1.txt</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/srcbucket/kv1.txt</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>s</string> 
@@ -597,7 +597,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/srcbucket/kv1.txt</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/srcbucket/kv1.txt</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -657,7 +657,7 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/srcbucket</string> 
+             <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/srcbucket</string> 
             </void> 
            </object> 
           </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml Tue Apr 14 22:54:39 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_03-p3" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
  <object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="childTasks"> 
    <object class="java.util.ArrayList"> 
@@ -28,7 +28,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/Users/char/Documents/workspace/Hive/ql/../build/ql/tmp/74613976/17609407.10000.insclause-0</string> 
+             <string>/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/ql/../build/ql/tmp/585619245/95889404.10000.insclause-0</string> 
             </void> 
             <void property="targetDir"> 
              <string>../build/ql/test/data/warehouse/union.out</string> 
@@ -78,7 +78,7 @@
                            <int>1</int> 
                           </void> 
                           <void property="dirName"> 
-                           <string>/Users/char/Documents/workspace/Hive/ql/../build/ql/tmp/74613976/17609407.10000.insclause-0</string> 
+                           <string>/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/ql/../build/ql/tmp/585619245/95889404.10000.insclause-0</string> 
                           </void> 
                           <void property="tableInfo"> 
                            <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -128,8 +128,8 @@
                               </void> 
                               <void property="type"> 
                                <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                                <void property="primitiveClass"> 
-                                 <class>java.lang.String</class> 
+                                <void property="typeName"> 
+                                 <string>string</string> 
                                 </void> 
                                </object> 
                               </void> 
@@ -314,10 +314,10 @@
                   <string>evaluate</string> 
                   <array class="java.lang.Class" length="2"> 
                    <void index="0"> 
-                    <class>java.lang.Double</class> 
+                    <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                    </void> 
                    <void index="1"> 
-                    <class>java.lang.Double</class> 
+                    <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                    </void> 
                   </array> 
                  </object> 
@@ -334,7 +334,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.String</class> 
+                        <class>org.apache.hadoop.io.Text</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -355,8 +355,8 @@
                     </void> 
                     <void property="typeInfo"> 
                      <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                      <void property="primitiveClass"> 
-                       <class>java.lang.Double</class> 
+                      <void property="typeName"> 
+                       <string>double</string> 
                       </void> 
                      </object> 
                     </void> 
@@ -372,7 +372,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -383,8 +383,8 @@
                        <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                         <void property="typeInfo"> 
                          <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                          <void property="primitiveClass"> 
-                           <class>java.lang.Integer</class> 
+                          <void property="typeName"> 
+                           <string>int</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -404,8 +404,8 @@
                 </void> 
                 <void property="typeInfo"> 
                  <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                  <void property="primitiveClass"> 
-                   <class>java.lang.Boolean</class> 
+                  <void property="typeName"> 
+                   <string>boolean</string> 
                   </void> 
                  </object> 
                 </void> 
@@ -472,7 +472,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>unioninput:src</string> 
@@ -484,7 +484,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -540,7 +540,7 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+             <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
             </void> 
            </object> 
           </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml Tue Apr 14 22:54:39 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_03-p3" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-2</string> 
@@ -30,7 +30,7 @@
                         <void property="conf"> 
                          <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                           <void property="dirName"> 
-                           <string>/Users/char/Documents/workspace/Hive/ql/../build/ql/tmp/429699496.10001.insclause-0</string> 
+                           <string>/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/ql/../build/ql/tmp/933597594.10001.insclause-0</string> 
                           </void> 
                           <void property="tableInfo"> 
                            <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -80,8 +80,8 @@
                               </void> 
                               <void property="type"> 
                                <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                                <void property="primitiveClass"> 
-                                 <class>java.lang.Boolean</class> 
+                                <void property="typeName"> 
+                                 <string>boolean</string> 
                                 </void> 
                                </object> 
                               </void> 
@@ -214,8 +214,8 @@
                               </void> 
                               <void property="type"> 
                                <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                                <void property="primitiveClass"> 
-                                 <class>java.lang.String</class> 
+                                <void property="typeName"> 
+                                 <string>string</string> 
                                 </void> 
                                </object> 
                               </void> 
@@ -272,13 +272,13 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="3"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="2"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -333,13 +333,13 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="3"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="2"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -394,13 +394,13 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="3"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="2"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -455,13 +455,13 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="3"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="2"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -516,10 +516,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -564,10 +564,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -612,10 +612,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -660,10 +660,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -708,10 +708,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -756,10 +756,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -804,10 +804,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -852,10 +852,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -900,10 +900,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -948,10 +948,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -996,10 +996,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -1044,10 +1044,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -1092,10 +1092,10 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="2"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                            <void index="1"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -1223,10 +1223,10 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="2"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                        <void index="1"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -1243,7 +1243,7 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="1"> 
                            <void index="0"> 
-                            <class>java.lang.String</class> 
+                            <class>org.apache.hadoop.io.Text</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -1264,8 +1264,8 @@
                         </void> 
                         <void property="typeInfo"> 
                          <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                          <void property="primitiveClass"> 
-                           <class>java.lang.Double</class> 
+                          <void property="typeName"> 
+                           <string>double</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -1281,7 +1281,7 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="1"> 
                            <void index="0"> 
-                            <class>java.lang.Integer</class> 
+                            <class>org.apache.hadoop.io.IntWritable</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -1292,8 +1292,8 @@
                            <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                             <void property="typeInfo"> 
                              <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                              <void property="primitiveClass"> 
-                               <class>java.lang.Integer</class> 
+                              <void property="typeName"> 
+                               <string>int</string> 
                               </void> 
                              </object> 
                             </void> 
@@ -1427,7 +1427,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -1439,7 +1439,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -1495,7 +1495,7 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+             <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
             </void> 
            </object> 
           </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml Tue Apr 14 22:54:39 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_03-p3" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-2</string> 
@@ -26,7 +26,7 @@
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                       <void property="dirName"> 
-                       <string>/Users/char/Documents/workspace/Hive/ql/../build/ql/tmp/1452717191.10001.insclause-0</string> 
+                       <string>/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/ql/../build/ql/tmp/100007489.10001.insclause-0</string> 
                       </void> 
                       <void property="tableInfo"> 
                        <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -76,8 +76,8 @@
                           </void> 
                           <void property="type"> 
                            <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                            <void property="primitiveClass"> 
-                             <class>java.lang.Long</class> 
+                            <void property="typeName"> 
+                             <string>bigint</string> 
                             </void> 
                            </object> 
                           </void> 
@@ -140,8 +140,8 @@
                           </void> 
                           <void property="type"> 
                            <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                            <void property="primitiveClass"> 
-                             <class>java.lang.Double</class> 
+                            <void property="typeName"> 
+                             <string>double</string> 
                             </void> 
                            </object> 
                           </void> 
@@ -224,8 +224,8 @@
                           </void> 
                           <void property="type"> 
                            <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                            <void property="primitiveClass"> 
-                             <class>java.lang.Integer</class> 
+                            <void property="typeName"> 
+                             <string>int</string> 
                             </void> 
                            </object> 
                           </void> 
@@ -292,10 +292,10 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="2"> 
                        <void index="0"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                        <void index="1"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -322,7 +322,7 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="1"> 
                            <void index="0"> 
-                            <class>java.lang.Integer</class> 
+                            <class>org.apache.hadoop.io.IntWritable</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -364,7 +364,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -399,7 +399,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -434,10 +434,10 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="2"> 
                        <void index="0"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                        <void index="1"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -482,7 +482,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>long</class> 
+                        <class>org.apache.hadoop.io.LongWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -499,7 +499,7 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="1"> 
                            <void index="0"> 
-                            <class>java.lang.Integer</class> 
+                            <class>org.apache.hadoop.io.IntWritable</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -552,7 +552,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -569,7 +569,7 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="1"> 
                            <void index="0"> 
-                            <class>java.lang.Double</class> 
+                            <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -611,7 +611,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -646,7 +646,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -681,7 +681,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -698,7 +698,7 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="1"> 
                            <void index="0"> 
-                            <class>java.lang.Double</class> 
+                            <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -740,7 +740,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -775,7 +775,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -810,7 +810,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -845,7 +845,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -862,7 +862,7 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="1"> 
                            <void index="0"> 
-                            <class>java.lang.Double</class> 
+                            <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -904,7 +904,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -939,7 +939,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -956,7 +956,7 @@
                           <string>evaluate</string> 
                           <array class="java.lang.Class" length="1"> 
                            <void index="0"> 
-                            <class>java.lang.Double</class> 
+                            <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                            </void> 
                           </array> 
                          </object> 
@@ -998,7 +998,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -1033,7 +1033,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -1068,7 +1068,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Double</class> 
+                        <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -1218,8 +1218,8 @@
               </void> 
               <void property="type"> 
                <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                <void property="primitiveClass"> 
-                 <class>java.lang.String</class> 
+                <void property="typeName"> 
+                 <string>string</string> 
                 </void> 
                </object> 
               </void> 
@@ -1246,7 +1246,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/dest1</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/dest1</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>dest1</string> 
@@ -1258,7 +1258,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/dest1</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/dest1</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -1314,7 +1314,7 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/dest1</string> 
+             <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/dest1</string> 
             </void> 
            </object> 
           </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml Tue Apr 14 22:54:39 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_03-p3" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-2</string> 
@@ -26,7 +26,7 @@
                     <void property="conf"> 
                      <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                       <void property="dirName"> 
-                       <string>/Users/char/Documents/workspace/Hive/ql/../build/ql/tmp/54039783.10001.insclause-0</string> 
+                       <string>/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/ql/../build/ql/tmp/919620506.10001.insclause-0</string> 
                       </void> 
                       <void property="tableInfo"> 
                        <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -76,8 +76,8 @@
                           </void> 
                           <void property="type"> 
                            <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                            <void property="primitiveClass"> 
-                             <class>java.lang.String</class> 
+                            <void property="typeName"> 
+                             <string>string</string> 
                             </void> 
                            </object> 
                           </void> 
@@ -90,8 +90,8 @@
                           </void> 
                           <void property="type"> 
                            <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                            <void property="primitiveClass"> 
-                             <class>java.lang.Integer</class> 
+                            <void property="typeName"> 
+                             <string>int</string> 
                             </void> 
                            </object> 
                           </void> 
@@ -118,13 +118,13 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="3"> 
                        <void index="0"> 
-                        <class>java.lang.Boolean</class> 
+                        <class>org.apache.hadoop.io.BooleanWritable</class> 
                        </void> 
                        <void index="1"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                        <void index="2"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -135,8 +135,8 @@
                        <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                         <void property="typeInfo"> 
                          <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                          <void property="primitiveClass"> 
-                           <class>java.lang.Boolean</class> 
+                          <void property="typeName"> 
+                           <string>boolean</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -183,10 +183,10 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="2"> 
                        <void index="0"> 
-                        <class>java.lang.String</class> 
+                        <class>org.apache.hadoop.io.Text</class> 
                        </void> 
                        <void index="1"> 
-                        <class>java.lang.String</class> 
+                        <class>org.apache.hadoop.io.Text</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -319,7 +319,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -331,7 +331,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -387,7 +387,7 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+             <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
             </void> 
            </object> 
           </void> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml Tue Apr 14 22:54:39 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_03-p3" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
  <object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="childTasks"> 
    <object class="java.util.ArrayList"> 
@@ -28,7 +28,7 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/Users/char/Documents/workspace/Hive/ql/../build/ql/tmp/63973424/1137538944.10000.insclause-0</string> 
+             <string>/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/ql/../build/ql/tmp/285475753/676359278.10000.insclause-0</string> 
             </void> 
             <void property="targetDir"> 
              <string>../build/ql/test/data/warehouse/union.out</string> 
@@ -82,7 +82,7 @@
                                <int>1</int> 
                               </void> 
                               <void property="dirName"> 
-                               <string>/Users/char/Documents/workspace/Hive/ql/../build/ql/tmp/63973424/1137538944.10000.insclause-0</string> 
+                               <string>/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/ql/../build/ql/tmp/285475753/676359278.10000.insclause-0</string> 
                               </void> 
                               <void property="tableInfo"> 
                                <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -132,8 +132,8 @@
                                   </void> 
                                   <void property="type"> 
                                    <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                                    <void property="primitiveClass"> 
-                                     <class>java.lang.String</class> 
+                                    <void property="typeName"> 
+                                     <string>string</string> 
                                     </void> 
                                    </object> 
                                   </void> 
@@ -310,10 +310,10 @@
                                   <string>evaluate</string> 
                                   <array class="java.lang.Class" length="2"> 
                                    <void index="0"> 
-                                    <class>java.lang.Double</class> 
+                                    <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                                    </void> 
                                    <void index="1"> 
-                                    <class>java.lang.Double</class> 
+                                    <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                                    </void> 
                                   </array> 
                                  </object> 
@@ -330,7 +330,7 @@
                                       <string>evaluate</string> 
                                       <array class="java.lang.Class" length="1"> 
                                        <void index="0"> 
-                                        <class>java.lang.String</class> 
+                                        <class>org.apache.hadoop.io.Text</class> 
                                        </void> 
                                       </array> 
                                      </object> 
@@ -351,8 +351,8 @@
                                     </void> 
                                     <void property="typeInfo"> 
                                      <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                                      <void property="primitiveClass"> 
-                                       <class>java.lang.Double</class> 
+                                      <void property="typeName"> 
+                                       <string>double</string> 
                                       </void> 
                                      </object> 
                                     </void> 
@@ -368,7 +368,7 @@
                                       <string>evaluate</string> 
                                       <array class="java.lang.Class" length="1"> 
                                        <void index="0"> 
-                                        <class>java.lang.Integer</class> 
+                                        <class>org.apache.hadoop.io.IntWritable</class> 
                                        </void> 
                                       </array> 
                                      </object> 
@@ -379,8 +379,8 @@
                                        <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                                         <void property="typeInfo"> 
                                          <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                                          <void property="primitiveClass"> 
-                                           <class>java.lang.Integer</class> 
+                                          <void property="typeName"> 
+                                           <string>int</string> 
                                           </void> 
                                          </object> 
                                         </void> 
@@ -400,8 +400,8 @@
                                 </void> 
                                 <void property="typeInfo"> 
                                  <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> 
-                                  <void property="primitiveClass"> 
-                                   <class>java.lang.Boolean</class> 
+                                  <void property="typeName"> 
+                                   <string>boolean</string> 
                                   </void> 
                                  </object> 
                                 </void> 
@@ -613,10 +613,10 @@
                   <string>evaluate</string> 
                   <array class="java.lang.Class" length="2"> 
                    <void index="0"> 
-                    <class>java.lang.Double</class> 
+                    <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                    </void> 
                    <void index="1"> 
-                    <class>java.lang.Double</class> 
+                    <class>org.apache.hadoop.hive.serde2.io.DoubleWritable</class> 
                    </void> 
                   </array> 
                  </object> 
@@ -633,7 +633,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.String</class> 
+                        <class>org.apache.hadoop.io.Text</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -667,7 +667,7 @@
                       <string>evaluate</string> 
                       <array class="java.lang.Class" length="1"> 
                        <void index="0"> 
-                        <class>java.lang.Integer</class> 
+                        <class>org.apache.hadoop.io.IntWritable</class> 
                        </void> 
                       </array> 
                      </object> 
@@ -763,7 +763,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>null-subquery1:unioninput-subquery1:src</string> 
@@ -778,7 +778,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="partSpec"> 
          <object class="java.util.LinkedHashMap"/> 
@@ -834,7 +834,7 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/Users/char/Documents/workspace/Hive/build/ql/test/data/warehouse/src</string> 
+             <string>file:/data/users/zshao/sync/apache-trunk-HIVE-266-trunk/build/ql/test/data/warehouse/src</string> 
             </void> 
            </object> 
           </void> 

Modified: hadoop/hive/trunk/serde/if/serde.thrift
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/if/serde.thrift?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/if/serde.thrift (original)
+++ hadoop/hive/trunk/serde/if/serde.thrift Tue Apr 14 22:54:39 2009
@@ -21,6 +21,7 @@
 typedef string PrimitiveType
 typedef string CollectionType
 
+const string VOID_TYPE_NAME       = "void";
 const string BOOLEAN_TYPE_NAME  = "boolean";
 const string TINYINT_TYPE_NAME   = "tinyint";
 const string SMALLINT_TYPE_NAME  = "smallint";
@@ -35,8 +36,9 @@
 
 const string LIST_TYPE_NAME = "array";
 const string MAP_TYPE_NAME  = "map";
+const string STRUCT_TYPE_NAME  = "struct";
 
-const set<string> PrimitiveTypes  = [ BOOLEAN_TYPE_NAME TINYINT_TYPE_NAME SMALLINT_TYPE_NAME INT_TYPE_NAME BIGINT_TYPE_NAME FLOAT_TYPE_NAME DOUBLE_TYPE_NAME STRING_TYPE_NAME  DATE_TYPE_NAME DATETIME_TYPE_NAME TIMESTAMP_TYPE_NAME ],
+const set<string> PrimitiveTypes  = [ VOID_TYPE_NAME BOOLEAN_TYPE_NAME TINYINT_TYPE_NAME SMALLINT_TYPE_NAME INT_TYPE_NAME BIGINT_TYPE_NAME FLOAT_TYPE_NAME DOUBLE_TYPE_NAME STRING_TYPE_NAME  DATE_TYPE_NAME DATETIME_TYPE_NAME TIMESTAMP_TYPE_NAME ],
 const set<string> CollectionTypes = [ LIST_TYPE_NAME MAP_TYPE_NAME ],
 
 

Modified: hadoop/hive/trunk/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java (original)
+++ hadoop/hive/trunk/serde/src/gen-java/org/apache/hadoop/hive/serde/Constants.java Tue Apr 14 22:54:39 2009
@@ -39,6 +39,8 @@
 
   public static final String QUOTE_CHAR = "quote.delim";
 
+  public static final String VOID_TYPE_NAME = "void";
+
   public static final String BOOLEAN_TYPE_NAME = "boolean";
 
   public static final String TINYINT_TYPE_NAME = "tinyint";
@@ -65,8 +67,11 @@
 
   public static final String MAP_TYPE_NAME = "map";
 
+  public static final String STRUCT_TYPE_NAME = "struct";
+
   public static final Set<String> PrimitiveTypes = new HashSet<String>();
   static {
+    PrimitiveTypes.add("void");
     PrimitiveTypes.add("boolean");
     PrimitiveTypes.add("tinyint");
     PrimitiveTypes.add("smallint");

Modified: hadoop/hive/trunk/serde/src/gen-php/serde_constants.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/gen-php/serde_constants.php?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/gen-php/serde_constants.php (original)
+++ hadoop/hive/trunk/serde/src/gen-php/serde_constants.php Tue Apr 14 22:54:39 2009
@@ -32,6 +32,8 @@
 
 $GLOBALS['serde_CONSTANTS']['QUOTE_CHAR'] = 'quote.delim';
 
+$GLOBALS['serde_CONSTANTS']['VOID_TYPE_NAME'] = 'void';
+
 $GLOBALS['serde_CONSTANTS']['BOOLEAN_TYPE_NAME'] = 'boolean';
 
 $GLOBALS['serde_CONSTANTS']['TINYINT_TYPE_NAME'] = 'tinyint';
@@ -58,7 +60,10 @@
 
 $GLOBALS['serde_CONSTANTS']['MAP_TYPE_NAME'] = 'map';
 
+$GLOBALS['serde_CONSTANTS']['STRUCT_TYPE_NAME'] = 'struct';
+
 $GLOBALS['serde_CONSTANTS']['PrimitiveTypes'] = array(
+  'void' => true,
   'boolean' => true,
   'tinyint' => true,
   'smallint' => true,

Modified: hadoop/hive/trunk/serde/src/gen-py/org_apache_hadoop_hive_serde/constants.py
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/gen-py/org_apache_hadoop_hive_serde/constants.py?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/gen-py/org_apache_hadoop_hive_serde/constants.py (original)
+++ hadoop/hive/trunk/serde/src/gen-py/org_apache_hadoop_hive_serde/constants.py Tue Apr 14 22:54:39 2009
@@ -31,6 +31,8 @@
 
 QUOTE_CHAR = 'quote.delim'
 
+VOID_TYPE_NAME = 'void'
+
 BOOLEAN_TYPE_NAME = 'boolean'
 
 TINYINT_TYPE_NAME = 'tinyint'
@@ -57,7 +59,10 @@
 
 MAP_TYPE_NAME = 'map'
 
+STRUCT_TYPE_NAME = 'struct'
+
 PrimitiveTypes = set([
+  'void',
   'boolean',
   'tinyint',
   'smallint',

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java Tue Apr 14 22:54:39 2009
@@ -20,11 +20,14 @@
 
 import java.util.*;
 
+import org.apache.hadoop.hive.serde.Constants;
 import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.StructField;
 import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
+import org.apache.hadoop.io.Text;
 
 public class SerDeUtils {
 
@@ -182,14 +185,17 @@
 
     switch(oi.getCategory()) {
       case PRIMITIVE: {
+        PrimitiveObjectInspector poi = (PrimitiveObjectInspector)oi;
         if (o == null) {
           sb.append("null");
-        } else if (o instanceof String) {
+        } else if (oi.getTypeName().equals(Constants.STRING_TYPE_NAME)) {
+          String s = (String)poi.getPrimitiveJavaObject(o);
           sb.append(QUOTE);
-          sb.append(escapeString((String)o));
+          sb.append(escapeString(s));
           sb.append(QUOTE);
-        } else if (o instanceof Boolean) {
-          sb.append(((Boolean)o).booleanValue() ? "True" : "False");
+        } else if (oi.getTypeName().equals(Constants.BOOLEAN_TYPE_NAME)) {
+          Boolean b = (Boolean)poi.getPrimitiveJavaObject(o);
+          sb.append(b.booleanValue() ? "True" : "False");
         } else {
           // it's a number - so doesn't need to be escaped.
           sb.append(o.toString());

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java Tue Apr 14 22:54:39 2009
@@ -24,6 +24,8 @@
 import org.apache.hadoop.hive.serde2.*;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils;
 
 import org.apache.hadoop.hive.serde2.thrift.ConfigurableTProtocol;
 
@@ -141,7 +143,8 @@
           dynamicSerDeStructBaseToObjectInspector(btMap.getKeyType()), 
           dynamicSerDeStructBaseToObjectInspector(btMap.getValueType()));
     } else if (bt.isPrimitive()) {
-      return ObjectInspectorFactory.getStandardPrimitiveObjectInspector(bt.getRealType());
+      return PrimitiveObjectInspectorFactory.getPrimitiveJavaObjectInspector(
+          PrimitiveObjectInspectorUtils.getTypeEntryFromPrimitiveJavaClass(bt.getRealType()).primitiveCategory);
     } else {
       // Must be a struct
       DynamicSerDeStructBase btStruct = (DynamicSerDeStructBase)bt;

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBool.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBool.java?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBool.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeBool.java Tue Apr 14 22:54:39 2009
@@ -23,6 +23,7 @@
 import org.apache.hadoop.hive.serde2.*;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector;
 
 import com.facebook.thrift.protocol.TType;
 
@@ -57,10 +58,8 @@
   public void serialize(Object o, ObjectInspector oi, TProtocol oprot)
       throws TException, SerDeException, NoSuchFieldException,
       IllegalAccessException {
-    assert (oi.getCategory() == ObjectInspector.Category.PRIMITIVE);
-    assert (((PrimitiveObjectInspector) oi).getPrimitiveClass()
-        .equals(Boolean.class));
-    oprot.writeBool((Boolean) o);
+    BooleanObjectInspector poi = (BooleanObjectInspector) oi;
+    oprot.writeBool(poi.get(o));
   }
 
   public byte getType() {

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeByte.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeByte.java?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeByte.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeByte.java Tue Apr 14 22:54:39 2009
@@ -24,6 +24,8 @@
 import org.apache.hadoop.hive.serde2.*;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.ByteObjectInspector;
+
 import com.facebook.thrift.protocol.TType;
 
 public class DynamicSerDeTypeByte extends DynamicSerDeTypeBase {
@@ -52,15 +54,9 @@
     return deserialize(iprot);
   }
 
-  public void serialize(Object s, TProtocol oprot) throws TException, SerDeException, NoSuchFieldException,IllegalAccessException  {
-    // bugbug need to use object of byte type!!!
-    oprot.writeByte((Byte)s);
-  }
-
   public void serialize(Object o, ObjectInspector oi, TProtocol oprot) throws TException, SerDeException, NoSuchFieldException,IllegalAccessException  {
-    assert(oi.getCategory() == ObjectInspector.Category.PRIMITIVE);
-    assert(((PrimitiveObjectInspector)oi).getPrimitiveClass().equals(Byte.class));
-    oprot.writeByte((Byte)o);
+    ByteObjectInspector poi = (ByteObjectInspector) oi;
+    oprot.writeByte(poi.get(o));
   }
 
   public byte getType() {

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeDouble.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeDouble.java?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeDouble.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeDouble.java Tue Apr 14 22:54:39 2009
@@ -28,6 +28,7 @@
 import org.apache.hadoop.hive.serde2.*;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
 
 import java.lang.reflect.*;
 import com.facebook.thrift.protocol.TType;
@@ -55,9 +56,8 @@
   }
 
   public void serialize(Object o, ObjectInspector oi, TProtocol oprot) throws TException, SerDeException, NoSuchFieldException,IllegalAccessException  {
-    assert(oi.getCategory() == ObjectInspector.Category.PRIMITIVE);
-    assert(((PrimitiveObjectInspector)oi).getPrimitiveClass().equals(Double.class));
-    oprot.writeDouble((Double)o);
+    DoubleObjectInspector poi = (DoubleObjectInspector) oi;
+    oprot.writeDouble(poi.get(o));
   }
 
   public byte getType() {

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeString.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeString.java?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeString.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeString.java Tue Apr 14 22:54:39 2009
@@ -28,6 +28,9 @@
 import org.apache.hadoop.hive.serde2.*;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector;
+import org.apache.hadoop.hive.serde2.thrift.WriteTextProtocol;
+import org.apache.hadoop.io.Text;
 
 import java.lang.reflect.*;
 import com.facebook.thrift.protocol.TType.*;
@@ -55,14 +58,14 @@
     return iprot.readString();
   }
   
-  public void serialize(Object s, TProtocol oprot) throws TException, SerDeException, NoSuchFieldException,IllegalAccessException  {
-    oprot.writeString((String)s);
-  }
   @Override
   public void serialize(Object o, ObjectInspector oi, TProtocol oprot) throws TException, SerDeException, NoSuchFieldException,IllegalAccessException  {
-    assert(oi.getCategory() == ObjectInspector.Category.PRIMITIVE);
-    assert(((PrimitiveObjectInspector)oi).getPrimitiveClass().equals(String.class));
-    oprot.writeString((String)o);
+    StringObjectInspector poi = (StringObjectInspector) oi;
+    if (oprot instanceof WriteTextProtocol) {
+      ((WriteTextProtocol)oprot).writeText((Text)poi.getPrimitiveWritableObject(o));
+    } else {
+      oprot.writeString((String)poi.getPrimitiveJavaObject(o));
+    }
   }
 
   public byte getType() {

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei16.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei16.java?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei16.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei16.java Tue Apr 14 22:54:39 2009
@@ -28,6 +28,8 @@
 import org.apache.hadoop.hive.serde2.*;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.ShortObjectInspector;
 
 import java.lang.reflect.*;
 import com.facebook.thrift.protocol.TType;
@@ -59,9 +61,8 @@
 
   @Override
   public void serialize(Object o, ObjectInspector oi, TProtocol oprot) throws TException, SerDeException, NoSuchFieldException,IllegalAccessException  {
-    assert(oi.getCategory() == ObjectInspector.Category.PRIMITIVE);
-    assert(((PrimitiveObjectInspector)oi).getPrimitiveClass().equals(Short.class));
-    oprot.writeI16((Short)o);
+    ShortObjectInspector poi = (ShortObjectInspector) oi;
+    oprot.writeI16(poi.get(o));
   }
 
   public byte getType() {

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei32.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei32.java?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei32.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei32.java Tue Apr 14 22:54:39 2009
@@ -28,6 +28,8 @@
 import org.apache.hadoop.hive.serde2.*;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.ShortObjectInspector;
 
 import java.lang.reflect.*;
 import com.facebook.thrift.protocol.TType;
@@ -57,9 +59,8 @@
 
   @Override
   public void serialize(Object o, ObjectInspector oi, TProtocol oprot) throws TException, SerDeException, NoSuchFieldException,IllegalAccessException  {
-    assert(oi.getCategory() == ObjectInspector.Category.PRIMITIVE);
-    assert(((PrimitiveObjectInspector)oi).getPrimitiveClass().equals(Integer.class));
-    oprot.writeI32((Integer)o);
+    IntObjectInspector poi = (IntObjectInspector) oi;
+    oprot.writeI32(poi.get(o));
   }
 
   public Class getRealType() { return java.lang.Integer.class; }

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei64.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei64.java?rev=764994&r1=764993&r2=764994&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei64.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypei64.java Tue Apr 14 22:54:39 2009
@@ -28,6 +28,8 @@
 import org.apache.hadoop.hive.serde2.*;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.LongObjectInspector;
 
 import java.lang.reflect.*;
 import com.facebook.thrift.protocol.TType;
@@ -59,9 +61,8 @@
 
   @Override
   public void serialize(Object o, ObjectInspector oi, TProtocol oprot) throws TException, SerDeException, NoSuchFieldException,IllegalAccessException  {
-    assert(oi.getCategory() == ObjectInspector.Category.PRIMITIVE);
-    assert(((PrimitiveObjectInspector)oi).getPrimitiveClass().equals(Long.class));
-    oprot.writeI64((Long)o);
+    LongObjectInspector poi = (LongObjectInspector) oi;
+    oprot.writeI64(poi.get(o));
   }
 
   public byte getType() {

Added: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ByteWritable.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ByteWritable.java?rev=764994&view=auto
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ByteWritable.java (added)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ByteWritable.java Tue Apr 14 22:54:39 2009
@@ -0,0 +1,97 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.serde2.io;
+
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.hadoop.io.WritableComparable;
+import org.apache.hadoop.io.WritableComparator;
+
+public class ByteWritable implements WritableComparable {
+  private byte value;
+
+  public void write(DataOutput out) throws IOException {
+    out.writeByte(value);
+  }
+
+  public void readFields(DataInput in) throws IOException {
+    value = in.readByte();
+  }
+
+  public ByteWritable(byte b) {
+    value = b;
+  }
+
+  public ByteWritable() {
+    value = 0;
+  }
+
+  public void set(byte value) {
+    this.value = value;
+  }
+  
+  public byte get() {
+    return value;
+  }
+  
+  /** Compares two ByteWritables. */
+  public int compareTo(Object o) {
+    int thisValue = this.value;
+    int thatValue = ((ByteWritable) o).value;
+    return thisValue - thatValue;
+  }
+
+  public boolean equals(Object o) {
+    if (o == null || o.getClass() != ByteWritable.class) {
+      return false;
+    }
+    return get() == ((ByteWritable)o).get();
+  }
+  
+  public int hashCode() {
+    return value;
+  }
+  
+  public String toString() {
+    return String.valueOf(get());
+  }
+  
+  /** A Comparator optimized for BytesWritable. */
+  public static class Comparator extends WritableComparator {
+    public Comparator() {
+      super(ByteWritable.class);
+    }
+
+    /**
+     * Compare the buffers in serialized form.
+     */
+    public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
+      int a1 = b1[s1];
+      int a2 = b2[s2];
+      return a1 - a2;
+    }
+  }
+
+  static { // register this comparator
+    WritableComparator.define(ByteWritable.class, new Comparator());
+  }
+
+}



Mime
View raw message