You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by sz...@apache.org on 2015/01/06 07:58:44 UTC
svn commit: r1649740 [10/10] - in /hive/branches/spark: ./
beeline/src/java/org/apache/hive/beeline/
common/src/java/org/apache/hadoop/hive/conf/
contrib/src/test/results/clientpositive/ data/files/
itests/util/src/main/java/org/apache/hadoop/hive/ql/h...
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_24.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_24.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_24.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_24.q.out Tue Jan 6 06:58:42 2015
@@ -71,11 +71,11 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), 1 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: string)
+ outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Group By Operator
- aggregations: count(_col1)
+ aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
@@ -123,11 +123,11 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), 1 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: string)
+ outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Group By Operator
- aggregations: count(_col1)
+ aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_25.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_25.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_25.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_25.q.out Tue Jan 6 06:58:42 2015
@@ -89,11 +89,11 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), 1 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: string)
+ outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Group By Operator
- aggregations: count(_col1)
+ aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
@@ -139,11 +139,11 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), 1 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: string)
+ outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Group By Operator
- aggregations: count(_col1)
+ aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_4.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_4.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_4.q.out Tue Jan 6 06:58:42 2015
@@ -78,11 +78,11 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), 1 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: string)
+ outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Group By Operator
- aggregations: count(_col1)
+ aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
@@ -165,11 +165,11 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), 1 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: string)
+ outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Group By Operator
- aggregations: count(_col1)
+ aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_5.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_5.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_5.q.out Tue Jan 6 06:58:42 2015
@@ -87,11 +87,11 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), 1 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: string)
+ outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Group By Operator
- aggregations: count(_col1)
+ aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
@@ -174,7 +174,7 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), UDFToLong(1) (type: bigint)
+ expressions: key (type: string), 1 (type: bigint)
outputColumnNames: _col0, _col1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
File Output Operator
@@ -193,7 +193,7 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), UDFToLong(2) (type: bigint)
+ expressions: key (type: string), 2 (type: bigint)
outputColumnNames: _col0, _col1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
File Output Operator
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_7.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_7.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_7.q.out Tue Jan 6 06:58:42 2015
@@ -77,11 +77,11 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), 1 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: string)
+ outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Group By Operator
- aggregations: count(_col1)
+ aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
@@ -125,11 +125,11 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), 1 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: string)
+ outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Group By Operator
- aggregations: count(_col1)
+ aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_8.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_8.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_8.q.out Tue Jan 6 06:58:42 2015
@@ -84,11 +84,11 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), 1 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: string)
+ outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Group By Operator
- aggregations: count(_col1)
+ aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
@@ -132,7 +132,7 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), UDFToLong(1) (type: bigint)
+ expressions: key (type: string), 1 (type: bigint)
outputColumnNames: _col0, _col1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
File Output Operator
@@ -151,7 +151,7 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), UDFToLong(2) (type: bigint)
+ expressions: key (type: string), 2 (type: bigint)
outputColumnNames: _col0, _col1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
File Output Operator
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_remove_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_remove_9.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union_remove_9.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union_remove_9.q.out Tue Jan 6 06:58:42 2015
@@ -90,11 +90,11 @@ STAGE PLANS:
alias: inputtbl1
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Select Operator
- expressions: key (type: string), 1 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: string)
+ outputColumnNames: _col0
Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
Group By Operator
- aggregations: count(_col1)
+ aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_view.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union_view.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union_view.q.out Tue Jan 6 06:58:42 2015
@@ -262,11 +262,9 @@ STAGE PLANS:
filterExpr: (ds = '1') (type: boolean)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 1 (type: int)
- outputColumnNames: _col0
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Group By Operator
- aggregations: count(_col0)
+ aggregations: count(1)
mode: hash
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
@@ -335,11 +333,9 @@ STAGE PLANS:
filterExpr: (ds = '2') (type: boolean)
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 1 (type: int)
- outputColumnNames: _col0
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
Group By Operator
- aggregations: count(_col0)
+ aggregations: count(1)
mode: hash
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
@@ -408,11 +404,9 @@ STAGE PLANS:
filterExpr: (ds = '3') (type: boolean)
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 1 (type: int)
- outputColumnNames: _col0
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
Group By Operator
- aggregations: count(_col0)
+ aggregations: count(1)
mode: hash
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
@@ -864,11 +858,9 @@ STAGE PLANS:
Union
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 1 (type: int)
- outputColumnNames: _col0
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Group By Operator
- aggregations: count(_col0)
+ aggregations: count(1)
mode: hash
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
@@ -941,11 +933,9 @@ STAGE PLANS:
Union
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 1 (type: int)
- outputColumnNames: _col0
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
Group By Operator
- aggregations: count(_col0)
+ aggregations: count(1)
mode: hash
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
@@ -1018,11 +1008,9 @@ STAGE PLANS:
Union
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 1 (type: int)
- outputColumnNames: _col0
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
Group By Operator
- aggregations: count(_col0)
+ aggregations: count(1)
mode: hash
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
@@ -1164,11 +1152,9 @@ STAGE PLANS:
Union
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: 1 (type: int)
- outputColumnNames: _col0
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Group By Operator
- aggregations: count(_col0)
+ aggregations: count(1)
mode: hash
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
Modified: hive/branches/spark/ql/src/test/results/clientpositive/vector_cast_constant.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/vector_cast_constant.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/vector_cast_constant.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/vector_cast_constant.q.out Tue Jan 6 06:58:42 2015
@@ -124,11 +124,11 @@ STAGE PLANS:
alias: over1korc
Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: i (type: int), 50 (type: int), 50.0 (type: double), CAST( 50 AS decimal(10,0)) (type: decimal(10,0))
- outputColumnNames: _col0, _col1, _col2, _col3
+ expressions: i (type: int)
+ outputColumnNames: _col0
Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE
Group By Operator
- aggregations: avg(_col1), avg(_col2), avg(_col3)
+ aggregations: avg(50), avg(50.0), avg(50)
keys: _col0 (type: int)
mode: hash
outputColumnNames: _col0, _col1, _col2, _col3
@@ -138,7 +138,7 @@ STAGE PLANS:
sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col1 (type: struct<count:bigint,sum:double,input:int>), _col2 (type: struct<count:bigint,sum:double,input:double>), _col3 (type: struct<count:bigint,sum:decimal(20,0),input:decimal(10,0)>)
+ value expressions: _col1 (type: struct<count:bigint,sum:double,input:int>), _col2 (type: struct<count:bigint,sum:double,input:double>), _col3 (type: struct<count:bigint,sum:decimal(12,0),input:decimal(10,0)>)
Execution mode: vectorized
Reduce Operator Tree:
Group By Operator
Modified: hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_2.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_2.q.out Tue Jan 6 06:58:42 2015
@@ -914,17 +914,17 @@ STAGE PLANS:
alias: decimal_2
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: CAST( 3.14 AS decimal(4,2)) (type: decimal(4,2))
+ expressions: 3.14 (type: decimal(4,2))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col0 (type: decimal(4,2))
+ key expressions: 3.14 (type: decimal(3,2))
sort order: +
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
- Execution mode: vectorized
+ value expressions: _col0 (type: decimal(4,2))
Reduce Operator Tree:
Select Operator
- expressions: KEY.reducesinkkey0 (type: decimal(4,2))
+ expressions: VALUE._col0 (type: decimal(4,2))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -968,17 +968,17 @@ STAGE PLANS:
alias: decimal_2
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: CAST( 3.14 AS decimal(4,2)) (type: decimal(4,2))
+ expressions: 3.14 (type: decimal(4,2))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col0 (type: decimal(4,2))
+ key expressions: 3.14 (type: decimal(3,2))
sort order: +
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
- Execution mode: vectorized
+ value expressions: _col0 (type: decimal(4,2))
Reduce Operator Tree:
Select Operator
- expressions: KEY.reducesinkkey0 (type: decimal(4,2))
+ expressions: VALUE._col0 (type: decimal(4,2))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1022,16 +1022,17 @@ STAGE PLANS:
alias: decimal_2
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: CAST( 2012-12-19 11:12:19.1234567 AS decimal(30,8)) (type: decimal(30,8))
+ expressions: 1355944339.1234567 (type: decimal(30,8))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col0 (type: decimal(30,8))
+ key expressions: 1355944339.1234567 (type: decimal(17,7))
sort order: +
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
+ value expressions: _col0 (type: decimal(30,8))
Reduce Operator Tree:
Select Operator
- expressions: KEY.reducesinkkey0 (type: decimal(30,8))
+ expressions: VALUE._col0 (type: decimal(30,8))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1075,16 +1076,18 @@ STAGE PLANS:
alias: decimal_2
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: CAST( true AS decimal(10,0)) (type: decimal(10,0))
+ expressions: 1 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col0 (type: decimal(10,0))
+ key expressions: 1 (type: int)
sort order: +
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
+ value expressions: _col0 (type: decimal(10,0))
+ Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: KEY.reducesinkkey0 (type: decimal(10,0))
+ expressions: VALUE._col0 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1119,16 +1122,18 @@ STAGE PLANS:
alias: decimal_2
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: CAST( true AS decimal(10,0)) (type: decimal(10,0))
+ expressions: 1 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col0 (type: decimal(10,0))
+ key expressions: 1 (type: int)
sort order: +
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
+ value expressions: _col0 (type: decimal(10,0))
+ Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: KEY.reducesinkkey0 (type: decimal(10,0))
+ expressions: VALUE._col0 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1172,17 +1177,18 @@ STAGE PLANS:
alias: decimal_2
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: CAST( 3 AS decimal(10,0)) (type: decimal(10,0))
+ expressions: 3 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col0 (type: decimal(10,0))
+ key expressions: 3 (type: int)
sort order: +
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
+ value expressions: _col0 (type: decimal(10,0))
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: KEY.reducesinkkey0 (type: decimal(10,0))
+ expressions: VALUE._col0 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1226,17 +1232,18 @@ STAGE PLANS:
alias: decimal_2
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: CAST( 3 AS decimal(10,0)) (type: decimal(10,0))
+ expressions: 3 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col0 (type: decimal(10,0))
+ key expressions: 3 (type: int)
sort order: +
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
+ value expressions: _col0 (type: decimal(10,0))
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: KEY.reducesinkkey0 (type: decimal(10,0))
+ expressions: VALUE._col0 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1280,17 +1287,18 @@ STAGE PLANS:
alias: decimal_2
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: CAST( 3 AS decimal(10,0)) (type: decimal(10,0))
+ expressions: 3 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col0 (type: decimal(10,0))
+ key expressions: 3 (type: int)
sort order: +
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
+ value expressions: _col0 (type: decimal(10,0))
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: KEY.reducesinkkey0 (type: decimal(10,0))
+ expressions: VALUE._col0 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1334,17 +1342,18 @@ STAGE PLANS:
alias: decimal_2
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: CAST( 3 AS decimal(10,0)) (type: decimal(10,0))
+ expressions: 3 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col0 (type: decimal(10,0))
+ key expressions: 3 (type: int)
sort order: +
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
+ value expressions: _col0 (type: decimal(10,0))
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: KEY.reducesinkkey0 (type: decimal(10,0))
+ expressions: VALUE._col0 (type: decimal(10,0))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1388,17 +1397,18 @@ STAGE PLANS:
alias: decimal_2
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: CAST( 1.0 AS decimal(20,19)) (type: decimal(20,19))
+ expressions: 1 (type: decimal(20,19))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col0 (type: decimal(20,19))
+ key expressions: 1 (type: int)
sort order: +
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
+ value expressions: _col0 (type: decimal(20,19))
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: KEY.reducesinkkey0 (type: decimal(20,19))
+ expressions: VALUE._col0 (type: decimal(20,19))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1442,16 +1452,17 @@ STAGE PLANS:
alias: decimal_2
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Select Operator
- expressions: CAST( '0.99999999999999999999' AS decimal(20,20)) (type: decimal(20,20))
+ expressions: 0.99999999999999999999 (type: decimal(20,20))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col0 (type: decimal(20,20))
+ key expressions: 0.99999999999999999999 (type: decimal(20,20))
sort order: +
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
+ value expressions: _col0 (type: decimal(20,20))
Reduce Operator Tree:
Select Operator
- expressions: KEY.reducesinkkey0 (type: decimal(20,20))
+ expressions: VALUE._col0 (type: decimal(20,20))
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
Modified: hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_udf.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_udf.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_udf.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/vector_decimal_udf.q.out Tue Jan 6 06:58:42 2015
@@ -2407,11 +2407,11 @@ STAGE PLANS:
alias: decimal_udf
Statistics: Num rows: 38 Data size: 4296 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: key (type: decimal(20,10)), 3 (type: int)
- outputColumnNames: _col0, _col1
+ expressions: key (type: decimal(20,10))
+ outputColumnNames: _col0
Statistics: Num rows: 38 Data size: 4296 Basic stats: COMPLETE Column stats: NONE
Group By Operator
- aggregations: histogram_numeric(_col0, _col1)
+ aggregations: histogram_numeric(_col0, 3)
mode: hash
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
Modified: hive/branches/spark/ql/src/test/results/compiler/errors/wrong_distinct2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/compiler/errors/wrong_distinct2.q.out?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/compiler/errors/wrong_distinct2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/compiler/errors/wrong_distinct2.q.out Tue Jan 6 06:58:42 2015
@@ -1 +1 @@
-Parse Error: line 2:45 cannot recognize input near 'DISTINCT' 'substr' '(' in select expression
\ No newline at end of file
+Parse Error: line 2:45 cannot recognize input near 'DISTINCT' 'substr' '(' in selection target
\ No newline at end of file
Modified: hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyVoidObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyVoidObjectInspector.java?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyVoidObjectInspector.java (original)
+++ hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyVoidObjectInspector.java Tue Jan 6 06:58:42 2015
@@ -39,6 +39,6 @@ public class LazyVoidObjectInspector ext
@Override
public Object getPrimitiveJavaObject(Object o) {
- throw new RuntimeException("Internal error: cannot create Void object.");
+ return null;
}
}
Modified: hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java (original)
+++ hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java Tue Jan 6 06:58:42 2015
@@ -209,7 +209,7 @@ public final class ObjectInspectorConver
* can contain non-settable fields only if inputOI equals outputOI and equalsCheck is
* true.
*/
- private static ObjectInspector getConvertedOI(
+ public static ObjectInspector getConvertedOI(
ObjectInspector inputOI,
ObjectInspector outputOI,
Map<ObjectInspector, Boolean> oiSettableProperties,
Modified: hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java (original)
+++ hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java Tue Jan 6 06:58:42 2015
@@ -1000,6 +1000,9 @@ public final class ObjectInspectorUtils
}
public static ConstantObjectInspector getConstantObjectInspector(ObjectInspector oi, Object value) {
+ if (oi instanceof ConstantObjectInspector) {
+ return (ConstantObjectInspector) oi;
+ }
ObjectInspector writableOI = getStandardObjectInspector(oi, ObjectInspectorCopyOption.WRITABLE);
Object writableValue =
ObjectInspectorConverters.getConverter(oi, writableOI).convert(value);
Modified: hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java (original)
+++ hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java Tue Jan 6 06:58:42 2015
@@ -478,6 +478,9 @@ public class PrimitiveObjectInspectorCon
@Override
public Object convert(Object input) {
+ if (input == null) {
+ return null;
+ }
switch (inputOI.getPrimitiveCategory()) {
case BOOLEAN:
return outputOI.set(hc,
@@ -504,6 +507,9 @@ public class PrimitiveObjectInspectorCon
@Override
public Object convert(Object input) {
+ if (input == null) {
+ return null;
+ }
switch (inputOI.getPrimitiveCategory()) {
case BOOLEAN:
return outputOI.set(hc,
Modified: hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableVoidObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableVoidObjectInspector.java?rev=1649740&r1=1649739&r2=1649740&view=diff
==============================================================================
--- hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableVoidObjectInspector.java (original)
+++ hive/branches/spark/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableVoidObjectInspector.java Tue Jan 6 06:58:42 2015
@@ -44,6 +44,6 @@ public class WritableVoidObjectInspector
@Override
public Object getPrimitiveJavaObject(Object o) {
- throw new RuntimeException("Internal error: cannot create Void object.");
+ return null;
}
}