You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zs...@apache.org on 2008/09/20 01:56:35 UTC

svn commit: r697291 [27/31] - in /hadoop/core/trunk: ./ src/contrib/hive/cli/src/java/org/apache/hadoop/hive/cli/ src/contrib/hive/metastore/if/ src/contrib/hive/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ src/contrib/hive/metastor...

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join4.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join4.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join4.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-athusoo/1648350181.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/1000008087.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+              <void property="deserializerClass"> 
+               <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+              </void> 
               <void property="inputFileFormatClass"> 
                <class>org.apache.hadoop.mapred.TextInputFormat</class> 
               </void> 
@@ -81,13 +84,10 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                 <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                 </void> 
                </object> 
               </void> 
-              <void property="serdeClass"> 
-               <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> 
-              </void> 
               <void property="serdeClassName"> 
                <string>simple_meta</string> 
               </void> 
@@ -135,7 +135,36 @@
                            <string>0</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                           <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                            <void property="primitiveClass"> 
+                             <class>java.lang.String</class> 
+                            </void> 
+                           </object> 
+                          </void> 
+                         </object> 
+                        </void> 
+                       </object> 
+                      </void> 
+                      <void property="keySerializeInfo"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                        <void property="deserializerClass"> 
+                         <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+                        </void> 
+                        <void property="inputFileFormatClass"> 
+                         <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                        </void> 
+                        <void property="outputFileFormatClass"> 
+                         <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
+                        </void> 
+                        <void property="properties"> 
+                         <object class="java.util.Properties"> 
+                          <void method="put"> 
+                           <string>columns</string> 
+                           <string>0</string> 
+                          </void> 
+                          <void method="put"> 
+                           <string>serialization.format</string> 
+                           <string>1</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -155,7 +184,7 @@
                            <string>0</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="TypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -165,7 +194,32 @@
                            <string>1</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
+                          </void> 
+                         </object> 
+                        </void> 
+                       </object> 
+                      </void> 
+                      <void property="valueSerializeInfo"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                        <void property="deserializerClass"> 
+                         <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+                        </void> 
+                        <void property="inputFileFormatClass"> 
+                         <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                        </void> 
+                        <void property="outputFileFormatClass"> 
+                         <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
+                        </void> 
+                        <void property="properties"> 
+                         <object class="java.util.Properties"> 
+                          <void method="put"> 
+                           <string>columns</string> 
+                           <string>0,1</string> 
+                          </void> 
+                          <void method="put"> 
+                           <string>serialization.format</string> 
+                           <string>1</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -183,7 +237,7 @@
                            <string>VALUE.0</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="TypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -193,7 +247,7 @@
                            <string>VALUE.1</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="TypeInfo1"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -215,7 +269,7 @@
                        <string>key</string> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="TypeInfo0"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -225,7 +279,7 @@
                        <string>value</string> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="TypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -243,7 +297,7 @@
                        <string>0</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="TypeInfo0"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -253,7 +307,7 @@
                        <string>1</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="TypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -313,14 +367,18 @@
                          <string>key</string> 
                         </void> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo0"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
                       <void method="add"> 
                        <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                         <void property="typeInfo"> 
-                         <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                         <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                          <void property="primitiveClass"> 
+                           <class>java.lang.Integer</class> 
+                          </void> 
+                         </object> 
                         </void> 
                         <void property="value"> 
                          <int>15</int> 
@@ -330,7 +388,11 @@
                      </object> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object id="TypeInfo3" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                     <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                      <void property="primitiveClass"> 
+                       <class>java.lang.Boolean</class> 
+                      </void> 
+                     </object> 
                     </void> 
                    </object> 
                   </void> 
@@ -360,14 +422,14 @@
                          <string>key</string> 
                         </void> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo0"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
                       <void method="add"> 
                        <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo2"/> 
+                         <object idref="PrimitiveTypeInfo1"/> 
                         </void> 
                         <void property="value"> 
                          <int>25</int> 
@@ -377,14 +439,14 @@
                      </object> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo3"/> 
+                     <object idref="PrimitiveTypeInfo2"/> 
                     </void> 
                    </object> 
                   </void> 
                  </object> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo3"/> 
+                 <object idref="PrimitiveTypeInfo2"/> 
                 </void> 
                </object> 
               </void> 
