You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2014/10/14 21:07:05 UTC

svn commit: r1631841 [38/42] - in /hive/branches/llap: ./ accumulo-handler/ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/ accumulo-handler/src/java/org/apache/hadoop/hiv...

Modified: hive/branches/llap/ql/src/test/results/compiler/plan/input7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/input7.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/input7.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/input7.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
                          </object> 
                         </void> 
                         <void property="tableDesc"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
+                         <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                           <void property="inputFileFormatClass"> 
                            <class>org.apache.hadoop.mapred.TextInputFormat</class> 
                           </void> 
@@ -432,66 +432,7 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="table"> 
-                   <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
-                    <void property="inputFileFormatClass"> 
-                     <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                    </void> 
-                    <void property="outputFileFormatClass"> 
-                     <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class> 
-                    </void> 
-                    <void property="properties"> 
-                     <object class="java.util.Properties"> 
-                      <void method="put"> 
-                       <string>name</string> 
-                       <string>default.dest1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.types</string> 
-                       <string>string:string</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.ddl</string> 
-                       <string>struct dest1 { string key, string value}</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.format</string> 
-                       <string>1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns</string> 
-                       <string>key,value</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.comments</string> 
-                       <string>default<char code="#0"/>default</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>bucket_count</string> 
-                       <string>-1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.lib</string> 
-                       <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.inputformat</string> 
-                       <string>org.apache.hadoop.mapred.TextInputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.outputformat</string> 
-                       <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>location</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                      <void method="put"> 
-                       <string>transient_lastDdlTime</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                     </object> 
-                    </void> 
-                   </object> 
+                   <object idref="TableDesc0"/> 
                   </void> 
                  </object> 
                 </void> 

Modified: hive/branches/llap/ql/src/test/results/compiler/plan/input9.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/input9.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/input9.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
                          </object> 
                         </void> 
                         <void property="tableDesc"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
+                         <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                           <void property="inputFileFormatClass"> 
                            <class>org.apache.hadoop.mapred.TextInputFormat</class> 
                           </void> 
@@ -432,66 +432,7 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="table"> 
-                   <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
-                    <void property="inputFileFormatClass"> 
-                     <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                    </void> 
-                    <void property="outputFileFormatClass"> 
-                     <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class> 
-                    </void> 
-                    <void property="properties"> 
-                     <object class="java.util.Properties"> 
-                      <void method="put"> 
-                       <string>name</string> 
-                       <string>default.dest1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.types</string> 
-                       <string>string:string</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.ddl</string> 
-                       <string>struct dest1 { string key, string value}</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.format</string> 
-                       <string>1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns</string> 
-                       <string>key,value</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.comments</string> 
-                       <string>default<char code="#0"/>default</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>bucket_count</string> 
-                       <string>-1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.lib</string> 
-                       <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.inputformat</string> 
-                       <string>org.apache.hadoop.mapred.TextInputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.outputformat</string> 
-                       <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>location</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                      <void method="put"> 
-                       <string>transient_lastDdlTime</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                     </object> 
-                    </void> 
-                   </object> 
+                   <object idref="TableDesc0"/> 
                   </void> 
                  </object> 
                 </void> 

Modified: hive/branches/llap/ql/src/test/results/compiler/plan/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/input_part1.q.xml Tue Oct 14 19:06:45 2014
@@ -351,41 +351,35 @@
                <object class="java.util.HashMap"> 
                 <void method="put"> 
                  <string>_col3</string> 
-                 <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
-                  <void property="column"> 
+                 <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
+                  <void property="foldedFromCol"> 
                    <string>ds</string> 
                   </void> 
-                  <void property="isPartitionColOrVirtualCol"> 
-                   <boolean>true</boolean> 
-                  </void> 
-                  <void property="tabAlias"> 
-                   <string>srcpart</string> 
-                  </void> 
                   <void property="typeInfo"> 
                    <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
