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 [1/3] - in /hive/trunk/ql/src:
java/org/apache/hadoop/hive/ql/optimizer/ test/queries/clientpositive/
test/results/clientpositive/ test/results/compiler/plan/
Author: hashutosh
Date: Mon Sep 22 01:00:09 2014
New Revision: 1626654
URL: http://svn.apache.org/r1626654
Log:
HIVE-8184 : inconsistence between colList and columnExprMap when ConstantPropagate is applied to subquery (Pengcheng Xiong via Ashutosh Chauhan)
Added:
hive/trunk/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q
hive/trunk/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java
hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join8.q.out
hive/trunk/ql/src/test/results/clientpositive/join8.q.out
hive/trunk/ql/src/test/results/clientpositive/join_view.q.out
hive/trunk/ql/src/test/results/clientpositive/lateral_view_ppd.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
hive/trunk/ql/src/test/results/clientpositive/select_dummy_source.q.out
hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
hive/trunk/ql/src/test/results/clientpositive/subquery_notin.q.out
hive/trunk/ql/src/test/results/clientpositive/subquery_notin_having.q.out
hive/trunk/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
hive/trunk/ql/src/test/results/clientpositive/subquery_views.q.out
hive/trunk/ql/src/test/results/clientpositive/udf4.q.out
hive/trunk/ql/src/test/results/clientpositive/udf7.q.out
hive/trunk/ql/src/test/results/clientpositive/udf_case.q.out
hive/trunk/ql/src/test/results/clientpositive/udf_elt.q.out
hive/trunk/ql/src/test/results/clientpositive/udf_when.q.out
hive/trunk/ql/src/test/results/clientpositive/vector_elt.q.out
hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml
hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java Mon Sep 22 01:00:09 2014
@@ -670,10 +670,15 @@ public final class ConstantPropagateProc
cppCtx.getOpToConstantExprs().put(op, constants);
foldOperator(op, cppCtx);
List<ExprNodeDesc> colList = op.getConf().getColList();
+ List<String> columnNames = op.getConf().getOutputColumnNames();
+ Map<String, ExprNodeDesc> columnExprMap = op.getColumnExprMap();
if (colList != null) {
for (int i = 0; i < colList.size(); i++) {
ExprNodeDesc newCol = foldExpr(colList.get(i), constants, cppCtx, op, 0, false);
colList.set(i, newCol);
+ if (columnExprMap != null) {
+ columnExprMap.put(columnNames.get(i), newCol);
+ }
}
LOG.debug("New column list:(" + StringUtils.join(colList, " ") + ")");
}
Added: hive/trunk/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q?rev=1626654&view=auto
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q (added)
+++ hive/trunk/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q Mon Sep 22 01:00:09 2014
@@ -0,0 +1,4 @@
+explain extended
+ select * from (select a.key as ak, a.value as av, b.key as bk, b.value as bv from src a join src1 b where a.key = '429' ) c;
+
+ select * from (select a.key as ak, a.value as av, b.key as bk, b.value as bv from src a join src1 b where a.key = '429' ) c;
Modified: hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out Mon Sep 22 01:00:09 2014
@@ -690,10 +690,10 @@ STAGE PLANS:
Select Operator
expressions: null (type: void)
outputColumnNames: _col0
- Statistics: Num rows: 2 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 2 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
File Output Operator
compressed: false
- Statistics: Num rows: 2 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 2 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join8.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join8.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join8.q.out Mon Sep 22 01:00:09 2014
@@ -97,7 +97,7 @@ STAGE PLANS:
predicate: _col2 is null (type: boolean)
Statistics: Num rows: 15 Data size: 163 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToInteger(_col2) (type: int), _col3 (type: string)
+ expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToInteger(null) (type: int), _col3 (type: string)
outputColumnNames: _col0, _col1, _col2, _col3
Statistics: Num rows: 15 Data size: 163 Basic stats: COMPLETE Column stats: NONE
File Output Operator
Added: hive/trunk/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out?rev=1626654&view=auto
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out (added) and hive/trunk/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out Mon Sep 22 01:00:09 2014 differ
Modified: hive/trunk/ql/src/test/results/clientpositive/join8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join8.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join8.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join8.q.out Mon Sep 22 01:00:09 2014
@@ -90,7 +90,7 @@ STAGE PLANS:
predicate: _col2 is null (type: boolean)
Statistics: Num rows: 15 Data size: 163 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToInteger(_col2) (type: int), _col3 (type: string)
+ expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToInteger(null) (type: int), _col3 (type: string)
outputColumnNames: _col0, _col1, _col2, _col3
Statistics: Num rows: 15 Data size: 163 Basic stats: COMPLETE Column stats: NONE
File Output Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/join_view.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join_view.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join_view.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join_view.q.out Mon Sep 22 01:00:09 2014
@@ -59,7 +59,7 @@ STAGE PLANS:
outputColumnNames: _col1, _col6
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col1 (type: string), _col6 (type: int), _col8 (type: string)
+ expressions: _col1 (type: string), _col6 (type: int), '2011-09-01' (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
File Output Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/lateral_view_ppd.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/lateral_view_ppd.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/lateral_view_ppd.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/lateral_view_ppd.q.out Mon Sep 22 01:00:09 2014
@@ -109,7 +109,7 @@ STAGE PLANS:
outputColumnNames: _col1, _col5
Statistics: Num rows: 375 Data size: 3984 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: _col1 (type: string), _col5 (type: int)
+ expressions: _col1 (type: string), 1 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 375 Data size: 3984 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -133,7 +133,7 @@ STAGE PLANS:
outputColumnNames: _col1, _col5
Statistics: Num rows: 375 Data size: 3984 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: _col1 (type: string), _col5 (type: int)
+ expressions: _col1 (type: string), 1 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 375 Data size: 3984 Basic stats: COMPLETE Column stats: NONE
File Output Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out Mon Sep 22 01:00:09 2014 differ
Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out Mon Sep 22 01:00:09 2014
@@ -145,7 +145,7 @@ STAGE PLANS:
predicate: (_col7 = 3) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: int), _col6 (type: int), _col7 (type: int)
+ expressions: _col0 (type: int), _col6 (type: int), 3 (type: int)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
File Output Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/select_dummy_source.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/select_dummy_source.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/select_dummy_source.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/select_dummy_source.q.out Mon Sep 22 01:00:09 2014
@@ -277,7 +277,7 @@ STAGE PLANS:
Row Limit Per Split: 1
Statistics: Num rows: 0 Data size: 1 Basic stats: PARTIAL Column stats: COMPLETE
Select Operator
- expressions: 5 (type: int), (1 + 2) (type: int)
+ expressions: 5 (type: int), 3 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 0 Data size: 1 Basic stats: PARTIAL Column stats: COMPLETE
File Output Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out Mon Sep 22 01:00:09 2014
@@ -99,7 +99,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
@@ -566,7 +566,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/subquery_notin.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/subquery_notin.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/subquery_notin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/subquery_notin.q.out Mon Sep 22 01:00:09 2014
@@ -150,7 +150,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
@@ -537,7 +537,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
@@ -823,7 +823,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
@@ -1145,7 +1145,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
@@ -1489,7 +1489,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/subquery_notin_having.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/subquery_notin_having.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/subquery_notin_having.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/subquery_notin_having.q.out Mon Sep 22 01:00:09 2014
@@ -99,7 +99,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
@@ -476,7 +476,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
@@ -728,7 +728,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out Mon Sep 22 01:00:09 2014
@@ -928,7 +928,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/subquery_views.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/subquery_views.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/subquery_views.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/subquery_views.q.out Mon Sep 22 01:00:09 2014
@@ -120,7 +120,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
@@ -287,7 +287,7 @@ STAGE PLANS:
predicate: (_col0 = 0) (type: boolean)
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Select Operator
- expressions: _col0 (type: bigint)
+ expressions: 0 (type: bigint)
outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/udf4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf4.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf4.q.out Mon Sep 22 01:00:09 2014
@@ -79,10 +79,10 @@ STAGE PLANS:
Select Operator
expressions: 1.0 (type: double), 2.0 (type: double), -2.0 (type: double), 1 (type: bigint), 1 (type: bigint), -2 (type: bigint), 1.0 (type: double), null (type: void), 0.0 (type: double), 1 (type: bigint), 2 (type: bigint), -1 (type: bigint), 1 (type: bigint), rand(3) (type: double), 3 (type: int), -3 (type: int), 3 (type: int), -1 (type: int), -2 (type: int), -2 (type: tinyint), -2 (type: smallint), -2 (type: bigint), 0 (type: tinyint), 0 (type: smallint), 0 (type: int), 0 (type: bigint), 3 (type: tinyint), 3 (type: smallint), 3 (type: int), 3 (type: bigint), 2 (type: tinyint), 2 (type: smallint), 2 (type: int), 2 (type: bigint)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, _col26, _col27, _col28, _col29, _col30, _col31, _col32, _col33
- Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
compressed: false
- Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: COMPLETE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
Modified: hive/trunk/ql/src/test/results/clientpositive/udf7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf7.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf7.q.out Mon Sep 22 01:00:09 2014
@@ -49,10 +49,10 @@ STAGE PLANS:
Select Operator
expressions: 1.098612288668 (type: double), null (type: void), null (type: void), 1.098612288668 (type: double), null (type: void), null (type: void), 1.584962500721 (type: double), null (type: void), null (type: void), 0.47712125472 (type: double), null (type: void), null (type: void), 1.584962500721 (type: double), null (type: void), null (type: void), null (type: void), -1.0 (type: double), 7.389056098931 (type: double), 8.0 (type: double), 8.0 (type: double), 0.125 (type: double), 8.0 (type: double), 2.0 (type: double), NaN (type: double), 1.0 (type: double), power(CAST( 1 AS decimal(10,0)), 0) (type: double), power(CAST( 2 AS decimal(10,0)), 3) (type: double), power(CAST( 2 AS decimal(10,0)), 3) (type: double)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, _col26, _col27
- Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 1 Data size: 136 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
compressed: false
- Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 1 Data size: 136 Basic stats: COMPLETE Column stats: COMPLETE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
Modified: hive/trunk/ql/src/test/results/clientpositive/udf_case.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_case.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_case.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_case.q.out Mon Sep 22 01:00:09 2014
@@ -91,7 +91,7 @@ STAGE PLANS:
Select Operator
expressions: 2 (type: int), 5 (type: int), 15 (type: int), null (type: void), CASE (17) WHEN (18) THEN (null) WHEN (17) THEN (20) END (type: int), 24 (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
- Statistics: Num rows: 500 Data size: 12000 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 500 Data size: 10000 Basic stats: COMPLETE Column stats: COMPLETE
ListSink
PREHOOK: query: SELECT CASE 1
Modified: hive/trunk/ql/src/test/results/clientpositive/udf_elt.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_elt.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_elt.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_elt.q.out Mon Sep 22 01:00:09 2014
@@ -54,7 +54,7 @@ STAGE PLANS:
Select Operator
expressions: 'defg' (type: string), 'cc' (type: string), 'abc' (type: string), '2' (type: string), '12345' (type: string), '123456789012' (type: string), '1.25' (type: string), '16.0' (type: string), elt(null, 'abc', 'defg') (type: string), null (type: void), null (type: void)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10
- Statistics: Num rows: 500 Data size: 479500 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 500 Data size: 395500 Basic stats: COMPLETE Column stats: COMPLETE
ListSink
PREHOOK: query: SELECT elt(2, 'abc', 'defg'),
Modified: hive/trunk/ql/src/test/results/clientpositive/udf_when.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_when.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_when.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_when.q.out Mon Sep 22 01:00:09 2014
@@ -91,7 +91,7 @@ STAGE PLANS:
Select Operator
expressions: 2 (type: int), 9 (type: int), 14 (type: int), null (type: void), CASE WHEN (false) THEN (null) WHEN (true) THEN (24) END (type: int), CASE WHEN (false) THEN (27) WHEN (true) THEN (null) END (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
- Statistics: Num rows: 500 Data size: 12000 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 500 Data size: 10000 Basic stats: COMPLETE Column stats: COMPLETE
ListSink
PREHOOK: query: SELECT CASE
Modified: hive/trunk/ql/src/test/results/clientpositive/vector_elt.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/vector_elt.q.out?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/vector_elt.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/vector_elt.q.out Mon Sep 22 01:00:09 2014
@@ -104,13 +104,13 @@ STAGE PLANS:
Select Operator
expressions: 'defg' (type: string), 'cc' (type: string), 'abc' (type: string), '2' (type: string), '12345' (type: string), '123456789012' (type: string), '1.25' (type: string), '16.0' (type: string), null (type: void), null (type: void)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9
- Statistics: Num rows: 12288 Data size: 10752000 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 12288 Data size: 8687616 Basic stats: COMPLETE Column stats: COMPLETE
Limit
Number of rows: 1
- Statistics: Num rows: 1 Data size: 875 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 1 Data size: 707 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
compressed: false
- Statistics: Num rows: 1 Data size: 875 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 1 Data size: 707 Basic stats: COMPLETE Column stats: COMPLETE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
Modified: hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml Mon Sep 22 01:00:09 2014
@@ -378,282 +378,79 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col6</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="children">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo2"/>
- </void>
- <void property="value">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="genericUDF">
- <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
- <void property="udfClassName">
- <string>org.apache.hadoop.hive.ql.udf.UDFToInteger</string>
- </void>
- <void property="udfName">
- <string>UDFToInteger</string>
- </void>
- </object>
- </void>
+ <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
+ <void property="value">
+ <int>1</int>
+ </void>
</object>
</void>
<void method="put">
<string>_col5</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="children">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="value">
- <int>1</int>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="genericUDF">
- <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
- <void property="udfClassName">
- <string>org.apache.hadoop.hive.ql.udf.UDFToBoolean</string>
- </void>
- <void property="udfName">
- <string>UDFToBoolean</string>
- </void>
- </object>
- </void>
+ <object id="ExprNodeConstantDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo2"/>
</void>
+ <void property="value">
+ <boolean>true</boolean>
+ </void>
</object>
</void>
<void method="put">
<string>_col4</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="children">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="value">
- <int>3</int>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="children">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- <void property="value">
- <double>2.0</double>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="genericUDF">
- <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge">
- <void property="udfClassName">
- <string>org.apache.hadoop.hive.ql.udf.UDFToInteger</string>
- </void>
- <void property="udfName">
- <string>UDFToInteger</string>
- </void>
- </object>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="genericUDF">
- <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPlus">
- <void property="confLookupNeeded">
- <boolean>false</boolean>
- </void>
- </object>
- </void>
+ <object id="ExprNodeConstantDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
+ <void property="value">
+ <int>5</int>
+ </void>
</object>
</void>
<void method="put">
<string>_col3</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="children">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- <void property="value">
- <double>3.0</double>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- <void property="value">
- <double>2.0</double>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="genericUDF">
- <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPlus">
- <void property="confLookupNeeded">
- <boolean>false</boolean>
- </void>
- </object>
- </void>
+ <object id="ExprNodeConstantDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
+ <void property="value">
+ <double>5.0</double>
+ </void>
</object>
</void>
<void method="put">
<string>_col2</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="children">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="value">
- <int>3</int>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- <void property="value">
- <double>2.0</double>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="genericUDF">
- <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPlus">
- <void property="confLookupNeeded">
- <boolean>false</boolean>
- </void>
- </object>
- </void>
+ <object id="ExprNodeConstantDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
+ <void property="value">
+ <double>5.0</double>
+ </void>
</object>
</void>
<void method="put">
<string>_col1</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="children">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- <void property="value">
- <double>3.0</double>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="value">
- <int>2</int>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="genericUDF">
- <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPlus">
- <void property="confLookupNeeded">
- <boolean>false</boolean>
- </void>
- </object>
- </void>
+ <object id="ExprNodeConstantDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo1"/>
</void>
+ <void property="value">
+ <double>5.0</double>
+ </void>
</object>
</void>
<void method="put">
<string>_col0</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="children">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="value">
- <int>3</int>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="value">
- <int>2</int>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="genericUDF">
- <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPPlus">
- <void property="confLookupNeeded">
- <boolean>false</boolean>
- </void>
- </object>
- </void>
+ <object id="ExprNodeConstantDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
+ <void property="value">
+ <int>5</int>
+ </void>
</object>
</void>
</object>
@@ -663,74 +460,25 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="value">
- <int>5</int>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- <void property="value">
- <double>5.0</double>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- <void property="value">
- <double>5.0</double>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- <void property="value">
- <double>5.0</double>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="value">
- <int>5</int>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo2"/>
- </void>
- <void property="value">
- <boolean>true</boolean>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="value">
- <int>1</int>
- </void>
- </object>
+ <object idref="ExprNodeConstantDesc6"/>
+ </void>
+ <void method="add">
+ <object idref="ExprNodeConstantDesc5"/>
+ </void>
+ <void method="add">
+ <object idref="ExprNodeConstantDesc4"/>
+ </void>
+ <void method="add">
+ <object idref="ExprNodeConstantDesc3"/>
+ </void>
+ <void method="add">
+ <object idref="ExprNodeConstantDesc2"/>
+ </void>
+ <void method="add">
+ <object idref="ExprNodeConstantDesc1"/>
+ </void>
+ <void method="add">
+ <object idref="ExprNodeConstantDesc0"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml Mon Sep 22 01:00:09 2014
@@ -732,7 +732,7 @@
</void>
<void method="put">
<string>value</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>value</string>
</void>
@@ -790,7 +790,7 @@
</void>
<void method="put">
<string>key</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -809,30 +809,10 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>key</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object idref="ExprNodeColumnDesc4"/>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>value</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object idref="ExprNodeColumnDesc3"/>
</void>
</object>
</void>
@@ -1233,7 +1213,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col1</string>
- <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col1</string>
</void>
@@ -1247,7 +1227,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
</void>
@@ -1266,10 +1246,10 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc4"/>
+ <object idref="ExprNodeColumnDesc6"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc3"/>
+ <object idref="ExprNodeColumnDesc5"/>
</void>
</object>
</void>
@@ -1335,7 +1315,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>KEY._col0</string>
</void>
@@ -1387,7 +1367,7 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc5"/>
+ <object idref="ExprNodeColumnDesc7"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml Mon Sep 22 01:00:09 2014
@@ -819,7 +819,7 @@
</void>
<void method="put">
<string>value</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>value</string>
</void>
@@ -877,7 +877,7 @@
</void>
<void method="put">
<string>key</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -896,30 +896,10 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>key</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object idref="ExprNodeColumnDesc4"/>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>value</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object idref="ExprNodeColumnDesc3"/>
</void>
</object>
</void>
@@ -1397,7 +1377,7 @@
</void>
<void method="put">
<string>_col1</string>
- <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col1</string>
</void>
@@ -1411,7 +1391,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
</void>
@@ -1430,10 +1410,10 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc4"/>
+ <object idref="ExprNodeColumnDesc6"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc3"/>
+ <object idref="ExprNodeColumnDesc5"/>
</void>
<void method="add">
<object idref="ExprNodeGenericFuncDesc2"/>
@@ -1524,7 +1504,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>KEY._col0</string>
</void>
@@ -1611,7 +1591,7 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc5"/>
+ <object idref="ExprNodeColumnDesc7"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml Mon Sep 22 01:00:09 2014
@@ -1065,7 +1065,7 @@
</void>
<void method="put">
<string>value</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>value</string>
</void>
@@ -1142,17 +1142,7 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>value</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object idref="ExprNodeColumnDesc5"/>
</void>
</object>
</void>
@@ -1606,7 +1596,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col4</string>
- <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col4</string>
</void>
@@ -1620,7 +1610,7 @@
</void>
<void method="put">
<string>_col3</string>
- <object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col3</string>
</void>
@@ -1634,7 +1624,7 @@
</void>
<void method="put">
<string>_col2</string>
- <object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc8" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col2</string>
</void>
@@ -1648,7 +1638,7 @@
</void>
<void method="put">
<string>_col1</string>
- <object id="ExprNodeColumnDesc8" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc9" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col1</string>
</void>
@@ -1662,7 +1652,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc9" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc10" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
</void>
@@ -1681,6 +1671,9 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
+ <object idref="ExprNodeColumnDesc10"/>
+ </void>
+ <void method="add">
<object idref="ExprNodeColumnDesc9"/>
</void>
<void method="add">
@@ -1692,9 +1685,6 @@
<void method="add">
<object idref="ExprNodeColumnDesc6"/>
</void>
- <void method="add">
- <object idref="ExprNodeColumnDesc5"/>
- </void>
</object>
</void>
<void property="outputColumnNames">
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml Mon Sep 22 01:00:09 2014
@@ -561,7 +561,7 @@
</void>
<void method="put">
<string>key</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -580,17 +580,7 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>key</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object idref="ExprNodeColumnDesc1"/>
</void>
</object>
</void>
@@ -980,7 +970,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
</void>
@@ -999,7 +989,7 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc1"/>
+ <object idref="ExprNodeColumnDesc2"/>
</void>
</object>
</void>
@@ -1049,7 +1039,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>KEY._col0</string>
</void>
@@ -1071,7 +1061,7 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc2"/>
+ <object idref="ExprNodeColumnDesc3"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml Mon Sep 22 01:00:09 2014
@@ -584,7 +584,7 @@
</void>
<void method="put">
<string>value</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>value</string>
</void>
@@ -642,7 +642,7 @@
</void>
<void method="put">
<string>key</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -661,30 +661,10 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>key</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object idref="ExprNodeColumnDesc4"/>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>value</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object idref="ExprNodeColumnDesc3"/>
</void>
</object>
</void>
@@ -1105,7 +1085,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col1</string>
- <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col1</string>
</void>
@@ -1119,7 +1099,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
</void>
@@ -1138,10 +1118,10 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc4"/>
+ <object idref="ExprNodeColumnDesc6"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc3"/>
+ <object idref="ExprNodeColumnDesc5"/>
</void>
</object>
</void>
@@ -1213,7 +1193,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc7" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>KEY._col0</string>
</void>
@@ -1265,7 +1245,7 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc5"/>
+ <object idref="ExprNodeColumnDesc7"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml Mon Sep 22 01:00:09 2014
@@ -503,7 +503,7 @@
</void>
<void method="put">
<string>value</string>
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>value</string>
</void>
@@ -580,17 +580,7 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>value</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object idref="ExprNodeColumnDesc1"/>
</void>
</object>
</void>
@@ -980,7 +970,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
</void>
@@ -999,7 +989,7 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc1"/>
+ <object idref="ExprNodeColumnDesc2"/>
</void>
</object>
</void>
@@ -1049,7 +1039,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>KEY._col0</string>
</void>
@@ -1071,7 +1061,7 @@
<void property="keys">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc2"/>
+ <object idref="ExprNodeColumnDesc3"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml?rev=1626654&r1=1626653&r2=1626654&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml Mon Sep 22 01:00:09 2014
@@ -1713,18 +1713,11 @@
</void>
<void method="put">
<string>_col2</string>
- <object id="ExprNodeColumnDesc9" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>_col2</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object id="ExprNodeNullDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc"/>
</void>
<void method="put">
<string>_col1</string>
- <object id="ExprNodeColumnDesc10" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc9" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col1</string>
</void>
@@ -1735,7 +1728,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc11" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc10" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>_col0</string>
</void>
@@ -1751,15 +1744,15 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc11"/>
- </void>
- <void method="add">
<object idref="ExprNodeColumnDesc10"/>
</void>
<void method="add">
<object idref="ExprNodeColumnDesc9"/>
</void>
<void method="add">
+ <object idref="ExprNodeNullDesc0"/>
+ </void>
+ <void method="add">
<object idref="ExprNodeColumnDesc8"/>
</void>
</object>
@@ -1882,7 +1875,14 @@
<void property="children">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc9"/>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>_col2</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
</void>
</object>
</void>
@@ -1975,7 +1975,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col3</string>
- <object id="ExprNodeColumnDesc12" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc11" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>VALUE._col0</string>
</void>
@@ -1986,7 +1986,7 @@
</void>
<void method="put">
<string>_col2</string>
- <object id="ExprNodeColumnDesc13" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc12" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>KEY.reducesinkkey0</string>
</void>
@@ -1997,7 +1997,7 @@
</void>
<void method="put">
<string>_col1</string>
- <object id="ExprNodeColumnDesc14" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc13" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>VALUE._col0</string>
</void>
@@ -2008,7 +2008,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc15" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc14" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>KEY.reducesinkkey0</string>
</void>
@@ -2041,10 +2041,10 @@
<byte>0</byte>
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc15"/>
+ <object idref="ExprNodeColumnDesc14"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc14"/>
+ <object idref="ExprNodeColumnDesc13"/>
</void>
</object>
</void>
@@ -2052,10 +2052,10 @@
<byte>1</byte>
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc13"/>
+ <object idref="ExprNodeColumnDesc12"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc12"/>
+ <object idref="ExprNodeColumnDesc11"/>
</void>
</object>
</void>