Modified: hive/branches/llap/ql/src/test/results/compiler/plan/udf4.q.xml URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/udf4.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff ============================================================================== --- hive/branches/llap/ql/src/test/results/compiler/plan/udf4.q.xml (original) +++ hive/branches/llap/ql/src/test/results/compiler/plan/udf4.q.xml Tue Oct 14 19:06:45 2014 @@ -547,290 +547,118 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col8</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"> - <double>0.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.UDFSqrt</string> - </void> - <void property="udfName"> - <string>sqrt</string> - </void> - </object> + <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>sqrt(0.0)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> </void> + <void property="value"> + <double>0.0</double> + </void> </object> </void> <void method="put"> <string>_col7</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.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"> - <double>1.0</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </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.UDFSqrt</string> - </void> - <void property="udfName"> - <string>sqrt</string> - </void> - </object> - </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>_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="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <double>1.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.UDFSqrt</string> - </void> - <void property="udfName"> - <string>sqrt</string> - </void> - </object> + <object id="ExprNodeConstantDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>sqrt(1.0)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> </void> + <void property="value"> + <double>1.0</double> + </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.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"> - <double>1.5</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFFloor"/> + <object id="ExprNodeConstantDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>floor((- 1.5))</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> </void> + <void property="value"> + <long>-2</long> + </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"> - <double>1.5</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFFloor"/> + <object id="ExprNodeConstantDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>floor(1.5)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> </void> + <void property="value"> + <long>1</long> + </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="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <double>1.0</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFFloor"/> + <object id="ExprNodeConstantDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>floor(1.0)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> </void> + <void property="value"> + <long>1</long> + </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.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"> - <double>1.5</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFRound"/> + <object id="ExprNodeConstantDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>round((- 1.5))</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> </void> + <void property="value"> + <double>-2.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="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <double>1.5</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFRound"/> + <object id="ExprNodeConstantDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>round(1.5)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> </void> + <void property="value"> + <double>2.0</double> + </void> </object> </void> <void method="put"> <string>_col9</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"> - <double>1.0</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFCeil"/> + <object id="ExprNodeConstantDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>ceil(1.0)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> </void> + <void property="value"> + <long>1</long> + </void> </object> </void> <void method="put"> @@ -867,213 +695,91 @@ </void> <void method="put"> <string>_col12</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"> - <double>1.0</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFCeil"/> + <object id="ExprNodeConstantDesc8" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>ceil(1.0)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> </void> + <void property="value"> + <long>1</long> + </void> </object> </void> <void method="put"> <string>_col11</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.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"> - <double>1.5</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFCeil"/> + <object id="ExprNodeConstantDesc9" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>ceil((- 1.5))</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> </void> + <void property="value"> + <long>-1</long> + </void> </object> </void> <void method="put"> <string>_col10</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"> - <double>1.5</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFCeil"/> + <object id="ExprNodeConstantDesc10" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>ceil(1.5)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> </void> + <void property="value"> + <long>2</long> + </void> </object> </void> <void method="put"> <string>_col17</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"> - <int>1</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="PrimitiveTypeInfo2"/> - </void> - <void property="value"> - <int>2</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo2"/> - </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> + <object id="ExprNodeConstantDesc11" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>(1 + (- 2))</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo2"/> </void> + <void property="value"> + <int>-1</int> + </void> </object> </void> <void method="put"> <string>_col16</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"> - <int>1</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"> - <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> + <object id="ExprNodeConstantDesc12" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>(1 + 2)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo2"/> </void> + <void property="value"> + <int>3</int> + </void> </object> </void> <void method="put"> <string>_col15</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"> - <int>3</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNegative"/> + <object id="ExprNodeConstantDesc13" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>(- 3)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo2"/> </void> + <void property="value"> + <int>-3</int> + </void> </object> </void> <void method="put"> <string>_col14</string> - <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <object id="ExprNodeConstantDesc14" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> <void property="typeInfo"> <object idref="PrimitiveTypeInfo2"/> </void> @@ -1084,62 +790,30 @@ </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"> - <double>1.0</double> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFRound"/> + <object id="ExprNodeConstantDesc15" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>round(1.0)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> </void> + <void property="value"> + <double>1.0</double> + </void> </object> </void> <void method="put"> <string>_col18</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"> - <int>1</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge"> - <void property="operator"> - <boolean>true</boolean> - </void> - <void property="udfClassName"> - <string>org.apache.hadoop.hive.ql.udf.UDFOPBitNot</string> - </void> - <void property="udfName"> - <string>~</string> - </void> - </object> + <object id="ExprNodeConstantDesc16" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>(~ 1)</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo2"/> </void> + <void property="value"> + <int>-2</int> + </void> </object> </void> </object> @@ -1149,173 +823,61 @@ <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"> - <double>1.0</double> - </void> - </object> + <object idref="ExprNodeConstantDesc15"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <double>2.0</double> - </void> - </object> + <object idref="ExprNodeConstantDesc6"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <double>-2.0</double> - </void> - </object> + <object idref="ExprNodeConstantDesc5"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <long>1</long> - </void> - </object> + <object idref="ExprNodeConstantDesc4"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <long>1</long> - </void> - </object> + <object idref="ExprNodeConstantDesc3"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <long>-2</long> - </void> - </object> + <object idref="ExprNodeConstantDesc2"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <double>1.0</double> - </void> - </object> + <object idref="ExprNodeConstantDesc1"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc"/> + <object idref="ExprNodeNullDesc0"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <double>0.0</double> - </void> - </object> + <object idref="ExprNodeConstantDesc0"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <long>1</long> - </void> - </object> + <object idref="ExprNodeConstantDesc7"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <long>2</long> - </void> - </object> + <object idref="ExprNodeConstantDesc10"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <long>-1</long> - </void> - </object> + <object idref="ExprNodeConstantDesc9"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <long>1</long> - </void> - </object> + <object idref="ExprNodeConstantDesc8"/> </void> <void method="add"> <object idref="ExprNodeGenericFuncDesc0"/> </void> <void method="add"> - <object idref="ExprNodeConstantDesc0"/> + <object idref="ExprNodeConstantDesc14"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo2"/> - </void> - <void property="value"> - <int>-3</int> - </void> - </object> + <object idref="ExprNodeConstantDesc13"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo2"/> - </void> - <void property="value"> - <int>3</int> - </void> - </object> + <object idref="ExprNodeConstantDesc12"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo2"/> - </void> - <void property="value"> - <int>-1</int> - </void> - </object> + <object idref="ExprNodeConstantDesc11"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo2"/> - </void> - <void property="value"> - <int>-2</int> - </void> - </object> + <object idref="ExprNodeConstantDesc16"/> </void> </object> </void>
Modified: hive/branches/llap/ql/src/test/results/compiler/plan/udf6.q.xml URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/udf6.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff ============================================================================== --- hive/branches/llap/ql/src/test/results/compiler/plan/udf6.q.xml (original) +++ hive/branches/llap/ql/src/test/results/compiler/plan/udf6.q.xml Tue Oct 14 19:06:45 2014 @@ -215,7 +215,7 @@ </void> <void method="put"> <string>columns.types</string> - <string>string:int</string> + <string>string:double</string> </void> <void method="put"> <string>escape.delim</string> @@ -272,12 +272,12 @@ <void property="type"> <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> <void property="typeName"> - <string>int</string> + <string>double</string> </void> </object> </void> <void property="typeName"> - <string>int</string> + <string>double</string> </void> </object> </void> @@ -291,47 +291,44 @@ <object class="java.util.HashMap"> <void method="put"> <string>_col1</string> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc"> + <object id="ExprNodeGenericFuncDesc0" 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 class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> + <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> <void property="typeName"> - <string>boolean</string> + <string>int</string> </void> </object> </void> <void property="value"> - <boolean>true</boolean> + <int>1</int> </void> </object> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> + <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc"> + <void property="column"> + <string>key</string> </void> - <void property="value"> - <int>1</int> + <void property="tabAlias"> + <string>src</string> </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"> - <int>2</int> + <object idref="PrimitiveTypeInfo0"/> </void> </object> </void> </object> </void> <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFIf"/> + <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPlus"> + <void property="confLookupNeeded"> + <boolean>false</boolean> + </void> + </object> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo1"/> @@ -340,37 +337,16 @@ </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"> - <string>a</string> - </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"> - <string>b</string> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFConcat"/> + <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>concat('a', 'b')</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> </void> + <void property="value"> + <string>ab</string> + </void> </object> </void> </object> @@ -380,24 +356,10 @@ <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"> - <string>ab</string> - </void> - </object> + <object idref="ExprNodeConstantDesc0"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </void> - <void property="value"> - <int>1</int> - </void> - </object> + <object idref="ExprNodeGenericFuncDesc0"/> </void> </object> </void> @@ -452,7 +414,7 @@ <object idref="PrimitiveTypeInfo1"/> </void> <void property="typeName"> - <string>int</string> + <string>double</string> </void> </object> </void> @@ -468,10 +430,18 @@ <string>src</string> </void> <void property="neededColumnIDs"> - <object class="java.util.ArrayList"/> + <object class="java.util.ArrayList"> + <void method="add"> + <int>0</int> + </void> + </object> </void> <void property="neededColumns"> - <object class="java.util.ArrayList"/> + <object class="java.util.ArrayList"> + <void method="add"> + <string>key</string> + </void> + </object> </void> <void property="virtualCols"> <object class="java.util.ArrayList"/> @@ -482,7 +452,11 @@ <string>TS_0</string> </void> <void property="referencedColumns"> - <object class="java.util.ArrayList"/> + <object class="java.util.ArrayList"> + <void method="add"> + <string>key</string> + </void> + </object> </void> <void property="schema"> <object class="org.apache.hadoop.hive.ql.exec.RowSchema"> @@ -531,7 +505,7 @@ <string>src</string> </void> <void property="type"> - <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> + <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> <void property="typeName"> <string>bigint</string> </void> @@ -590,13 +564,13 @@ <void property="allStructFieldTypeInfos"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="PrimitiveTypeInfo2"/> + <object idref="PrimitiveTypeInfo3"/> </void> <void method="add"> - <object idref="PrimitiveTypeInfo1"/> + <object idref="PrimitiveTypeInfo2"/> </void> <void method="add"> - <object idref="PrimitiveTypeInfo2"/> + <object idref="PrimitiveTypeInfo3"/> </void> </object> </void> Modified: hive/branches/llap/ql/src/test/results/compiler/plan/udf_case.q.xml URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff ============================================================================== --- hive/branches/llap/ql/src/test/results/compiler/plan/udf_case.q.xml (original) +++ hive/branches/llap/ql/src/test/results/compiler/plan/udf_case.q.xml Tue Oct 14 19:06:45 2014 @@ -346,142 +346,20 @@ <object class="java.util.HashMap"> <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="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <int>11</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>12</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>13</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>14</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>15</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFCase"/> - </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>_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>1</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>1</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> - <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>4</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>5</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFCase"/> + <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>CASE (1) WHEN (1) THEN (2) WHEN (3) THEN (4) ELSE (5) END</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> </void> + <void property="value"> + <int>2</int> + </void> </object> </void> </object> @@ -491,17 +369,10 @@ <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>2</int> - </void> - </object> + <object idref="ExprNodeConstantDesc0"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc"/> + <object idref="ExprNodeNullDesc0"/> </void> </object> </void> Modified: hive/branches/llap/ql/src/test/results/compiler/plan/udf_when.q.xml URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff ============================================================================== --- hive/branches/llap/ql/src/test/results/compiler/plan/udf_when.q.xml (original) +++ hive/branches/llap/ql/src/test/results/compiler/plan/udf_when.q.xml Tue Oct 14 19:06:45 2014 @@ -346,222 +346,20 @@ <object class="java.util.HashMap"> <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.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>12</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>11</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPEqual"/> - </void> - <void property="typeInfo"> - <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> - <void property="typeName"> - <string>boolean</string> - </void> - </object> - </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>13</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="PrimitiveTypeInfo0"/> - </void> - <void property="value"> - <int>14</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>10</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPEqual"/> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </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>15</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFWhen"/> - </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>_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.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> - <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.GenericUDFOPEqual"/> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </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> - <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="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>5</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPEqual"/> - </void> - <void property="typeInfo"> - <object idref="PrimitiveTypeInfo1"/> - </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>4</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>5</int> - </void> - </object> - </void> - </object> - </void> - <void property="genericUDF"> - <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFWhen"/> + <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc"> + <void property="foldedFromCol"> + <string>CASE WHEN ((1 = 1)) THEN (2) WHEN ((3 = 5)) THEN (4) ELSE (5) END</string> </void> <void property="typeInfo"> <object idref="PrimitiveTypeInfo0"/> </void> + <void property="value"> + <int>2</int> + </void> </object> </void> </object> @@ -571,17 +369,10 @@ <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>2</int> - </void> - </object> + <object idref="ExprNodeConstantDesc0"/> </void> <void method="add"> - <object class="org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc"/> + <object idref="ExprNodeNullDesc0"/> </void> </object> </void> @@ -649,7 +440,7 @@ <string>src</string> </void> <void property="type"> - <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> + <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> <void property="typeName"> <string>string</string> </void> @@ -669,7 +460,7 @@ <string>src</string> </void> <void property="type"> - <object idref="PrimitiveTypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> <void property="typeName"> <string>string</string> @@ -688,7 +479,7 @@ <string>src</string> </void> <void property="type"> - <object id="PrimitiveTypeInfo3" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> + <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo"> <void property="typeName"> <string>bigint</string> </void> @@ -711,7 +502,7 @@ <string>src</string> </void> <void property="type"> - <object idref="PrimitiveTypeInfo2"/> + <object idref="PrimitiveTypeInfo1"/> </void> <void property="typeName"> <string>string</string> @@ -747,13 +538,13 @@ <void property="allStructFieldTypeInfos"> <object class="java.util.ArrayList"> <void method="add"> - <object idref="PrimitiveTypeInfo3"/> + <object idref="PrimitiveTypeInfo2"/> </void> <void method="add"> <object idref="PrimitiveTypeInfo0"/> </void> <void method="add"> - <object idref="PrimitiveTypeInfo3"/> + <object idref="PrimitiveTypeInfo2"/> </void> </object> </void> Modified: hive/branches/llap/ql/src/test/results/compiler/plan/union.q.xml URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/union.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff ============================================================================== --- hive/branches/llap/ql/src/test/results/compiler/plan/union.q.xml (original) +++ hive/branches/llap/ql/src/test/results/compiler/plan/union.q.xml Tue Oct 14 19:06:45 2014 @@ -235,7 +235,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> @@ -449,7 +449,7 @@ </object> </void> <void property="tableDesc"> - <object id="TableDesc0" 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> @@ -593,7 +593,7 @@ </object> </void> <void property="tableDesc"> - <object idref="TableDesc0"/> + <object idref="TableDesc1"/> </void> </object> </void> @@ -640,34 +640,7 @@ <boolean>true</boolean> </void> <void property="tableInfo"> - <object 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>columns</string> - <string>_col0,_col1</string> - </void> - <void method="put"> - <string>serialization.lib</string> - <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> - </void> - <void method="put"> - <string>serialization.format</string> - <string>1</string> - </void> - <void method="put"> - <string>columns.types</string> - <string>string:string</string> - </void> - </object> - </void> - </object> + <object idref="TableDesc0"/> </void> <void property="totalFiles"> <int>1</int> @@ -1634,7 +1607,7 @@ </object> </void> <void property="tableDesc"> - <object idref="TableDesc0"/> + <object idref="TableDesc1"/> </void> </object> </void> Modified: hive/branches/llap/serde/pom.xml URL: http://svn.apache.org/viewvc/hive/branches/llap/serde/pom.xml?rev=1631841&r1=1631840&r2=1631841&view=diff ============================================================================== --- hive/branches/llap/serde/pom.xml (original) +++ hive/branches/llap/serde/pom.xml Tue Oct 14 19:06:45 2014 @@ -70,7 +70,19 @@ <artifactId>libthrift</artifactId> <version>${libthrift.version}</version> </dependency> - <!-- test inter-project --> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>${opencsv.version}</version> + </dependency> + + <!-- test inter-project --> + <dependency> + <groupId>com.google.code.tempus-fugit</groupId> + <artifactId>tempus-fugit</artifactId> + <version>${tempus-fugit.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: hive/branches/llap/serde/src/gen/thrift/gen-cpp/complex_types.cpp URL: http://svn.apache.org/viewvc/hive/branches/llap/serde/src/gen/thrift/gen-cpp/complex_types.cpp?rev=1631841&r1=1631840&r2=1631841&view=diff ============================================================================== --- hive/branches/llap/serde/src/gen/thrift/gen-cpp/complex_types.cpp (original) +++ hive/branches/llap/serde/src/gen/thrift/gen-cpp/complex_types.cpp Tue Oct 14 19:06:45 2014 @@ -622,4 +622,100 @@ void swap(Complex &a, Complex &b) { swap(a.__isset, b.__isset); } +const char* SetIntString::ascii_fingerprint = "842B41C940D05DFB16183142A90DFC54"; +const uint8_t SetIntString::binary_fingerprint[16] = {0x84,0x2B,0x41,0xC9,0x40,0xD0,0x5D,0xFB,0x16,0x18,0x31,0x42,0xA9,0x0D,0xFC,0x54}; + +uint32_t SetIntString::read(::apache::thrift::protocol::TProtocol* iprot) { + + uint32_t xfer = 0; + std::string fname; + ::apache::thrift::protocol::TType ftype; + int16_t fid; + + xfer += iprot->readStructBegin(fname); + + using ::apache::thrift::protocol::TProtocolException; + + + while (true) + { + xfer += iprot->readFieldBegin(fname, ftype, fid); + if (ftype == ::apache::thrift::protocol::T_STOP) { + break; + } + switch (fid) + { + case 1: + if (ftype == ::apache::thrift::protocol::T_SET) { + { + this->sIntString.clear(); + uint32_t _size64; + ::apache::thrift::protocol::TType _etype67; + xfer += iprot->readSetBegin(_etype67, _size64); + uint32_t _i68; + for (_i68 = 0; _i68 < _size64; ++_i68) + { + IntString _elem69; + xfer += _elem69.read(iprot); + this->sIntString.insert(_elem69); + } + xfer += iprot->readSetEnd(); + } + this->__isset.sIntString = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 2: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->aString); + this->__isset.aString = true; + } else { + xfer += iprot->skip(ftype); + } + break; + default: + xfer += iprot->skip(ftype); + break; + } + xfer += iprot->readFieldEnd(); + } + + xfer += iprot->readStructEnd(); + + return xfer; +} + +uint32_t SetIntString::write(::apache::thrift::protocol::TProtocol* oprot) const { + uint32_t xfer = 0; + xfer += oprot->writeStructBegin("SetIntString"); + + xfer += oprot->writeFieldBegin("sIntString", ::apache::thrift::protocol::T_SET, 1); + { + xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->sIntString.size())); + std::set<IntString> ::const_iterator _iter70; + for (_iter70 = this->sIntString.begin(); _iter70 != this->sIntString.end(); ++_iter70) + { + xfer += (*_iter70).write(oprot); + } + xfer += oprot->writeSetEnd(); + } + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("aString", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeString(this->aString); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldStop(); + xfer += oprot->writeStructEnd(); + return xfer; +} + +void swap(SetIntString &a, SetIntString &b) { + using ::std::swap; + swap(a.sIntString, b.sIntString); + swap(a.aString, b.aString); + swap(a.__isset, b.__isset); +} + Modified: hive/branches/llap/serde/src/gen/thrift/gen-cpp/complex_types.h URL: http://svn.apache.org/viewvc/hive/branches/llap/serde/src/gen/thrift/gen-cpp/complex_types.h?rev=1631841&r1=1631840&r2=1631841&view=diff ============================================================================== --- hive/branches/llap/serde/src/gen/thrift/gen-cpp/complex_types.h (original) +++ hive/branches/llap/serde/src/gen/thrift/gen-cpp/complex_types.h Tue Oct 14 19:06:45 2014 @@ -296,6 +296,57 @@ class Complex { void swap(Complex &a, Complex &b); +typedef struct _SetIntString__isset { + _SetIntString__isset() : sIntString(false), aString(false) {} + bool sIntString; + bool aString; +} _SetIntString__isset; + +class SetIntString { + public: + + static const char* ascii_fingerprint; // = "842B41C940D05DFB16183142A90DFC54"; + static const uint8_t binary_fingerprint[16]; // = {0x84,0x2B,0x41,0xC9,0x40,0xD0,0x5D,0xFB,0x16,0x18,0x31,0x42,0xA9,0x0D,0xFC,0x54}; + + SetIntString() : aString() { + } + + virtual ~SetIntString() throw() {} + + std::set<IntString> sIntString; + std::string aString; + + _SetIntString__isset __isset; + + void __set_sIntString(const std::set<IntString> & val) { + sIntString = val; + } + + void __set_aString(const std::string& val) { + aString = val; + } + + bool operator == (const SetIntString & rhs) const + { + if (!(sIntString == rhs.sIntString)) + return false; + if (!(aString == rhs.aString)) + return false; + return true; + } + bool operator != (const SetIntString &rhs) const { + return !(*this == rhs); + } + + bool operator < (const SetIntString & ) const; + + uint32_t read(::apache::thrift::protocol::TProtocol* iprot); + uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + +}; + +void swap(SetIntString &a, SetIntString &b); + #endif Modified: hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java URL: http://svn.apache.org/viewvc/hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java?rev=1631841&r1=1631840&r2=1631841&view=diff ============================================================================== --- hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java (original) +++ hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java Tue Oct 14 19:06:45 2014 @@ -37,8 +37,6 @@ public class serdeConstants { public static final String SERIALIZATION_CLASS = "serialization.class"; - public static final String SERIALIZATION_TYPE = "serialization.type"; - public static final String SERIALIZATION_FORMAT = "serialization.format"; public static final String SERIALIZATION_DDL = "serialization.ddl"; Modified: hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java URL: http://svn.apache.org/viewvc/hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java?rev=1631841&r1=1631840&r2=1631841&view=diff ============================================================================== --- hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java (original) +++ hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java Tue Oct 14 19:06:45 2014 @@ -1267,7 +1267,7 @@ public class Complex implements org.apac for (int _i28 = 0; _i28 < _map27.size; ++_i28) { String _key29; // required - String _val30; // optional + String _val30; // required _key29 = iprot.readString(); _val30 = iprot.readString(); struct.mStringString.put(_key29, _val30); @@ -1287,7 +1287,7 @@ public class Complex implements org.apac for (int _i32 = 0; _i32 < _map31.size; ++_i32) { String _key33; // required - Map<String,Map<String,PropValueUnion>> _val34; // optional + Map<String,Map<String,PropValueUnion>> _val34; // required _key33 = iprot.readString(); { org.apache.thrift.protocol.TMap _map35 = iprot.readMapBegin(); @@ -1295,7 +1295,7 @@ public class Complex implements org.apac for (int _i36 = 0; _i36 < _map35.size; ++_i36) { String _key37; // required - Map<String,PropValueUnion> _val38; // optional + Map<String,PropValueUnion> _val38; // required _key37 = iprot.readString(); { org.apache.thrift.protocol.TMap _map39 = iprot.readMapBegin(); @@ -1303,7 +1303,7 @@ public class Complex implements org.apac for (int _i40 = 0; _i40 < _map39.size; ++_i40) { String _key41; // required - PropValueUnion _val42; // optional + PropValueUnion _val42; // required _key41 = iprot.readString(); _val42 = new PropValueUnion(); _val42.read(iprot); @@ -1651,7 +1651,7 @@ public class Complex implements org.apac for (int _i67 = 0; _i67 < _map66.size; ++_i67) { String _key68; // required - String _val69; // optional + String _val69; // required _key68 = iprot.readString(); _val69 = iprot.readString(); struct.mStringString.put(_key68, _val69); @@ -1666,7 +1666,7 @@ public class Complex implements org.apac for (int _i71 = 0; _i71 < _map70.size; ++_i71) { String _key72; // required - Map<String,Map<String,PropValueUnion>> _val73; // optional + Map<String,Map<String,PropValueUnion>> _val73; // required _key72 = iprot.readString(); { org.apache.thrift.protocol.TMap _map74 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); @@ -1674,7 +1674,7 @@ public class Complex implements org.apac for (int _i75 = 0; _i75 < _map74.size; ++_i75) { String _key76; // required - Map<String,PropValueUnion> _val77; // optional + Map<String,PropValueUnion> _val77; // required _key76 = iprot.readString(); { org.apache.thrift.protocol.TMap _map78 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); @@ -1682,7 +1682,7 @@ public class Complex implements org.apac for (int _i79 = 0; _i79 < _map78.size; ++_i79) { String _key80; // required - PropValueUnion _val81; // optional + PropValueUnion _val81; // required _key80 = iprot.readString(); _val81 = new PropValueUnion(); _val81.read(iprot); Modified: hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java URL: http://svn.apache.org/viewvc/hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java?rev=1631841&r1=1631840&r2=1631841&view=diff ============================================================================== --- hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java (original) +++ hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java Tue Oct 14 19:06:45 2014 @@ -320,7 +320,7 @@ public class PropValueUnion extends org. for (int _i4 = 0; _i4 < _map3.size; ++_i4) { String _key5; // required - String _val6; // optional + String _val6; // required _key5 = iprot.readString(); _val6 = iprot.readString(); unionMStringString.put(_key5, _val6); @@ -438,7 +438,7 @@ public class PropValueUnion extends org. for (int _i13 = 0; _i13 < _map12.size; ++_i13) { String _key14; // required - String _val15; // optional + String _val15; // required _key14 = iprot.readString(); _val15 = iprot.readString(); unionMStringString.put(_key14, _val15);