+                  <void property="value"> 
+                   <string>2008-04-08</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void method="put"> 
                  <string>_col2</string> 
-                 <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
-                  <void property="column"> 
+                 <object id="ExprNodeConstantDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
+                  <void property="foldedFromCol"> 
                    <string>hr</string> 
                   </void> 
-                  <void property="isPartitionColOrVirtualCol"> 
-                   <boolean>true</boolean> 
-                  </void> 
-                  <void property="tabAlias"> 
-                   <string>srcpart</string> 
-                  </void> 
                   <void property="typeInfo"> 
                    <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
+                  <void property="value"> 
+                   <string>12</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void method="put"> 
                  <string>_col1</string> 
-                 <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+                 <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                   <void property="column"> 
                    <string>value</string> 
                   </void> 
@@ -399,7 +393,7 @@
                 </void> 
                 <void method="put"> 
                  <string>_col0</string> 
-                 <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+                 <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                   <void property="column"> 
                    <string>key</string> 
                   </void> 
@@ -418,16 +412,16 @@
                 <void property="colList"> 
                  <object class="java.util.ArrayList"> 
                   <void method="add"> 
-                   <object idref="ExprNodeColumnDesc3"/> 
+                   <object idref="ExprNodeColumnDesc1"/> 
                   </void> 
                   <void method="add"> 
-                   <object idref="ExprNodeColumnDesc2"/> 
+                   <object idref="ExprNodeColumnDesc0"/> 
                   </void> 
                   <void method="add"> 
-                   <object idref="ExprNodeColumnDesc1"/> 
+                   <object idref="ExprNodeConstantDesc1"/> 
                   </void> 
                   <void method="add"> 
-                   <object idref="ExprNodeColumnDesc0"/> 
+                   <object idref="ExprNodeConstantDesc0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -634,38 +628,6 @@
                 </void> 
                </object> 
               </void> 
-              <void method="add"> 
-               <object id="ColumnInfo2" class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                <void property="internalName"> 
-                 <string>ds</string> 
-                </void> 
-                <void property="tabAlias"> 
-                 <string>srcpart</string> 
-                </void> 
-                <void property="type"> 
-                 <object idref="PrimitiveTypeInfo0"/> 
-                </void> 
-                <void property="typeName"> 
-                 <string>string</string> 
-                </void> 
-               </object> 
-              </void> 
-              <void method="add"> 
-               <object id="ColumnInfo3" class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                <void property="internalName"> 
-                 <string>hr</string> 
-                </void> 
-                <void property="tabAlias"> 
-                 <string>srcpart</string> 
-                </void> 
-                <void property="type"> 
-                 <object idref="PrimitiveTypeInfo0"/> 
-                </void> 
-                <void property="typeName"> 
-                 <string>string</string> 
-                </void> 
-               </object> 
-              </void> 
              </void> 
             </object> 
            </void> 
@@ -713,12 +675,6 @@
           <void method="add"> 
            <string>value</string> 
           </void> 
-          <void method="add"> 
-           <string>ds</string> 
-          </void> 
-          <void method="add"> 
-           <string>hr</string> 
-          </void> 
          </object> 
         </void> 
         <void property="schema"> 
@@ -731,10 +687,42 @@
             <object idref="ColumnInfo1"/> 
            </void> 
            <void method="add"> 
-            <object idref="ColumnInfo2"/> 
+            <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+             <void property="alias"> 
+              <string>ds</string> 
+             </void> 
+             <void property="internalName"> 
+              <string>ds</string> 
+             </void> 
+             <void property="tabAlias"> 
+              <string>srcpart</string> 
+             </void> 
+             <void property="type"> 
+              <object idref="PrimitiveTypeInfo0"/> 
+             </void> 
+             <void property="typeName"> 
+              <string>string</string> 
+             </void> 
+            </object> 
            </void> 
            <void method="add"> 