@@ -400,7 +462,7 @@
                    <string>key</string> 
                   </void> 
                   <void property="type"> 
-                   <object idref="TypeInfo0"/> 
+                   <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -410,7 +472,7 @@
                    <string>value</string> 
                   </void> 
                   <void property="type"> 
-                   <object idref="TypeInfo1"/> 
+                   <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -456,7 +518,32 @@
                            <string>0</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object id="TypeInfo4" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
+                          </void> 
+                         </object> 
+                        </void> 
+                       </object> 
+                      </void> 
+                      <void property="keySerializeInfo"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                        <void property="deserializerClass"> 
+                         <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+                        </void> 
+                        <void property="inputFileFormatClass"> 
+                         <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                        </void> 
+                        <void property="outputFileFormatClass"> 
+                         <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
+                        </void> 
+                        <void property="properties"> 
+                         <object class="java.util.Properties"> 
+                          <void method="put"> 
+                           <string>columns</string> 
+                           <string>0</string> 
+                          </void> 
+                          <void method="put"> 
+                           <string>serialization.format</string> 
+                           <string>1</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -473,7 +560,7 @@
                            <string>0</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="TypeInfo4"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -483,7 +570,32 @@
                            <string>1</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object id="TypeInfo5" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
+                          </void> 
+                         </object> 
+                        </void> 
+                       </object> 
+                      </void> 
+                      <void property="valueSerializeInfo"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                        <void property="deserializerClass"> 
+                         <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+                        </void> 
+                        <void property="inputFileFormatClass"> 
+                         <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                        </void> 
+                        <void property="outputFileFormatClass"> 
+                         <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
+                        </void> 
+                        <void property="properties"> 
+                         <object class="java.util.Properties"> 
+                          <void method="put"> 
+                           <string>columns</string> 
+                           <string>0,1</string> 
+                          </void> 
+                          <void method="put"> 
+                           <string>serialization.format</string> 
+                           <string>1</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -501,7 +613,7 @@
                            <string>VALUE.0</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="TypeInfo4"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -511,7 +623,7 @@
                            <string>VALUE.1</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="TypeInfo5"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -533,7 +645,7 @@
                        <string>key</string> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="TypeInfo4"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -543,7 +655,7 @@
                        <string>value</string> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="TypeInfo5"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -561,7 +673,7 @@
                        <string>0</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="TypeInfo4"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -571,7 +683,7 @@
                        <string>1</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="TypeInfo5"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -631,14 +743,14 @@
                          <string>key</string> 
                         </void> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo4"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
                       <void method="add"> 
                        <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo2"/> 
+                         <object idref="PrimitiveTypeInfo1"/> 
                         </void> 
                         <void property="value"> 
                          <int>10</int> 
@@ -648,7 +760,7 @@
                      </object> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo3"/> 
+                     <object idref="PrimitiveTypeInfo2"/> 
                     </void> 
                    </object> 
                   </void> 
@@ -678,14 +790,14 @@
                          <string>key</string> 
                         </void> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo4"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
                       <void method="add"> 
                        <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo2"/> 
+                         <object idref="PrimitiveTypeInfo1"/> 
                         </void> 
                         <void property="value"> 
                          <int>20</int> 
@@ -695,14 +807,14 @@
                      </object> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo3"/> 
+                     <object idref="PrimitiveTypeInfo2"/> 
                     </void> 
                    </object> 
                   </void> 
                  </object> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo3"/> 
+                 <object idref="PrimitiveTypeInfo2"/> 
                 </void> 
                </object> 
               </void> 
@@ -718,7 +830,7 @@
                    <string>key</string> 
                   </void> 
                   <void property="type"> 
-                   <object idref="TypeInfo4"/> 
+                   <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -728,7 +840,7 @@
                    <string>value</string> 
                   </void> 
                   <void property="type"> 
-                   <object idref="TypeInfo5"/> 
+                   <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -757,7 +869,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>c:a:src1</string> 
@@ -772,13 +884,16 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/zshao/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"/> 
         </void> 
         <void property="tableDesc"> 
          <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+          <void property="deserializerClass"> 
+           <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+          </void> 
           <void property="inputFileFormatClass"> 
            <class>org.apache.hadoop.mapred.TextInputFormat</class> 
           </void> 
