You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/09/22 03:00:10 UTC
svn commit: r1626654 [3/3] - in /hive/trunk/ql/src:
java/org/apache/hadoop/hive/ql/optimizer/ test/queries/clientpositive/
test/results/clientpositive/ test/results/compiler/plan/
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml Mon Sep 22 01:00:09 2014
@@ -291,86 +291,24 @@
<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 class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>boolean</string>
- </void>
- </object>
- </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="PrimitiveTypeInfo1"/>
- </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="PrimitiveTypeInfo1"/>
- </void>
- <void property="value">
- <int>2</int>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="genericUDF">
- <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFIf"/>
- </void>
+ <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
+ <void property="value">
+ <int>1</int>
+ </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">
- <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"/>
- </void>
+ <object id="ExprNodeConstantDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
+ <void property="value">
+ <string>ab</string>
+ </void>
</object>
</void>
</object>
@@ -380,24 +318,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="ExprNodeConstantDesc1"/>
</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="ExprNodeConstantDesc0"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml Mon Sep 22 01:00:09 2014
@@ -346,142 +346,17 @@
<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"/>
- </void>
+ <object id="ExprNodeConstantDesc0" 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>
@@ -491,17 +366,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/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml Mon Sep 22 01:00:09 2014
@@ -346,222 +346,17 @@
<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"/>
- </void>
+ <object id="ExprNodeConstantDesc0" 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>
@@ -571,17 +366,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 +437,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 +457,7 @@
<string>src</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="typeName">
<string>string</string>
@@ -688,7 +476,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 +499,7 @@
<string>src</string>
</void>
<void property="type">
- <object idref="PrimitiveTypeInfo2"/>
+ <object idref="PrimitiveTypeInfo1"/>
</void>
<void property="typeName">
<string>string</string>
@@ -747,13 +535,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/trunk/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/union.q.xml Mon Sep 22 01:00:09 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>