-            <object idref="ColumnInfo3"/> 
+            <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+             <void property="alias"> 
+              <string>hr</string> 
+             </void> 
+             <void property="internalName"> 
+              <string>hr</string> 
+             </void> 
+             <void property="tabAlias"> 
+              <string>srcpart</string> 
+             </void> 
+             <void property="type"> 
+              <object idref="PrimitiveTypeInfo0"/> 
+             </void> 
+             <void property="typeName"> 
+              <string>string</string> 
+             </void> 
+            </object> 
            </void> 
            <void method="add"> 
             <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 

Modified: hive/branches/llap/ql/src/test/results/compiler/plan/join8.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/join8.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/join8.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/join8.q.xml Tue Oct 14 19:06:45 2014
@@ -1713,18 +1713,11 @@
                 </void> 
                 <void method="put"> 
                  <string>_col2</string> 
-                 <object id="ExprNodeColumnDesc9" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
-                  <void property="column"> 
-                   <string>_col2</string> 
-                  </void> 
-                  <void property="typeInfo"> 
-                   <object idref="PrimitiveTypeInfo0"/> 
-                  </void> 
-                 </object> 
+                 <object id="ExprNodeNullDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc"/> 
                 </void> 
                 <void method="put"> 
                  <string>_col1</string> 
-                 <object id="ExprNodeColumnDesc10" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+                 <object id="ExprNodeColumnDesc9" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                   <void property="column"> 
                    <string>_col1</string> 
                   </void> 
@@ -1735,7 +1728,7 @@
                 </void> 
                 <void method="put"> 
                  <string>_col0</string> 
-                 <object id="ExprNodeColumnDesc11" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+                 <object id="ExprNodeColumnDesc10" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                   <void property="column"> 
                    <string>_col0</string> 
                   </void> 
@@ -1751,15 +1744,15 @@
                 <void property="colList"> 
                  <object class="java.util.ArrayList"> 
                   <void method="add"> 
-                   <object idref="ExprNodeColumnDesc11"/> 
-                  </void> 
-                  <void method="add"> 
                    <object idref="ExprNodeColumnDesc10"/> 
                   </void> 
                   <void method="add"> 
                    <object idref="ExprNodeColumnDesc9"/> 
                   </void> 
                   <void method="add"> 
+                   <object idref="ExprNodeNullDesc0"/> 
+                  </void> 
+                  <void method="add"> 
                    <object idref="ExprNodeColumnDesc8"/> 
                   </void> 
                  </object> 
@@ -1882,7 +1875,14 @@
                <void property="children"> 
                 <object class="java.util.ArrayList"> 
                  <void method="add"> 
-                  <object idref="ExprNodeColumnDesc9"/> 
+                  <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+                   <void property="column"> 
+                    <string>_col2</string> 
+                   </void> 
+                   <void property="typeInfo"> 
+                    <object idref="PrimitiveTypeInfo0"/> 
+                   </void> 
+                  </object> 
                  </void> 
                 </object> 
                </void> 
@@ -1975,7 +1975,7 @@
          <object class="java.util.HashMap"> 
           <void method="put"> 
            <string>_col3</string> 
-           <object id="ExprNodeColumnDesc12" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+           <object id="ExprNodeColumnDesc11" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
             <void property="column"> 
              <string>VALUE._col0</string> 
             </void> 
@@ -1986,7 +1986,7 @@
           </void> 
           <void method="put"> 
            <string>_col2</string> 
-           <object id="ExprNodeColumnDesc13" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+           <object id="ExprNodeColumnDesc12" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
             <void property="column"> 
              <string>KEY.reducesinkkey0</string> 
             </void> 
@@ -1997,7 +1997,7 @@
           </void> 
           <void method="put"> 
            <string>_col1</string> 
-           <object id="ExprNodeColumnDesc14" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+           <object id="ExprNodeColumnDesc13" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
             <void property="column"> 
              <string>VALUE._col0</string> 
             </void> 
@@ -2008,7 +2008,7 @@
           </void> 
           <void method="put"> 
            <string>_col0</string> 