@@ -825,13 +940,10 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> 
+             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
             </void> 
            </object> 
           </void> 
-          <void property="serdeClass"> 
-           <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> 
-          </void> 
           <void property="serdeClassName"> 
            <string>simple_meta</string> 
           </void> 
@@ -858,7 +970,7 @@
                   <void property="conf"> 
                    <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                     <void property="dirName"> 
-                     <string>/tmp/hive-athusoo/1648350181.10000.insclause-0</string> 
+                     <string>/tmp/hive-zshao/1000008087.10000.insclause-0</string> 
                     </void> 
                     <void property="tableInfo"> 
                      <object idref="tableDesc0"/> 
@@ -875,7 +987,7 @@
                          <string>0</string> 
                         </void> 
                         <void property="type"> 
-                         <object idref="TypeInfo4"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -885,7 +997,7 @@
                          <string>1</string> 
                         </void> 
                         <void property="type"> 
-                         <object idref="TypeInfo5"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -895,7 +1007,7 @@
                          <string>2</string> 
                         </void> 
                         <void property="type"> 
-                         <object idref="TypeInfo0"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -905,7 +1017,7 @@
                          <string>3</string> 
                         </void> 
                         <void property="type"> 
-                         <object idref="TypeInfo1"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -927,7 +1039,7 @@
                      <string>0</string> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo4"/> 
+                     <object idref="PrimitiveTypeInfo0"/> 
                     </void> 
                    </object> 
                   </void> 
@@ -937,7 +1049,7 @@
                      <string>1</string> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo5"/> 
+                     <object idref="PrimitiveTypeInfo0"/> 
                     </void> 
                    </object> 
                   </void> 
@@ -947,7 +1059,7 @@
                      <string>2</string> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo0"/> 
+                     <object idref="PrimitiveTypeInfo0"/> 
                     </void> 
                    </object> 
                   </void> 
@@ -957,7 +1069,7 @@
                      <string>3</string> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo1"/> 
+                     <object idref="PrimitiveTypeInfo0"/> 
                     </void> 
                    </object> 
                   </void> 
@@ -986,7 +1098,7 @@
                  <string>0</string> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo4"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -996,7 +1108,7 @@
                  <string>1</string> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo5"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1006,7 +1118,7 @@
                  <string>2</string> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo0"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1016,7 +1128,7 @@
                  <string>3</string> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo1"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1034,7 +1146,7 @@
                  <string>0</string> 
                 </void> 
                 <void property="type"> 
-                 <object idref="TypeInfo4"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1044,7 +1156,7 @@
                  <string>1</string> 
                 </void> 
                 <void property="type"> 
-                 <object idref="TypeInfo5"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1054,7 +1166,7 @@
                  <string>2</string> 
                 </void> 
                 <void property="type"> 
-                 <object idref="TypeInfo0"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1064,7 +1176,7 @@
                  <string>3</string> 
                 </void> 
                 <void property="type"> 
-                 <object idref="TypeInfo1"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1103,7 +1215,7 @@
                <string>VALUE.0</string> 
               </void> 
               <void property="typeInfo"> 
-               <object idref="TypeInfo4"/> 
+               <object idref="PrimitiveTypeInfo0"/> 
               </void> 
              </object> 
             </void> 
@@ -1113,7 +1225,7 @@
                <string>VALUE.1</string> 
               </void> 
               <void property="typeInfo"> 
-               <object idref="TypeInfo5"/> 
+               <object idref="PrimitiveTypeInfo0"/> 
               </void> 
              </object> 
             </void> 
@@ -1128,7 +1240,7 @@
                <string>VALUE.0</string> 
               </void> 
               <void property="typeInfo"> 
-               <object idref="TypeInfo0"/> 
+               <object idref="PrimitiveTypeInfo0"/> 
               </void> 
              </object> 
             </void> 
@@ -1138,7 +1250,7 @@
                <string>VALUE.1</string> 
               </void> 
               <void property="typeInfo"> 
-               <object idref="TypeInfo1"/> 
+               <object idref="PrimitiveTypeInfo0"/> 
               </void> 
              </object> 
             </void> 
@@ -1158,7 +1270,7 @@
              <string>0</string> 
             </void> 
             <void property="type"> 
