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/10/21 00:51:41 UTC
svn commit: r1633252 [2/2] - in /hive/branches/branch-0.14/ql/src:
java/org/apache/hadoop/hive/ql/optimizer/ test/results/clientpositive/
test/results/clientpositive/tez/ test/results/compiler/plan/
Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/union_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/union_view.q.out?rev=1633252&r1=1633251&r2=1633252&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/union_view.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/union_view.q.out Mon Oct 20 22:51:39 2014
@@ -85,7 +85,7 @@ STAGE PLANS:
predicate: (key = 86) (type: boolean)
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 86 (type: int), value (type: string), ds (type: string)
+ expressions: 86 (type: int), value (type: string), '1' (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -144,7 +144,7 @@ STAGE PLANS:
predicate: (key = 86) (type: boolean)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 86 (type: int), value (type: string), ds (type: string)
+ expressions: 86 (type: int), value (type: string), '2' (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -203,7 +203,7 @@ STAGE PLANS:
predicate: (key = 86) (type: boolean)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 86 (type: int), value (type: string), ds (type: string)
+ expressions: 86 (type: int), value (type: string), '3' (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -483,13 +483,13 @@ STAGE PLANS:
predicate: (key = 86) (type: boolean)
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: value (type: string), ds (type: string)
- outputColumnNames: _col1, _col2
+ expressions: value (type: string)
+ outputColumnNames: _col1
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
Union
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 86 (type: int), _col1 (type: string), _col2 (type: string)
+ expressions: 86 (type: int), _col1 (type: string), '1' (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -548,13 +548,13 @@ STAGE PLANS:
predicate: (key = 86) (type: boolean)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: value (type: string), ds (type: string)
- outputColumnNames: _col1, _col2
+ expressions: value (type: string)
+ outputColumnNames: _col1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Union
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 86 (type: int), _col1 (type: string), _col2 (type: string)
+ expressions: 86 (type: int), _col1 (type: string), '2' (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -613,13 +613,13 @@ STAGE PLANS:
predicate: (key = 86) (type: boolean)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: value (type: string), ds (type: string)
- outputColumnNames: _col1, _col2
+ expressions: value (type: string)
+ outputColumnNames: _col1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Union
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 86 (type: int), _col1 (type: string), _col2 (type: string)
+ expressions: 86 (type: int), _col1 (type: string), '3' (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -1087,13 +1087,13 @@ STAGE PLANS:
predicate: (key = 86) (type: boolean)
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: value (type: string), ds (type: string)
- outputColumnNames: _col1, _col2
+ expressions: value (type: string)
+ outputColumnNames: _col1
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
Union
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 86 (type: int), _col1 (type: string), _col2 (type: string)
+ expressions: 86 (type: int), _col1 (type: string), '4' (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
File Output Operator
Modified: hive/branches/branch-0.14/ql/src/test/results/compiler/plan/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=1633252&r1=1633251&r2=1633252&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hive/branches/branch-0.14/ql/src/test/results/compiler/plan/input_part1.q.xml Mon Oct 20 22:51:39 2014
@@ -351,41 +351,35 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col3</string>
- <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
+ <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="foldedFromCol">
<string>ds</string>
</void>
- <void property="isPartitionColOrVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="tabAlias">
- <string>srcpart</string>
- </void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
+ <void property="value">
+ <string>2008-04-08</string>
+ </void>
</object>
</void>
<void method="put">
<string>_col2</string>
- <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
+ <object id="ExprNodeConstantDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="foldedFromCol">
<string>hr</string>
</void>
- <void property="isPartitionColOrVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="tabAlias">
- <string>srcpart</string>
- </void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
+ <void property="value">
+ <string>12</string>
+ </void>
</object>
</void>
<void method="put">
<string>_col1</string>
- <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>value</string>
</void>
@@ -399,7 +393,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -418,16 +412,16 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc3"/>
+ <object idref="ExprNodeColumnDesc1"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc2"/>
+ <object idref="ExprNodeColumnDesc0"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc1"/>
+ <object idref="ExprNodeConstantDesc1"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc0"/>
+ <object idref="ExprNodeConstantDesc0"/>
</void>
</object>
</void>
@@ -634,38 +628,6 @@
</void>
</object>
</void>
- <void method="add">
- <object id="ColumnInfo2" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>ds</string>
- </void>
- <void property="tabAlias">
- <string>srcpart</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="typeName">
- <string>string</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object id="ColumnInfo3" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>hr</string>
- </void>
- <void property="tabAlias">
- <string>srcpart</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="typeName">
- <string>string</string>
- </void>
- </object>
- </void>
</void>
</object>
</void>
@@ -713,12 +675,6 @@
<void method="add">
<string>value</string>
</void>
- <void method="add">
- <string>ds</string>
- </void>
- <void method="add">
- <string>hr</string>
- </void>
</object>
</void>
<void property="schema">
@@ -731,10 +687,42 @@
<object idref="ColumnInfo1"/>
</void>
<void method="add">
- <object idref="ColumnInfo2"/>
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="alias">
+ <string>ds</string>
+ </void>
+ <void property="internalName">
+ <string>ds</string>
+ </void>
+ <void property="tabAlias">
+ <string>srcpart</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>string</string>
+ </void>
+ </object>
</void>
<void method="add">
- <object idref="ColumnInfo3"/>
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="alias">
+ <string>hr</string>
+ </void>
+ <void property="internalName">
+ <string>hr</string>
+ </void>
+ <void property="tabAlias">
+ <string>srcpart</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>string</string>
+ </void>
+ </object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
Modified: hive/branches/branch-0.14/ql/src/test/results/compiler/plan/sample1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/compiler/plan/sample1.q.xml?rev=1633252&r1=1633251&r2=1633252&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/compiler/plan/sample1.q.xml (original)
+++ hive/branches/branch-0.14/ql/src/test/results/compiler/plan/sample1.q.xml Mon Oct 20 22:51:39 2014
@@ -351,41 +351,35 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col3</string>
- <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
+ <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="foldedFromCol">
<string>hr</string>
</void>
- <void property="isPartitionColOrVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
+ <void property="value">
+ <string>11</string>
+ </void>
</object>
</void>
<void method="put">
<string>_col2</string>
- <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
+ <object id="ExprNodeConstantDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="foldedFromCol">
<string>ds</string>
</void>
- <void property="isPartitionColOrVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
+ <void property="value">
+ <string>2008-04-08</string>
+ </void>
</object>
</void>
<void method="put">
<string>_col1</string>
- <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>value</string>
</void>
@@ -399,7 +393,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -418,16 +412,16 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc3"/>
+ <object idref="ExprNodeColumnDesc1"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc2"/>
+ <object idref="ExprNodeColumnDesc0"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc1"/>
+ <object idref="ExprNodeConstantDesc1"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc0"/>
+ <object idref="ExprNodeConstantDesc0"/>
</void>
</object>
</void>
@@ -727,38 +721,6 @@
</void>
</object>
</void>
- <void method="add">
- <object id="ColumnInfo2" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>ds</string>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="typeName">
- <string>string</string>
- </void>
- </object>
- </void>
- <void method="add">
- <object id="ColumnInfo3" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>hr</string>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="typeName">
- <string>string</string>
- </void>
- </object>
- </void>
</void>
</object>
</void>
@@ -806,12 +768,6 @@
<void method="add">
<string>value</string>
</void>
- <void method="add">
- <string>ds</string>
- </void>
- <void method="add">
- <string>hr</string>
- </void>
</object>
</void>
<void property="schema">
@@ -824,10 +780,42 @@
<object idref="ColumnInfo1"/>
</void>
<void method="add">
- <object idref="ColumnInfo2"/>
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="alias">
+ <string>ds</string>
+ </void>
+ <void property="internalName">
+ <string>ds</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>string</string>
+ </void>
+ </object>
</void>
<void method="add">
- <object idref="ColumnInfo3"/>
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="alias">
+ <string>hr</string>
+ </void>
+ <void property="internalName">
+ <string>hr</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="typeName">
+ <string>string</string>
+ </void>
+ </object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">