-           <object id="ExprNodeColumnDesc15" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+           <object id="ExprNodeColumnDesc14" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
             <void property="column"> 
              <string>KEY.reducesinkkey0</string> 
             </void> 
@@ -2041,10 +2041,10 @@
              <byte>0</byte> 
              <object class="java.util.ArrayList"> 
               <void method="add"> 
-               <object idref="ExprNodeColumnDesc15"/> 
+               <object idref="ExprNodeColumnDesc14"/> 
               </void> 
               <void method="add"> 
-               <object idref="ExprNodeColumnDesc14"/> 
+               <object idref="ExprNodeColumnDesc13"/> 
               </void> 
              </object> 
             </void> 
@@ -2052,10 +2052,10 @@
              <byte>1</byte> 
              <object class="java.util.ArrayList"> 
               <void method="add"> 
-               <object idref="ExprNodeColumnDesc13"/> 
+               <object idref="ExprNodeColumnDesc12"/> 
               </void> 
               <void method="add"> 
-               <object idref="ExprNodeColumnDesc12"/> 
+               <object idref="ExprNodeColumnDesc11"/> 
               </void> 
              </object> 
             </void> 

Modified: hive/branches/llap/ql/src/test/results/compiler/plan/sample1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/sample1.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/sample1.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/sample1.q.xml Tue Oct 14 19:06:45 2014
@@ -351,41 +351,35 @@
                <object class="java.util.HashMap"> 
                 <void method="put"> 
                  <string>_col3</string> 
-                 <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
-                  <void property="column"> 
+                 <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
+                  <void property="foldedFromCol"> 
                    <string>hr</string> 
                   </void> 
-                  <void property="isPartitionColOrVirtualCol"> 
-                   <boolean>true</boolean> 
-                  </void> 
-                  <void property="tabAlias"> 
-                   <string>s</string> 
-                  </void> 
                   <void property="typeInfo"> 
                    <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
+                  <void property="value"> 
+                   <string>11</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void method="put"> 
                  <string>_col2</string> 
-                 <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
-                  <void property="column"> 
+                 <object id="ExprNodeConstantDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> 
+                  <void property="foldedFromCol"> 
                    <string>ds</string> 
                   </void> 
-                  <void property="isPartitionColOrVirtualCol"> 
-                   <boolean>true</boolean> 
-                  </void> 
-                  <void property="tabAlias"> 
-                   <string>s</string> 
-                  </void> 
                   <void property="typeInfo"> 
                    <object idref="PrimitiveTypeInfo0"/> 
                   </void> 
+                  <void property="value"> 
+                   <string>2008-04-08</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void method="put"> 
                  <string>_col1</string> 
-                 <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+                 <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                   <void property="column"> 
                    <string>value</string> 
                   </void> 
@@ -399,7 +393,7 @@
                 </void> 
                 <void method="put"> 
                  <string>_col0</string> 
-                 <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
+                 <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> 
                   <void property="column"> 
                    <string>key</string> 
                   </void> 
@@ -418,16 +412,16 @@
                 <void property="colList"> 
                  <object class="java.util.ArrayList"> 
                   <void method="add"> 
-                   <object idref="ExprNodeColumnDesc3"/> 
+                   <object idref="ExprNodeColumnDesc1"/> 
                   </void> 
                   <void method="add"> 
-                   <object idref="ExprNodeColumnDesc2"/> 
+                   <object idref="ExprNodeColumnDesc0"/> 
                   </void> 
                   <void method="add"> 
-                   <object idref="ExprNodeColumnDesc1"/> 
+                   <object idref="ExprNodeConstantDesc1"/> 
                   </void> 
                   <void method="add"> 
-                   <object idref="ExprNodeColumnDesc0"/> 
+                   <object idref="ExprNodeConstantDesc0"/> 
                   </void> 
                  </object> 
                 </void> 
@@ -727,38 +721,6 @@
                 </void> 
                </object> 
               </void> 