-             <object idref="TypeInfo4"/> 
+             <object idref="PrimitiveTypeInfo0"/> 
             </void> 
            </object> 
           </void> 
@@ -1168,7 +1280,7 @@
              <string>1</string> 
             </void> 
             <void property="type"> 
-             <object idref="TypeInfo5"/> 
+             <object idref="PrimitiveTypeInfo0"/> 
             </void> 
            </object> 
           </void> 
@@ -1178,7 +1290,7 @@
              <string>2</string> 
             </void> 
             <void property="type"> 
-             <object idref="TypeInfo0"/> 
+             <object idref="PrimitiveTypeInfo0"/> 
             </void> 
            </object> 
           </void> 
@@ -1188,7 +1300,7 @@
              <string>3</string> 
             </void> 
             <void property="type"> 
-             <object idref="TypeInfo1"/> 
+             <object idref="PrimitiveTypeInfo0"/> 
             </void> 
            </object> 
           </void> 

Modified: hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join5.q.xml?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join5.q.xml (original)
+++ hadoop/core/trunk/src/contrib/hive/ql/src/test/results/compiler/plan/join5.q.xml Fri Sep 19 16:56:30 2008
@@ -31,10 +31,13 @@
              <boolean>true</boolean> 
             </void> 
             <void property="sourceDir"> 
-             <string>/tmp/hive-athusoo/733517198.10000.insclause-0</string> 
+             <string>/tmp/hive-zshao/1144028705.10000.insclause-0</string> 
             </void> 
             <void property="table"> 
              <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+              <void property="deserializerClass"> 
+               <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+              </void> 
               <void property="inputFileFormatClass"> 
                <class>org.apache.hadoop.mapred.TextInputFormat</class> 
               </void> 
@@ -81,13 +84,10 @@
                 </void> 
                 <void method="put"> 
                  <string>location</string> 
-                 <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
+                 <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/dest1</string> 
                 </void> 
                </object> 
               </void> 
-              <void property="serdeClass"> 
-               <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> 
-              </void> 
               <void property="serdeClassName"> 
                <string>simple_meta</string> 
               </void> 
@@ -135,7 +135,36 @@
                            <string>0</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object id="TypeInfo0" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                           <object id="PrimitiveTypeInfo0" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                            <void property="primitiveClass"> 
+                             <class>java.lang.String</class> 
+                            </void> 
+                           </object> 
+                          </void> 
+                         </object> 
+                        </void> 
+                       </object> 
+                      </void> 
+                      <void property="keySerializeInfo"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                        <void property="deserializerClass"> 
+                         <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+                        </void> 
+                        <void property="inputFileFormatClass"> 
+                         <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                        </void> 
+                        <void property="outputFileFormatClass"> 
+                         <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
+                        </void> 
+                        <void property="properties"> 
+                         <object class="java.util.Properties"> 
+                          <void method="put"> 
+                           <string>columns</string> 
+                           <string>0</string> 
+                          </void> 
+                          <void method="put"> 
+                           <string>serialization.format</string> 
+                           <string>1</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -155,7 +184,7 @@
                            <string>0</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="TypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -165,7 +194,32 @@
                            <string>1</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object id="TypeInfo1" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
+                          </void> 
+                         </object> 
+                        </void> 
+                       </object> 
+                      </void> 
+                      <void property="valueSerializeInfo"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                        <void property="deserializerClass"> 
+                         <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+                        </void> 
+                        <void property="inputFileFormatClass"> 
+                         <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                        </void> 
+                        <void property="outputFileFormatClass"> 
+                         <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
+                        </void> 
+                        <void property="properties"> 
+                         <object class="java.util.Properties"> 
+                          <void method="put"> 
+                           <string>columns</string> 
+                           <string>0,1</string> 
+                          </void> 
+                          <void method="put"> 
+                           <string>serialization.format</string> 
+                           <string>1</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -183,7 +237,7 @@
                            <string>VALUE.0</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="TypeInfo0"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -193,7 +247,7 @@
                            <string>VALUE.1</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="TypeInfo1"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -215,7 +269,7 @@
                        <string>key</string> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="TypeInfo0"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -225,7 +279,7 @@
                        <string>value</string> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="TypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -243,7 +297,7 @@
                        <string>0</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="TypeInfo0"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -253,7 +307,7 @@
                        <string>1</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="TypeInfo1"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -313,14 +367,18 @@
                          <string>key</string> 
                         </void> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo0"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
                       <void method="add"> 
                        <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                         <void property="typeInfo"> 
