You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2014/10/14 21:07:05 UTC
svn commit: r1631841 [37/42] - in /hive/branches/llap: ./ accumulo-handler/
accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/columns/
accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/mr/
accumulo-handler/src/java/org/apache/hadoop/hiv...
Modified: hive/branches/llap/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out Tue Oct 14 19:06:45 2014
@@ -1,10 +1,16 @@
PREHOOK: query: -- Test timestamp functions in vectorized mode to verify they run correctly end-to-end.
+-- Turning on vectorization has been temporarily moved after filling the test table
+-- due to bug HIVE-8197.
+
CREATE TABLE alltypesorc_string(ctimestamp1 timestamp, stimestamp1 string) STORED AS ORC
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@alltypesorc_string
POSTHOOK: query: -- Test timestamp functions in vectorized mode to verify they run correctly end-to-end.
+-- Turning on vectorization has been temporarily moved after filling the test table
+-- due to bug HIVE-8197.
+
CREATE TABLE alltypesorc_string(ctimestamp1 timestamp, stimestamp1 string) STORED AS ORC
POSTHOOK: type: CREATETABLE
@@ -513,25 +519,25 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: alltypesorc_wrong
- Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: to_unix_timestamp(stimestamp1) (type: bigint), year(stimestamp1) (type: int), month(stimestamp1) (type: int), day(stimestamp1) (type: int), dayofmonth(stimestamp1) (type: int), weekofyear(stimestamp1) (type: int), hour(stimestamp1) (type: int), minute(stimestamp1) (type: int), second(stimestamp1) (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
- Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
key expressions: _col0 (type: bigint)
sort order: +
- Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col8 (type: int)
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: int)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
- Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -576,3 +582,254 @@ POSTHOOK: Input: default@alltypesorc_wro
NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL
+PREHOOK: query: EXPLAIN SELECT
+ min(ctimestamp1),
+ max(ctimestamp1),
+ count(ctimestamp1),
+ count(*)
+FROM alltypesorc_string
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN SELECT
+ min(ctimestamp1),
+ max(ctimestamp1),
+ count(ctimestamp1),
+ count(*)
+FROM alltypesorc_string
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+ Stage-1 is a root stage
+ Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+ Stage: Stage-1
+ Map Reduce
+ Map Operator Tree:
+ TableScan
+ alias: alltypesorc_string
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
+ Select Operator
+ expressions: ctimestamp1 (type: timestamp)
+ outputColumnNames: ctimestamp1
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
+ Group By Operator
+ aggregations: min(ctimestamp1), max(ctimestamp1), count(ctimestamp1), count()
+ mode: hash
+ outputColumnNames: _col0, _col1, _col2, _col3
+ Statistics: Num rows: 1 Data size: 96 Basic stats: COMPLETE Column stats: NONE
+ Reduce Output Operator
+ sort order:
+ Statistics: Num rows: 1 Data size: 96 Basic stats: COMPLETE Column stats: NONE
+ value expressions: _col0 (type: timestamp), _col1 (type: timestamp), _col2 (type: bigint), _col3 (type: bigint)
+ Execution mode: vectorized
+ Reduce Operator Tree:
+ Group By Operator
+ aggregations: min(VALUE._col0), max(VALUE._col1), count(VALUE._col2), count(VALUE._col3)
+ mode: mergepartial
+ outputColumnNames: _col0, _col1, _col2, _col3
+ Statistics: Num rows: 1 Data size: 96 Basic stats: COMPLETE Column stats: NONE
+ Select Operator
+ expressions: _col0 (type: timestamp), _col1 (type: timestamp), _col2 (type: bigint), _col3 (type: bigint)
+ outputColumnNames: _col0, _col1, _col2, _col3
+ Statistics: Num rows: 1 Data size: 96 Basic stats: COMPLETE Column stats: NONE
+ File Output Operator
+ compressed: false
+ Statistics: Num rows: 1 Data size: 96 Basic stats: COMPLETE Column stats: NONE
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+ Stage: Stage-0
+ Fetch Operator
+ limit: -1
+ Processor Tree:
+ ListSink
+
+PREHOOK: query: SELECT
+ min(ctimestamp1),
+ max(ctimestamp1),
+ count(ctimestamp1),
+ count(*)
+FROM alltypesorc_string
+PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypesorc_string
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT
+ min(ctimestamp1),
+ max(ctimestamp1),
+ count(ctimestamp1),
+ count(*)
+FROM alltypesorc_string
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypesorc_string
+#### A masked pattern was here ####
+1969-12-31 23:59:44.088 1970-01-01 00:00:15.007 39 40
+PREHOOK: query: -- SUM of timestamps are not vectorized reduce-side because they produce a double instead of a long (HIVE-8211)...
+EXPLAIN SELECT
+ sum(ctimestamp1)
+FROM alltypesorc_string
+PREHOOK: type: QUERY
+POSTHOOK: query: -- SUM of timestamps are not vectorized reduce-side because they produce a double instead of a long (HIVE-8211)...
+EXPLAIN SELECT
+ sum(ctimestamp1)
+FROM alltypesorc_string
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+ Stage-1 is a root stage
+ Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+ Stage: Stage-1
+ Map Reduce
+ Map Operator Tree:
+ TableScan
+ alias: alltypesorc_string
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
+ Select Operator
+ expressions: ctimestamp1 (type: timestamp)
+ outputColumnNames: ctimestamp1
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
+ Group By Operator
+ aggregations: sum(ctimestamp1)
+ mode: hash
+ outputColumnNames: _col0
+ Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+ Reduce Output Operator
+ sort order:
+ Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+ value expressions: _col0 (type: double)
+ Reduce Operator Tree:
+ Group By Operator
+ aggregations: sum(VALUE._col0)
+ mode: mergepartial
+ outputColumnNames: _col0
+ Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+ Select Operator
+ expressions: _col0 (type: double)
+ outputColumnNames: _col0
+ Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+ File Output Operator
+ compressed: false
+ Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+ Stage: Stage-0
+ Fetch Operator
+ limit: -1
+ Processor Tree:
+ ListSink
+
+PREHOOK: query: SELECT
+ sum(ctimestamp1)
+FROM alltypesorc_string
+PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypesorc_string
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT
+ sum(ctimestamp1)
+FROM alltypesorc_string
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypesorc_string
+#### A masked pattern was here ####
+1123143.8569999998
+PREHOOK: query: EXPLAIN SELECT
+ avg(ctimestamp1),
+ variance(ctimestamp1),
+ var_pop(ctimestamp1),
+ var_samp(ctimestamp1),
+ std(ctimestamp1),
+ stddev(ctimestamp1),
+ stddev_pop(ctimestamp1),
+ stddev_samp(ctimestamp1)
+FROM alltypesorc_string
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN SELECT
+ avg(ctimestamp1),
+ variance(ctimestamp1),
+ var_pop(ctimestamp1),
+ var_samp(ctimestamp1),
+ std(ctimestamp1),
+ stddev(ctimestamp1),
+ stddev_pop(ctimestamp1),
+ stddev_samp(ctimestamp1)
+FROM alltypesorc_string
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+ Stage-1 is a root stage
+ Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+ Stage: Stage-1
+ Map Reduce
+ Map Operator Tree:
+ TableScan
+ alias: alltypesorc_string
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
+ Select Operator
+ expressions: ctimestamp1 (type: timestamp)
+ outputColumnNames: ctimestamp1
+ Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE
+ Group By Operator
+ aggregations: avg(ctimestamp1), variance(ctimestamp1), var_pop(ctimestamp1), var_samp(ctimestamp1), std(ctimestamp1), stddev(ctimestamp1), stddev_pop(ctimestamp1), stddev_samp(ctimestamp1)
+ mode: hash
+ outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
+ Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
+ Reduce Output Operator
+ sort order:
+ Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
+ value expressions: _col0 (type: struct<count:bigint,sum:double,input:timestamp>), _col1 (type: struct<count:bigint,sum:double,variance:double>), _col2 (type: struct<count:bigint,sum:double,variance:double>), _col3 (type: struct<count:bigint,sum:double,variance:double>), _col4 (type: struct<count:bigint,sum:double,variance:double>), _col5 (type: struct<count:bigint,sum:double,variance:double>), _col6 (type: struct<count:bigint,sum:double,variance:double>), _col7 (type: struct<count:bigint,sum:double,variance:double>)
+ Execution mode: vectorized
+ Reduce Operator Tree:
+ Group By Operator
+ aggregations: avg(VALUE._col0), variance(VALUE._col1), var_pop(VALUE._col2), var_samp(VALUE._col3), std(VALUE._col4), stddev(VALUE._col5), stddev_pop(VALUE._col6), stddev_samp(VALUE._col7)
+ mode: mergepartial
+ outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
+ Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE
+ Select Operator
+ expressions: _col0 (type: double), _col1 (type: double), _col2 (type: double), _col3 (type: double), _col4 (type: double), _col5 (type: double), _col6 (type: double), _col7 (type: double)
+ outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
+ Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE
+ File Output Operator
+ compressed: false
+ Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+ Stage: Stage-0
+ Fetch Operator
+ limit: -1
+ Processor Tree:
+ ListSink
+
+PREHOOK: query: SELECT
+ avg(ctimestamp1),
+ variance(ctimestamp1),
+ var_pop(ctimestamp1),
+ var_samp(ctimestamp1),
+ std(ctimestamp1),
+ stddev(ctimestamp1),
+ stddev_pop(ctimestamp1),
+ stddev_samp(ctimestamp1)
+FROM alltypesorc_string
+PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypesorc_string
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT
+ avg(ctimestamp1),
+ variance(ctimestamp1),
+ var_pop(ctimestamp1),
+ var_samp(ctimestamp1),
+ std(ctimestamp1),
+ stddev(ctimestamp1),
+ stddev_pop(ctimestamp1),
+ stddev_samp(ctimestamp1)
+FROM alltypesorc_string
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypesorc_string
+#### A masked pattern was here ####
+2.8798560435897438E13 8.970772952794212E19 8.970772952794212E19 9.206845925236166E19 9.471416447815084E9 9.471416447815084E9 9.471416447815084E9 9.595231068211002E9
Modified: hive/branches/llap/ql/src/test/results/clientpositive/windowing.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/windowing.q.out?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/windowing.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/windowing.q.out Tue Oct 14 19:06:45 2014
@@ -2362,3 +2362,15 @@ POSTHOOK: Input: default@part
1602.59 1549.8900000000003 4649.670000000001
1414.42 1523.5400000000004 3047.080000000001
1632.66 1632.6600000000008 1632.6600000000008
+PREHOOK: query: -- 47. empty partition
+select sum(p_size) over (partition by p_mfgr )
+from part where p_mfgr = 'm1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
+POSTHOOK: query: -- 47. empty partition
+select sum(p_size) over (partition by p_mfgr )
+from part where p_mfgr = 'm1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
Modified: hive/branches/llap/ql/src/test/results/compiler/parse/udf6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/parse/udf6.q.out?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/parse/udf6.q.out (original)
+++ hive/branches/llap/ql/src/test/results/compiler/parse/udf6.q.out Tue Oct 14 19:06:45 2014
@@ -1 +1 @@
-(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION CONCAT 'a' 'b')) (TOK_SELEXPR (TOK_FUNCTION IF TRUE 1 2))))) <EOF>
\ No newline at end of file
+(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION CONCAT 'a' 'b')) (TOK_SELEXPR (+ (TOK_FUNCTION IF TRUE 1 2) (TOK_TABLE_OR_COL key)))))) <EOF>
\ No newline at end of file
Modified: hive/branches/llap/ql/src/test/results/compiler/plan/cast1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/cast1.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/cast1.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/cast1.q.xml Tue Oct 14 19:06:45 2014
@@ -378,282 +378,100 @@
<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>
+ <object id="ExprNodeConstantDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="foldedFromCol">
+ <string>UDFToInteger(true)</string>
</void>
<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>
+ <object id="ExprNodeConstantDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="foldedFromCol">
+ <string>UDFToBoolean(1)</string>
</void>
<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>
+ <object id="ExprNodeConstantDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="foldedFromCol">
+ <string>(3 + UDFToInteger(2.0))</string>
</void>
<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>
+ <object id="ExprNodeConstantDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="foldedFromCol">
+ <string>(3.0 + 2.0)</string>
</void>
<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>
+ <object id="ExprNodeConstantDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="foldedFromCol">
+ <string>(3 + 2.0)</string>
</void>
<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>
+ <object id="ExprNodeConstantDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="foldedFromCol">
+ <string>(3.0 + 2)</string>
</void>
<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>
+ <object id="ExprNodeConstantDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="foldedFromCol">
+ <string>(3 + 2)</string>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo0"/>
</void>
+ <void property="value">
+ <int>5</int>
+ </void>
</object>
</void>
</object>
@@ -663,74 +481,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/branches/llap/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/groupby1.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/groupby1.q.xml Tue Oct 14 19:06:45 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/branches/llap/ql/src/test/results/compiler/plan/groupby2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/groupby2.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/groupby2.q.xml Tue Oct 14 19:06:45 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/branches/llap/ql/src/test/results/compiler/plan/groupby3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/groupby3.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/groupby3.q.xml Tue Oct 14 19:06:45 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/branches/llap/ql/src/test/results/compiler/plan/groupby4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/groupby4.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/groupby4.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/groupby4.q.xml Tue Oct 14 19:06:45 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/branches/llap/ql/src/test/results/compiler/plan/groupby5.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/groupby5.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/groupby5.q.xml Tue Oct 14 19:06:45 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/branches/llap/ql/src/test/results/compiler/plan/groupby6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/groupby6.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/groupby6.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/groupby6.q.xml Tue Oct 14 19:06:45 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/branches/llap/ql/src/test/results/compiler/plan/input1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/input1.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/input1.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/input1.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -432,66 +432,7 @@
<boolean>true</boolean>
</void>
<void property="table">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.dest1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct dest1 { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>columns.comments</string>
- <string>default<char code="#0"/>default</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- </object>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>
Modified: hive/branches/llap/ql/src/test/results/compiler/plan/input2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/input2.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/input2.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/input2.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -432,66 +432,7 @@
<boolean>true</boolean>
</void>
<void property="table">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.dest1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct dest1 { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>columns.comments</string>
- <string>default<char code="#0"/>default</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- </object>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>
Modified: hive/branches/llap/ql/src/test/results/compiler/plan/input3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/input3.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/input3.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/input3.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -432,66 +432,7 @@
<boolean>true</boolean>
</void>
<void property="table">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.dest1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct dest1 { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>columns.comments</string>
- <string>default<char code="#0"/>default</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- </object>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>
@@ -881,7 +822,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -979,66 +920,7 @@
<boolean>true</boolean>
</void>
<void property="table">
- <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.dest2</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct dest2 { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>columns.comments</string>
- <string>default<char code="#0"/>default</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- </object>
+ <object idref="TableDesc1"/>
</void>
</object>
</void>
@@ -1440,7 +1322,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -1547,70 +1429,7 @@
<boolean>true</boolean>
</void>
<void property="table">
- <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.dest3</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct dest3 { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>partition_columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>columns.comments</string>
- <string>default<char code="#0"/>default</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- </object>
+ <object idref="TableDesc2"/>
</void>
</object>
</void>
Modified: hive/branches/llap/ql/src/test/results/compiler/plan/input6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/compiler/plan/input6.q.xml?rev=1631841&r1=1631840&r2=1631841&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/compiler/plan/input6.q.xml (original)
+++ hive/branches/llap/ql/src/test/results/compiler/plan/input6.q.xml Tue Oct 14 19:06:45 2014
@@ -334,7 +334,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -432,66 +432,7 @@
<boolean>true</boolean>
</void>
<void property="table">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.dest1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct dest1 { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>columns.comments</string>
- <string>default<char code="#0"/>default</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- </object>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>