-              <void method="add"> 
-               <object id="ColumnInfo2" class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                <void property="internalName"> 
-                 <string>ds</string> 
-                </void> 
-                <void property="tabAlias"> 
-                 <string>s</string> 
-                </void> 
-                <void property="type"> 
-                 <object idref="PrimitiveTypeInfo0"/> 
-                </void> 
-                <void property="typeName"> 
-                 <string>string</string> 
-                </void> 
-               </object> 
-              </void> 
-              <void method="add"> 
-               <object id="ColumnInfo3" class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
-                <void property="internalName"> 
-                 <string>hr</string> 
-                </void> 
-                <void property="tabAlias"> 
-                 <string>s</string> 
-                </void> 
-                <void property="type"> 
-                 <object idref="PrimitiveTypeInfo0"/> 
-                </void> 
-                <void property="typeName"> 
-                 <string>string</string> 
-                </void> 
-               </object> 
-              </void> 
              </void> 
             </object> 
            </void> 
@@ -806,12 +768,6 @@
           <void method="add"> 
            <string>value</string> 
           </void> 
-          <void method="add"> 
-           <string>ds</string> 
-          </void> 
-          <void method="add"> 
-           <string>hr</string> 
-          </void> 
          </object> 
         </void> 
         <void property="schema"> 
@@ -824,10 +780,42 @@
             <object idref="ColumnInfo1"/> 
            </void> 
            <void method="add"> 
-            <object idref="ColumnInfo2"/> 
+            <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+             <void property="alias"> 
+              <string>ds</string> 
+             </void> 
+             <void property="internalName"> 
+              <string>ds</string> 
+             </void> 
+             <void property="tabAlias"> 
+              <string>s</string> 
+             </void> 
+             <void property="type"> 
+              <object idref="PrimitiveTypeInfo0"/> 
+             </void> 
+             <void property="typeName"> 
+              <string>string</string> 
+             </void> 
+            </object> 
            </void> 
            <void method="add"> 
-            <object idref="ColumnInfo3"/> 
+            <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 
+             <void property="alias"> 
+              <string>hr</string> 
+             </void> 
+             <void property="internalName"> 
+              <string>hr</string> 
+             </void> 
+             <void property="tabAlias"> 
+              <string>s</string> 
+             </void> 
+             <void property="type"> 
+              <object idref="PrimitiveTypeInfo0"/> 
+             </void> 
+             <void property="typeName"> 
+              <string>string</string> 
+             </void> 
+            </object> 
            </void> 
            <void method="add"> 
             <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo"> 

Modified: hive/branches/llap/ql/src/test/results/compiler/plan/sample2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/sample2.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/sample2.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/sample2.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
                          </object> 
                         </void> 
                         <void property="tableDesc"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
+                         <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                           <void property="inputFileFormatClass"> 
                            <class>org.apache.hadoop.mapred.TextInputFormat</class> 
                           </void> 
@@ -432,66 +432,7 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="table"> 
-                   <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
-                    <void property="inputFileFormatClass"> 
-                     <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                    </void> 
-                    <void property="outputFileFormatClass"> 
-                     <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class> 
-                    </void> 
-                    <void property="properties"> 
-                     <object class="java.util.Properties"> 
-                      <void method="put"> 
-                       <string>name</string> 
-                       <string>default.dest1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.types</string> 
-                       <string>string:string</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.ddl</string> 
-                       <string>struct dest1 { string key, string value}</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.format</string> 
-                       <string>1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns</string> 
-                       <string>key,value</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.comments</string> 
-                       <string>default<char code="#0"/>default</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>bucket_count</string> 
-                       <string>-1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.lib</string> 
-                       <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.inputformat</string> 
-                       <string>org.apache.hadoop.mapred.TextInputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.outputformat</string> 
-                       <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>location</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                      <void method="put"> 
-                       <string>transient_lastDdlTime</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                     </object> 
-                    </void> 
-                   </object> 
+                   <object idref="TableDesc0"/> 
                   </void> 
                  </object> 
                 </void> 