-                         <object id="TypeInfo2" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                         <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                          <void property="primitiveClass"> 
+                           <class>java.lang.Integer</class> 
+                          </void> 
+                         </object> 
                         </void> 
                         <void property="value"> 
                          <int>15</int> 
@@ -330,7 +388,11 @@
                      </object> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object id="TypeInfo3" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                     <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.ql.typeinfo.PrimitiveTypeInfo"> 
+                      <void property="primitiveClass"> 
+                       <class>java.lang.Boolean</class> 
+                      </void> 
+                     </object> 
                     </void> 
                    </object> 
                   </void> 
@@ -360,14 +422,14 @@
                          <string>key</string> 
                         </void> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo0"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
                       <void method="add"> 
                        <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo2"/> 
+                         <object idref="PrimitiveTypeInfo1"/> 
                         </void> 
                         <void property="value"> 
                          <int>25</int> 
@@ -377,14 +439,14 @@
                      </object> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo3"/> 
+                     <object idref="PrimitiveTypeInfo2"/> 
                     </void> 
                    </object> 
                   </void> 
                  </object> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo3"/> 
+                 <object idref="PrimitiveTypeInfo2"/> 
                 </void> 
                </object> 
               </void> 
@@ -400,7 +462,7 @@
                    <string>key</string> 
                   </void> 
                   <void property="type"> 
-                   <object idref="TypeInfo0"/> 
+                   <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -410,7 +472,7 @@
                    <string>value</string> 
                   </void> 
                   <void property="type"> 
-                   <object idref="TypeInfo1"/> 
+                   <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -456,7 +518,32 @@
                            <string>0</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object id="TypeInfo4" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
+                          </void> 
+                         </object> 
+                        </void> 
+                       </object> 
+                      </void> 
+                      <void property="keySerializeInfo"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                        <void property="deserializerClass"> 
+                         <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+                        </void> 
+                        <void property="inputFileFormatClass"> 
+                         <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                        </void> 
+                        <void property="outputFileFormatClass"> 
+                         <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
+                        </void> 
+                        <void property="properties"> 
+                         <object class="java.util.Properties"> 
+                          <void method="put"> 
+                           <string>columns</string> 
+                           <string>0</string> 
+                          </void> 
+                          <void method="put"> 
+                           <string>serialization.format</string> 
+                           <string>1</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -473,7 +560,7 @@
                            <string>0</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object idref="TypeInfo4"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -483,7 +570,32 @@
                            <string>1</string> 
                           </void> 
                           <void property="typeInfo"> 
-                           <object id="TypeInfo5" class="org.apache.hadoop.hive.ql.parse.TypeInfo"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
+                          </void> 
+                         </object> 
+                        </void> 
+                       </object> 
+                      </void> 
+                      <void property="valueSerializeInfo"> 
+                       <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+                        <void property="deserializerClass"> 
+                         <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+                        </void> 
+                        <void property="inputFileFormatClass"> 
+                         <class>org.apache.hadoop.mapred.TextInputFormat</class> 
+                        </void> 
+                        <void property="outputFileFormatClass"> 
+                         <class>org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat</class> 
+                        </void> 
+                        <void property="properties"> 
+                         <object class="java.util.Properties"> 
+                          <void method="put"> 
+                           <string>columns</string> 
+                           <string>0,1</string> 
+                          </void> 
+                          <void method="put"> 
+                           <string>serialization.format</string> 
+                           <string>1</string> 
                           </void> 
                          </object> 
                         </void> 
@@ -501,7 +613,7 @@
                            <string>VALUE.0</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="TypeInfo4"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -511,7 +623,7 @@
                            <string>VALUE.1</string> 
                           </void> 
                           <void property="type"> 
-                           <object idref="TypeInfo5"/> 
+                           <object idref="PrimitiveTypeInfo0"/> 
                           </void> 
                          </object> 
                         </void> 
