Modified: hive/branches/spark/ql/src/test/results/compiler/plan/cast1.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/cast1.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/cast1.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/cast1.q.xml Mon Oct 6 04:00:39 2014 @@ -378,282 +378,79 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col6</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> - <void property="children"> - <object class="java.util.ArrayList"> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo2"/> - </void> - <void property="value"> - <boolean>true</boolean> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFToInteger</string> - </void> - <void property="udfName"> - <string>UDFToInteger</string> - </void> - </object> - </void> + <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> </void> + <void property="value"> + <int>1</int> + </void> </object> </void> <void method="put"> <string>_col5</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> - <void property="children"> - <object class="java.util.ArrayList"> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <int>1</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFToBoolean</string> - </void> - <void property="udfName"> - <string>UDFToBoolean</string> - </void> - </object> - </void> + <object id="ExprNodeConstantDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> <void property="typeInfo"> <object idref="PrimitiveTypeInfo2"/> </void> + <void property="value"> + <boolean>true</boolean> + </void> </object> </void> <void method="put"> <string>_col4</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> - <void property="children"> - <object class="java.util.ArrayList"> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <int>3</int> - </void> - </object> - </void> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> - <void property="children"> - <object class="java.util.ArrayList"> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <double>2.0</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFToInteger</string> - </void> - <void property="udfName"> - <string>UDFToInteger</string> - </void> - </object> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPlus"> - <void property="confLookupNeeded"> - <boolean>false</boolean> - </void> - </object> - </void> + <object id="ExprNodeConstantDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> </void> + <void property="value"> + <int>5</int> + </void> </object> </void> <void method="put"> <string>_col3</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> - <void property="children"> - <object class="java.util.ArrayList"> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <double>3.0</double> - </void> - </object> - </void> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <double>2.0</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPlus"> - <void property="confLookupNeeded"> - <boolean>false</boolean> - </void> - </object> - </void> + <object id="ExprNodeConstantDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> </void> + <void property="value"> + <double>5.0</double> + </void> </object> </void> <void method="put"> <string>_col2</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> - <void property="children"> - <object class="java.util.ArrayList"> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <int>3</int> - </void> - </object> - </void> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <double>2.0</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPlus"> - <void property="confLookupNeeded"> - <boolean>false</boolean> - </void> - </object> - </void> + <object id="ExprNodeConstantDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> </void> + <void property="value"> + <double>5.0</double> + </void> </object> </void> <void method="put"> <string>_col1</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> - <void property="children"> - <object class="java.util.ArrayList"> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <double>3.0</double> - </void> - </object> - </void> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <int>2</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPlus"> - <void property="confLookupNeeded"> - <boolean>false</boolean> - </void> - </object> - </void> + <object id="ExprNodeConstantDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> </void> + <void property="value"> + <double>5.0</double> + </void> </object> </void> <void method="put"> <string>_col0</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> - <void property="children"> - <object class="java.util.ArrayList"> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <int>3</int> - </void> - </object> - </void> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <int>2</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPlus"> - <void property="confLookupNeeded"> - <boolean>false</boolean> - </void> - </object> - </void> + <object id="ExprNodeConstantDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> </void> + <void property="value"> + <int>5</int> + </void> </object> </void> </object> @@ -663,74 +460,25 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <int>5</int> - </void> - </object> - </void> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <double>5.0</double> - </void> - </object> - </void> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <double>5.0</double> - </void> - </object> - </void> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <double>5.0</double> - </void> - </object> - </void> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <int>5</int> - </void> - </object> - </void> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo2"/> - </void> - <void property="value"> - <boolean>true</boolean> - </void> - </object> - </void> - <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <int>1</int> - </void> - </object> + <object idref="ExprNodeConstantDesc6"/> + </void> + <void method="add"> + <object idref="ExprNodeConstantDesc5"/> + </void> + <void method="add"> + <object idref="ExprNodeConstantDesc4"/> + </void> + <void method="add"> + <object idref="ExprNodeConstantDesc3"/> + </void> + <void method="add"> + <object idref="ExprNodeConstantDesc2"/> + </void> + <void method="add"> + <object idref="ExprNodeConstantDesc1"/> + </void> + <void method="add"> + <object idref="ExprNodeConstantDesc0"/> </void> </object> </void>
Modified: hive/branches/spark/ql/src/test/results/compiler/plan/groupby1.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/groupby1.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/groupby1.q.xml Mon Oct 6 04:00:39 2014 @@ -732,7 +732,7 @@ </void> <void method="put"> <string>value</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>value</string> </void> @@ -790,7 +790,7 @@ </void> <void method="put"> <string>key</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>key</string> </void> @@ -809,30 +809,10 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> - <void property="column"> - <string>key</string> - </void> - <void property="tabAlias"> - <string>src</string> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> + <object idref="ExprNodeColumnDesc4"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> - <void property="column"> - <string>value</string> - </void> - <void property="tabAlias"> - <string>src</string> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> + <object idref="ExprNodeColumnDesc3"/> </void> </object> </void> @@ -1233,7 +1213,7 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col1</string> - <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>_col1</string> </void> @@ -1247,7 +1227,7 @@ </void> <void method="put"> <string>_col0</string> - <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>_col0</string> </void> @@ -1266,10 +1246,10 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="ExprNodeColumnDesc4"/> + <object idref="ExprNodeColumnDesc6"/> </void> <void method="add"> - <object idref="ExprNodeColumnDesc3"/> + <object idref="ExprNodeColumnDesc5"/> </void> </object> </void> @@ -1335,7 +1315,7 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col0</string> - <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>KEY._col0</string> </void> @@ -1387,7 +1367,7 @@ <void property="keys"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="ExprNodeColumnDesc5"/> + <object idref="ExprNodeColumnDesc7"/> </void> </object> </void> Modified: hive/branches/spark/ql/src/test/results/compiler/plan/groupby2.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/groupby2.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/groupby2.q.xml Mon Oct 6 04:00:39 2014 @@ -819,7 +819,7 @@ </void> <void method="put"> <string>value</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>value</string> </void> @@ -877,7 +877,7 @@ </void> <void method="put"> <string>key</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>key</string> </void> @@ -896,30 +896,10 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> - <void property="column"> - <string>key</string> - </void> - <void property="tabAlias"> - <string>src</string> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> + <object idref="ExprNodeColumnDesc4"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> - <void property="column"> - <string>value</string> - </void> - <void property="tabAlias"> - <string>src</string> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> + <object idref="ExprNodeColumnDesc3"/> </void> </object> </void> @@ -1397,7 +1377,7 @@ </void> <void method="put"> <string>_col1</string> - <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>_col1</string> </void> @@ -1411,7 +1391,7 @@ </void> <void method="put"> <string>_col0</string> - <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>_col0</string> </void> @@ -1430,10 +1410,10 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="ExprNodeColumnDesc4"/> + <object idref="ExprNodeColumnDesc6"/> </void> <void method="add"> - <object idref="ExprNodeColumnDesc3"/> + <object idref="ExprNodeColumnDesc5"/> </void> <void method="add"> <object idref="ExprNodeGenericFuncDesc2"/> @@ -1524,7 +1504,7 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col0</string> - <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>KEY._col0</string> </void> @@ -1611,7 +1591,7 @@ <void property="keys"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="ExprNodeColumnDesc5"/> + <object idref="ExprNodeColumnDesc7"/> </void> </object> </void> Modified: hive/branches/spark/ql/src/test/results/compiler/plan/groupby3.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/groupby3.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/groupby3.q.xml Mon Oct 6 04:00:39 2014 @@ -1065,7 +1065,7 @@ </void> <void method="put"> <string>value</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>value</string> </void> @@ -1142,17 +1142,7 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> - <void property="column"> - <string>value</string> - </void> - <void property="tabAlias"> - <string>src</string> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> + <object idref="ExprNodeColumnDesc5"/> </void> </object> </void> @@ -1606,7 +1596,7 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col4</string> - <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>_col4</string> </void> @@ -1620,7 +1610,7 @@ </void> <void method="put"> <string>_col3</string> - <object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>_col3</string> </void> @@ -1634,7 +1624,7 @@ </void> <void method="put"> <string>_col2</string> - <object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc8" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>_col2</string> </void> @@ -1648,7 +1638,7 @@ </void> <void method="put"> <string>_col1</string> - <object id="ExprNodeColumnDesc8" 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> @@ -1662,7 +1652,7 @@ </void> <void method="put"> <string>_col0</string> - <object id="ExprNodeColumnDesc9" 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> @@ -1681,6 +1671,9 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> + <object idref="ExprNodeColumnDesc10"/> + </void> + <void method="add"> <object idref="ExprNodeColumnDesc9"/> </void> <void method="add"> @@ -1692,9 +1685,6 @@ <void method="add"> <object idref="ExprNodeColumnDesc6"/> </void> - <void method="add"> - <object idref="ExprNodeColumnDesc5"/> - </void> </object> </void> <void property="outputColumnNames"> Modified: hive/branches/spark/ql/src/test/results/compiler/plan/groupby4.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/groupby4.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/groupby4.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/groupby4.q.xml Mon Oct 6 04:00:39 2014 @@ -561,7 +561,7 @@ </void> <void method="put"> <string>key</string> - <object 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> @@ -580,17 +580,7 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> - <void property="column"> - <string>key</string> - </void> - <void property="tabAlias"> - <string>src</string> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> + <object idref="ExprNodeColumnDesc1"/> </void> </object> </void> @@ -980,7 +970,7 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col0</string> - <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>_col0</string> </void> @@ -999,7 +989,7 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="ExprNodeColumnDesc1"/> + <object idref="ExprNodeColumnDesc2"/> </void> </object> </void> @@ -1049,7 +1039,7 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col0</string> - <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>KEY._col0</string> </void> @@ -1071,7 +1061,7 @@ <void property="keys"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="ExprNodeColumnDesc2"/> + <object idref="ExprNodeColumnDesc3"/> </void> </object> </void> Modified: hive/branches/spark/ql/src/test/results/compiler/plan/groupby5.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/groupby5.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/groupby5.q.xml Mon Oct 6 04:00:39 2014 @@ -584,7 +584,7 @@ </void> <void method="put"> <string>value</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>value</string> </void> @@ -642,7 +642,7 @@ </void> <void method="put"> <string>key</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>key</string> </void> @@ -661,30 +661,10 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> - <void property="column"> - <string>key</string> - </void> - <void property="tabAlias"> - <string>src</string> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> + <object idref="ExprNodeColumnDesc4"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> - <void property="column"> - <string>value</string> - </void> - <void property="tabAlias"> - <string>src</string> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> + <object idref="ExprNodeColumnDesc3"/> </void> </object> </void> @@ -1105,7 +1085,7 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col1</string> - <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>_col1</string> </void> @@ -1119,7 +1099,7 @@ </void> <void method="put"> <string>_col0</string> - <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>_col0</string> </void> @@ -1138,10 +1118,10 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="ExprNodeColumnDesc4"/> + <object idref="ExprNodeColumnDesc6"/> </void> <void method="add"> - <object idref="ExprNodeColumnDesc3"/> + <object idref="ExprNodeColumnDesc5"/> </void> </object> </void> @@ -1213,7 +1193,7 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col0</string> - <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>KEY._col0</string> </void> @@ -1265,7 +1245,7 @@ <void property="keys"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="ExprNodeColumnDesc5"/> + <object idref="ExprNodeColumnDesc7"/> </void> </object> </void> Modified: hive/branches/spark/ql/src/test/results/compiler/plan/groupby6.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/groupby6.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/groupby6.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/groupby6.q.xml Mon Oct 6 04:00:39 2014 @@ -503,7 +503,7 @@ </void> <void method="put"> <string>value</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>value</string> </void> @@ -580,17 +580,7 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> - <void property="column"> - <string>value</string> - </void> - <void property="tabAlias"> - <string>src</string> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> + <object idref="ExprNodeColumnDesc1"/> </void> </object> </void> @@ -980,7 +970,7 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col0</string> - <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>_col0</string> </void> @@ -999,7 +989,7 @@ <void property="colList"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="ExprNodeColumnDesc1"/> + <object idref="ExprNodeColumnDesc2"/> </void> </object> </void> @@ -1049,7 +1039,7 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col0</string> - <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> <void property="column"> <string>KEY._col0</string> </void> @@ -1071,7 +1061,7 @@ <void property="keys"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="ExprNodeColumnDesc2"/> + <object idref="ExprNodeColumnDesc3"/> </void> </object> </void> Modified: hive/branches/spark/ql/src/test/results/compiler/plan/input1.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/input1.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/input1.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/input1.q.xml Mon Oct 6 04:00:39 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/spark/ql/src/test/results/compiler/plan/input2.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/input2.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/input2.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/input2.q.xml Mon Oct 6 04:00:39 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/spark/ql/src/test/results/compiler/plan/input3.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/input3.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/input3.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/input3.q.xml Mon Oct 6 04:00:39 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> @@ -881,7 +822,7 @@ </object> </void> <void property="tableDesc"> - <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> + <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc"> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -979,66 +920,7 @@ <boolean>true</boolean> </void> <void property="table"> - <object id="TableDesc1" 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.dest2</string> - </void> - <void method="put"> - <string>columns.types</string> - <string>string:string</string> - </void> - <void method="put"> - <string>serialization.ddl</string> - <string>struct dest2 { 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="TableDesc1"/> </void> </object> </void> @@ -1440,7 +1322,7 @@ </object> </void> <void property="tableDesc"> - <object class="org.apache.hadoop.hive.ql.plan.TableDesc"> + <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc"> <void property="inputFileFormatClass"> <class>org.apache.hadoop.mapred.TextInputFormat</class> </void> @@ -1547,70 +1429,7 @@ <boolean>true</boolean> </void> <void property="table"> - <object id="TableDesc2" 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.dest3</string> - </void> - <void method="put"> - <string>columns.types</string> - <string>string:string</string> - </void> - <void method="put"> - <string>serialization.ddl</string> - <string>struct dest3 { 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>partition_columns.types</string> - <string>string:string</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="TableDesc2"/> </void> </object> </void> Modified: hive/branches/spark/ql/src/test/results/compiler/plan/input6.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/input6.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/input6.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/input6.q.xml Mon Oct 6 04:00:39 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/spark/ql/src/test/results/compiler/plan/input7.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/input7.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/input7.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/input7.q.xml Mon Oct 6 04:00:39 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/spark/ql/src/test/results/compiler/plan/input9.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/input9.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/input9.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/input9.q.xml Mon Oct 6 04:00:39 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/spark/ql/src/test/results/compiler/plan/join8.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/join8.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/join8.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/join8.q.xml Mon Oct 6 04:00:39 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/spark/ql/src/test/results/compiler/plan/sample2.q.xml URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/plan/sample2.q.xml?rev=1629563&r1=1629562&r2=1629563&view=diff ============================================================================== --- hive/branches/spark/ql/src/test/results/compiler/plan/sample2.q.xml (original) +++ hive/branches/spark/ql/src/test/results/compiler/plan/sample2.q.xml Mon Oct 6 04:00:39 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>