Modified: hive/branches/llap/ql/src/test/results/compiler/plan/sample3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/sample3.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/sample3.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/sample3.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
                          </object> 
                         </void> 
                         <void property="tableDesc"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
+                         <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                           <void property="inputFileFormatClass"> 
                            <class>org.apache.hadoop.mapred.TextInputFormat</class> 
                           </void> 
@@ -432,66 +432,7 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="table"> 
-                   <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
-                    <void property="inputFileFormatClass"> 
-                     <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                    </void> 
-                    <void property="outputFileFormatClass"> 
-                     <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class> 
-                    </void> 
-                    <void property="properties"> 
-                     <object class="java.util.Properties"> 
-                      <void method="put"> 
-                       <string>name</string> 
-                       <string>default.dest1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.types</string> 
-                       <string>string:string</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.ddl</string> 
-                       <string>struct dest1 { string key, string value}</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.format</string> 
-                       <string>1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns</string> 
-                       <string>key,value</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.comments</string> 
-                       <string>default<char code="#0"/>default</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>bucket_count</string> 
-                       <string>-1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.lib</string> 
-                       <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.inputformat</string> 
-                       <string>org.apache.hadoop.mapred.TextInputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.outputformat</string> 
-                       <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>location</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                      <void method="put"> 
-                       <string>transient_lastDdlTime</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                     </object> 
-                    </void> 
-                   </object> 
+                   <object idref="TableDesc0"/> 
                   </void> 
                  </object> 
                 </void> 

Modified: hive/branches/llap/ql/src/test/results/compiler/plan/sample4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/sample4.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/sample4.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/sample4.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
                          </object> 
                         </void> 
                         <void property="tableDesc"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
+                         <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                           <void property="inputFileFormatClass"> 
                            <class>org.apache.hadoop.mapred.TextInputFormat</class> 
                           </void> 
@@ -432,66 +432,7 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="table"> 
-                   <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
-                    <void property="inputFileFormatClass"> 
-                     <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                    </void> 
-                    <void property="outputFileFormatClass"> 
-                     <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class> 
-                    </void> 
-                    <void property="properties"> 
-                     <object class="java.util.Properties"> 
-                      <void method="put"> 
-                       <string>name</string> 
-                       <string>default.dest1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.types</string> 
-                       <string>string:string</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.ddl</string> 
-                       <string>struct dest1 { string key, string value}</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.format</string> 
-                       <string>1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns</string> 
-                       <string>key,value</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.comments</string> 
-                       <string>default<char code="#0"/>default</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>bucket_count</string> 
-                       <string>-1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.lib</string> 
-                       <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.inputformat</string> 
-                       <string>org.apache.hadoop.mapred.TextInputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.outputformat</string> 
-                       <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>location</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                      <void method="put"> 
-                       <string>transient_lastDdlTime</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                     </object> 
-                    </void> 
-                   </object> 
+                   <object idref="TableDesc0"/> 
                   </void> 
                  </object> 
                 </void> 

Modified: hive/branches/llap/ql/src/test/results/compiler/plan/sample5.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/sample5.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/sample5.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/sample5.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
                          </object> 
                         </void> 
                         <void property="tableDesc"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
+                         <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                           <void property="inputFileFormatClass"> 
                            <class>org.apache.hadoop.mapred.TextInputFormat</class> 
                           </void> 