@@ -533,7 +645,7 @@
                        <string>key</string> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="TypeInfo4"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -543,7 +655,7 @@
                        <string>value</string> 
                       </void> 
                       <void property="typeInfo"> 
-                       <object idref="TypeInfo5"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -561,7 +673,7 @@
                        <string>0</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="TypeInfo4"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -571,7 +683,7 @@
                        <string>1</string> 
                       </void> 
                       <void property="type"> 
-                       <object idref="TypeInfo5"/> 
+                       <object idref="PrimitiveTypeInfo0"/> 
                       </void> 
                      </object> 
                     </void> 
@@ -631,14 +743,14 @@
                          <string>key</string> 
                         </void> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo4"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
                       <void method="add"> 
                        <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo2"/> 
+                         <object idref="PrimitiveTypeInfo1"/> 
                         </void> 
                         <void property="value"> 
                          <int>10</int> 
@@ -648,7 +760,7 @@
                      </object> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo3"/> 
+                     <object idref="PrimitiveTypeInfo2"/> 
                     </void> 
                    </object> 
                   </void> 
@@ -678,14 +790,14 @@
                          <string>key</string> 
                         </void> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo4"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
                       <void method="add"> 
                        <object class="org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc"> 
                         <void property="typeInfo"> 
-                         <object idref="TypeInfo2"/> 
+                         <object idref="PrimitiveTypeInfo1"/> 
                         </void> 
                         <void property="value"> 
                          <int>20</int> 
@@ -695,14 +807,14 @@
                      </object> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo3"/> 
+                     <object idref="PrimitiveTypeInfo2"/> 
                     </void> 
                    </object> 
                   </void> 
                  </object> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo3"/> 
+                 <object idref="PrimitiveTypeInfo2"/> 
                 </void> 
                </object> 
               </void> 
@@ -718,7 +830,7 @@
                    <string>key</string> 
                   </void> 
                   <void property="type"> 
-                   <object idref="TypeInfo4"/> 
+                   <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -728,7 +840,7 @@
                    <string>value</string> 
                   </void> 
                   <void property="type"> 
-                   <object idref="TypeInfo5"/> 
+                   <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -757,7 +869,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>c:a:src1</string> 
@@ -772,13 +884,16 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> 
+       <string>file:/data/zshao/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"/> 
         </void> 
         <void property="tableDesc"> 
          <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
+          <void property="deserializerClass"> 
+           <class>org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe</class> 
+          </void> 
           <void property="inputFileFormatClass"> 
            <class>org.apache.hadoop.mapred.TextInputFormat</class> 
           </void> 
@@ -825,13 +940,10 @@
             </void> 
             <void method="put"> 
              <string>location</string> 
-             <string>file:/home/athusoo/apacheprojects/hadoop-core-trunk_ws3/build/contrib/hive/ql/test/data/warehouse/src</string> 
+             <string>file:/data/zshao/trunk/VENDOR/hadoop-0.17/build/contrib/hive/ql/test/data/warehouse/src</string> 
             </void> 
            </object> 
           </void> 
-          <void property="serdeClass"> 
-           <class>org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe</class> 
-          </void> 
           <void property="serdeClassName"> 
            <string>simple_meta</string> 
           </void> 
@@ -858,7 +970,7 @@
                   <void property="conf"> 
                    <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                     <void property="dirName"> 
-                     <string>/tmp/hive-athusoo/733517198.10000.insclause-0</string> 
+                     <string>/tmp/hive-zshao/1144028705.10000.insclause-0</string> 
                     </void> 
                     <void property="tableInfo"> 
                      <object idref="tableDesc0"/> 
@@ -875,7 +987,7 @@
                          <string>0</string> 
                         </void> 
                         <void property="type"> 
-                         <object idref="TypeInfo4"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -885,7 +997,7 @@
                          <string>1</string> 
                         </void> 
                         <void property="type"> 
-                         <object idref="TypeInfo5"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -895,7 +1007,7 @@
                          <string>2</string> 
                         </void> 
                         <void property="type"> 
-                         <object idref="TypeInfo0"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -905,7 +1017,7 @@
                          <string>3</string> 
                         </void> 
                         <void property="type"> 
-                         <object idref="TypeInfo1"/> 
+                         <object idref="PrimitiveTypeInfo0"/> 
                         </void> 
                        </object> 
                       </void> 