@@ -432,66 +432,7 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="table"> 
-                   <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
-                    <void property="inputFileFormatClass"> 
-                     <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                    </void> 
-                    <void property="outputFileFormatClass"> 
-                     <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class> 
-                    </void> 
-                    <void property="properties"> 
-                     <object class="java.util.Properties"> 
-                      <void method="put"> 
-                       <string>name</string> 
-                       <string>default.dest1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.types</string> 
-                       <string>string:string</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.ddl</string> 
-                       <string>struct dest1 { string key, string value}</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.format</string> 
-                       <string>1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns</string> 
-                       <string>key,value</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.comments</string> 
-                       <string>default<char code="#0"/>default</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>bucket_count</string> 
-                       <string>-1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.lib</string> 
-                       <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.inputformat</string> 
-                       <string>org.apache.hadoop.mapred.TextInputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.outputformat</string> 
-                       <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>location</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                      <void method="put"> 
-                       <string>transient_lastDdlTime</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                     </object> 
-                    </void> 
-                   </object> 
+                   <object idref="TableDesc0"/> 
                   </void> 
                  </object> 
                 </void> 

Modified: hive/branches/llap/ql/src/test/results/compiler/plan/sample6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/sample6.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/sample6.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/sample6.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
                          </object> 
                         </void> 
                         <void property="tableDesc"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
+                         <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                           <void property="inputFileFormatClass"> 
                            <class>org.apache.hadoop.mapred.TextInputFormat</class> 
                           </void> 
@@ -432,66 +432,7 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="table"> 
-                   <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
-                    <void property="inputFileFormatClass"> 
-                     <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                    </void> 
-                    <void property="outputFileFormatClass"> 
-                     <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class> 
-                    </void> 
-                    <void property="properties"> 
-                     <object class="java.util.Properties"> 
-                      <void method="put"> 
-                       <string>name</string> 
-                       <string>default.dest1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.types</string> 
-                       <string>string:string</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.ddl</string> 
-                       <string>struct dest1 { string key, string value}</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.format</string> 
-                       <string>1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns</string> 
-                       <string>key,value</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.comments</string> 
-                       <string>default<char code="#0"/>default</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>bucket_count</string> 
-                       <string>-1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.lib</string> 
-                       <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.inputformat</string> 
-                       <string>org.apache.hadoop.mapred.TextInputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.outputformat</string> 
-                       <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>location</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                      <void method="put"> 
-                       <string>transient_lastDdlTime</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                     </object> 
-                    </void> 
-                   </object> 
+                   <object idref="TableDesc0"/> 
                   </void> 
                  </object> 
                 </void> 

Modified: hive/branches/llap/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/sample7.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/sample7.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
                          </object> 
                         </void> 
                         <void property="tableDesc"> 
-                         <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
+                         <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                           <void property="inputFileFormatClass"> 
                            <class>org.apache.hadoop.mapred.TextInputFormat</class> 
                           </void> 
@@ -432,66 +432,7 @@
                    <boolean>true</boolean> 
                   </void> 
                   <void property="table"> 
-                   <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
-                    <void property="inputFileFormatClass"> 
-                     <class>org.apache.hadoop.mapred.TextInputFormat</class> 
-                    </void> 
-                    <void property="outputFileFormatClass"> 
-                     <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class> 
-                    </void> 
-                    <void property="properties"> 
-                     <object class="java.util.Properties"> 
-                      <void method="put"> 
-                       <string>name</string> 
-                       <string>default.dest1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.types</string> 
-                       <string>string:string</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.ddl</string> 
-                       <string>struct dest1 { string key, string value}</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.format</string> 
-                       <string>1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns</string> 
-                       <string>key,value</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>columns.comments</string> 
-                       <string>default<char code="#0"/>default</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>bucket_count</string> 
-                       <string>-1</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>serialization.lib</string> 
-                       <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.inputformat</string> 
-                       <string>org.apache.hadoop.mapred.TextInputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>file.outputformat</string> 
-                       <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> 
-                      </void> 
-                      <void method="put"> 
-                       <string>location</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                      <void method="put"> 
-                       <string>transient_lastDdlTime</string> 
-                       #### A masked pattern was here #### 
-                      </void> 
-                     </object> 
-                    </void> 
-                   </object> 
+                   <object idref="TableDesc0"/> 
                   </void> 
                  </object> 
                 </void>