@@ -927,7 +1039,7 @@
                      <string>0</string> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo4"/> 
+                     <object idref="PrimitiveTypeInfo0"/> 
                     </void> 
                    </object> 
                   </void> 
@@ -937,7 +1049,7 @@
                      <string>1</string> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo5"/> 
+                     <object idref="PrimitiveTypeInfo0"/> 
                     </void> 
                    </object> 
                   </void> 
@@ -947,7 +1059,7 @@
                      <string>2</string> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo0"/> 
+                     <object idref="PrimitiveTypeInfo0"/> 
                     </void> 
                    </object> 
                   </void> 
@@ -957,7 +1069,7 @@
                      <string>3</string> 
                     </void> 
                     <void property="typeInfo"> 
-                     <object idref="TypeInfo1"/> 
+                     <object idref="PrimitiveTypeInfo0"/> 
                     </void> 
                    </object> 
                   </void> 
@@ -986,7 +1098,7 @@
                  <string>0</string> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo4"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -996,7 +1108,7 @@
                  <string>1</string> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo5"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1006,7 +1118,7 @@
                  <string>2</string> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo0"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1016,7 +1128,7 @@
                  <string>3</string> 
                 </void> 
                 <void property="typeInfo"> 
-                 <object idref="TypeInfo1"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1034,7 +1146,7 @@
                  <string>0</string> 
                 </void> 
                 <void property="type"> 
-                 <object idref="TypeInfo4"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1044,7 +1156,7 @@
                  <string>1</string> 
                 </void> 
                 <void property="type"> 
-                 <object idref="TypeInfo5"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1054,7 +1166,7 @@
                  <string>2</string> 
                 </void> 
                 <void property="type"> 
-                 <object idref="TypeInfo0"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1064,7 +1176,7 @@
                  <string>3</string> 
                 </void> 
                 <void property="type"> 
-                 <object idref="TypeInfo1"/> 
+                 <object idref="PrimitiveTypeInfo0"/> 
                 </void> 
                </object> 
               </void> 
@@ -1103,7 +1215,7 @@
                <string>VALUE.0</string> 
               </void> 
               <void property="typeInfo"> 
-               <object idref="TypeInfo4"/> 
+               <object idref="PrimitiveTypeInfo0"/> 
               </void> 
              </object> 
             </void> 
@@ -1113,7 +1225,7 @@
                <string>VALUE.1</string> 
               </void> 
               <void property="typeInfo"> 
-               <object idref="TypeInfo5"/> 
+               <object idref="PrimitiveTypeInfo0"/> 
               </void> 
              </object> 
             </void> 
@@ -1128,7 +1240,7 @@
                <string>VALUE.0</string> 
               </void> 
               <void property="typeInfo"> 
-               <object idref="TypeInfo0"/> 
+               <object idref="PrimitiveTypeInfo0"/> 
               </void> 
              </object> 
             </void> 
@@ -1138,7 +1250,7 @@
                <string>VALUE.1</string> 
               </void> 
               <void property="typeInfo"> 
-               <object idref="TypeInfo1"/> 
+               <object idref="PrimitiveTypeInfo0"/> 
               </void> 
              </object> 
             </void> 
@@ -1158,7 +1270,7 @@
              <string>0</string> 
             </void> 
             <void property="type"> 
-             <object idref="TypeInfo4"/> 
+             <object idref="PrimitiveTypeInfo0"/> 
             </void> 
            </object> 
           </void> 
@@ -1168,7 +1280,7 @@
              <string>1</string> 
             </void> 
             <void property="type"> 
-             <object idref="TypeInfo5"/> 
+             <object idref="PrimitiveTypeInfo0"/> 
             </void> 
            </object> 
           </void> 
@@ -1178,7 +1290,7 @@
              <string>2</string> 
             </void> 
             <void property="type"> 
-             <object idref="TypeInfo0"/> 
+             <object idref="PrimitiveTypeInfo0"/> 
             </void> 
            </object> 
           </void> 
@@ -1188,7 +1300,7 @@
              <string>3</string> 
             </void> 
             <void property="type"> 
-             <object idref="TypeInfo1"/> 
+             <object idref="PrimitiveTypeInfo0"/> 
             </void> 
            </object> 
           </void>