You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/03/04 18:58:38 UTC
svn commit: r1452423 [1/3] - in /hive/trunk/ql/src:
java/org/apache/hadoop/hive/ql/optimizer/ test/results/clientpositive/
test/results/compiler/plan/
Author: hashutosh
Date: Mon Mar 4 17:58:37 2013
New Revision: 1452423
URL: http://svn.apache.org/r1452423
Log:
HIVE-4020: Swap applying order of CP and PPD (Navis via Ashutosh Chauhan)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
hive/trunk/ql/src/test/results/clientpositive/auto_join19.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join9.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
hive/trunk/ql/src/test/results/clientpositive/input39_hadoop20.q.out
hive/trunk/ql/src/test/results/clientpositive/join38.q.out
hive/trunk/ql/src/test/results/clientpositive/join9.q.out
hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/lateral_view_ppd.q.out
hive/trunk/ql/src/test/results/clientpositive/louter_join_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out
hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out
hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out
hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out
hive/trunk/ql/src/test/results/clientpositive/stats11.q.out
hive/trunk/ql/src/test/results/clientpositive/union26.q.out
hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java Mon Mar 4 17:58:37 2013
@@ -49,9 +49,6 @@ public class Optimizer {
transformations = new ArrayList<Transform>();
// Add the transformation that computes the lineage information.
transformations.add(new Generator());
- if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTCP)) {
- transformations.add(new ColumnPruner());
- }
if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTPPD)) {
transformations.add(new PredicateTransitivePropagate());
transformations.add(new PredicatePushDown());
@@ -62,6 +59,9 @@ public class Optimizer {
transformations.add(new ListBucketingPruner());
}
}
+ if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTCP)) {
+ transformations.add(new ColumnPruner());
+ }
if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVE_OPTIMIZE_SKEWJOIN_COMPILETIME)) {
transformations.add(new SkewJoinOptimizer());
}
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join19.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join19.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join19.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join19.q.out Mon Mar 4 17:58:37 2013
@@ -42,7 +42,7 @@ STAGE PLANS:
alias: src2
HashTable Sink Operator
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
@@ -60,13 +60,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Position of Big Table: 0
Select Operator
expressions:
@@ -111,7 +111,7 @@ STAGE PLANS:
alias: src1
HashTable Sink Operator
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
@@ -129,13 +129,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Position of Big Table: 1
Select Operator
expressions:
@@ -173,10 +173,6 @@ STAGE PLANS:
value expressions:
expr: key
type: string
- expr: ds
- type: string
- expr: hr
- type: string
src2
TableScan
alias: src2
@@ -197,10 +193,10 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {VALUE._col0} {VALUE._col2} {VALUE._col3}
+ 0 {VALUE._col0}
1 {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Select Operator
expressions:
expr: UDFToInteger(_col0)
@@ -217,7 +213,6 @@ STAGE PLANS:
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
name: default.dest1
-
PREHOOK: query: FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src2.value
where (src1.ds = '2008-04-08' or src1.ds = '2008-04-09' )and (src1.hr = '12' or src1.hr = '11')
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join9.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join9.q.out Mon Mar 4 17:58:37 2013
@@ -40,7 +40,7 @@ STAGE PLANS:
alias: src2
HashTable Sink Operator
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
@@ -58,13 +58,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Position of Big Table: 0
Select Operator
expressions:
@@ -109,7 +109,7 @@ STAGE PLANS:
alias: src1
HashTable Sink Operator
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
@@ -127,13 +127,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds} {hr}
+ 0 {key}
1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Position of Big Table: 1
Select Operator
expressions:
@@ -171,10 +171,6 @@ STAGE PLANS:
value expressions:
expr: key
type: string
- expr: ds
- type: string
- expr: hr
- type: string
src2
TableScan
alias: src2
@@ -195,10 +191,10 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {VALUE._col0} {VALUE._col2} {VALUE._col3}
+ 0 {VALUE._col0}
1 {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Select Operator
expressions:
expr: UDFToInteger(_col0)
@@ -215,7 +211,6 @@ STAGE PLANS:
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
name: default.dest1
-
PREHOOK: query: FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src2.value where src1.ds = '2008-04-08' and src1.hr = '12'
PREHOOK: type: QUERY
Modified: hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out Mon Mar 4 17:58:37 2013
@@ -53,7 +53,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -77,12 +77,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col6, _col7
+ outputColumnNames: _col0, _col1, _col6
Position of Big Table: 0
BucketMapJoin: true
Select Operator
@@ -167,7 +167,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -196,12 +196,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col6, _col7
+ outputColumnNames: _col0, _col1, _col6
Position of Big Table: 1
BucketMapJoin: true
Select Operator
@@ -359,7 +359,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -385,12 +385,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col5, _col6
+ outputColumnNames: _col0, _col1, _col5
Position of Big Table: 0
BucketMapJoin: true
Select Operator
@@ -849,7 +849,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -875,12 +875,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col5, _col6
+ outputColumnNames: _col0, _col1, _col5
Position of Big Table: 1
BucketMapJoin: true
Select Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out Mon Mar 4 17:58:37 2013
@@ -85,7 +85,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -104,12 +104,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col5, _col6
+ outputColumnNames: _col0, _col1, _col5
Position of Big Table: 0
Select Operator
expressions:
Modified: hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out Mon Mar 4 17:58:37 2013
@@ -81,8 +81,6 @@ STAGE PLANS:
value expressions:
expr: value
type: string
- expr: ds
- type: string
Needs Tagging: true
Path -> Alias:
#### A masked pattern was here ####
@@ -138,9 +136,9 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {VALUE._col0}
- 1 {VALUE._col1} {VALUE._col2}
+ 1 {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col6, _col7
+ outputColumnNames: _col0, _col6
File Output Operator
compressed: false
GlobalTableId: 0
@@ -150,8 +148,8 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
properties:
- columns _col0,_col6,_col7
- columns.types int,string,string
+ columns _col0,_col6
+ columns.types int,string
escape.delim \
TotalFiles: 1
GatherStats: false
@@ -206,15 +204,15 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
properties:
- columns _col0,_col6,_col7
- columns.types int,string,string
+ columns _col0,_col6
+ columns.types int,string
escape.delim \
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
properties:
- columns _col0,_col6,_col7
- columns.types int,string,string
+ columns _col0,_col6
+ columns.types int,string
escape.delim \
#### A masked pattern was here ####
Partition
Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out Mon Mar 4 17:58:37 2013
@@ -57,18 +57,15 @@ STAGE PLANS:
expr: key
type: string
tag: 1
- value expressions:
- expr: key
- type: string
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
condition expressions:
0 {VALUE._col0} {VALUE._col1}
- 1 {VALUE._col0}
+ 1
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col4
+ outputColumnNames: _col0, _col1
Select Operator
expressions:
expr: _col0
@@ -111,7 +108,6 @@ STAGE PLANS:
Fetch Operator
limit: -1
-
PREHOOK: query: SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
PREHOOK: type: QUERY
PREHOOK: Input: default@src
@@ -376,18 +372,15 @@ STAGE PLANS:
expr: key
type: string
tag: 1
- value expressions:
- expr: key
- type: string
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
condition expressions:
0 {VALUE._col0} {VALUE._col1}
- 1 {VALUE._col0}
+ 1
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col4
+ outputColumnNames: _col0, _col1
Select Operator
expressions:
expr: _col0
Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out Mon Mar 4 17:58:37 2013
@@ -57,18 +57,15 @@ STAGE PLANS:
expr: key
type: string
tag: 1
- value expressions:
- expr: key
- type: string
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
condition expressions:
0 {VALUE._col0} {VALUE._col1}
- 1 {VALUE._col0}
+ 1
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col4
+ outputColumnNames: _col0, _col1
Select Operator
expressions:
expr: _col0
@@ -111,7 +108,6 @@ STAGE PLANS:
Fetch Operator
limit: -1
-
PREHOOK: query: SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90 ORDER BY a.key
PREHOOK: type: QUERY
PREHOOK: Input: default@src
@@ -353,18 +349,15 @@ STAGE PLANS:
expr: key
type: string
tag: 1
- value expressions:
- expr: key
- type: string
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
condition expressions:
0 {VALUE._col0} {VALUE._col1}
- 1 {VALUE._col0}
+ 1
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col4
+ outputColumnNames: _col0, _col1
Select Operator
expressions:
expr: _col0
Modified: hive/trunk/ql/src/test/results/clientpositive/input39_hadoop20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input39_hadoop20.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input39_hadoop20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input39_hadoop20.q.out Mon Mar 4 17:58:37 2013
@@ -96,9 +96,6 @@ STAGE PLANS:
expr: key
type: string
tag: 0
- value expressions:
- expr: ds
- type: string
t2
TableScan
alias: t2
@@ -115,18 +112,14 @@ STAGE PLANS:
expr: key
type: string
tag: 1
- value expressions:
- expr: ds
- type: string
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {VALUE._col2}
- 1 {VALUE._col2}
+ 0
+ 1
handleSkewJoin: false
- outputColumnNames: _col2, _col7
Select Operator
Group By Operator
aggregations:
Modified: hive/trunk/ql/src/test/results/clientpositive/join38.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join38.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join38.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join38.q.out Mon Mar 4 17:58:37 2013
@@ -95,7 +95,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {value}
- 1 {col5} {col11}
+ 1 {col5}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -117,12 +117,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {value}
- 1 {col5} {col11}
+ 1 {col5}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[col11]]
- outputColumnNames: _col1, _col9, _col15
+ outputColumnNames: _col1, _col9
Position of Big Table: 1
Select Operator
expressions:
Modified: hive/trunk/ql/src/test/results/clientpositive/join9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join9.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join9.q.out Mon Mar 4 17:58:37 2013
@@ -39,10 +39,6 @@ STAGE PLANS:
value expressions:
expr: key
type: string
- expr: ds
- type: string
- expr: hr
- type: string
src2
TableScan
alias: src2
@@ -156,10 +152,10 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {VALUE._col0} {VALUE._col2} {VALUE._col3}
+ 0 {VALUE._col0}
1 {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col2, _col3, _col7
+ outputColumnNames: _col0, _col7
Select Operator
expressions:
expr: UDFToInteger(_col0)
Modified: hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out Mon Mar 4 17:58:37 2013
@@ -50,7 +50,7 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -65,7 +65,7 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -87,13 +87,13 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
2 [Column[key]]
- outputColumnNames: _col0, _col5, _col9, _col10, _col11
+ outputColumnNames: _col0, _col5, _col9
Position of Big Table: 2
Select Operator
expressions:
@@ -598,7 +598,7 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [class org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge(Column[key]()]
@@ -613,7 +613,7 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [class org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge(Column[key]()]
@@ -635,13 +635,13 @@ STAGE PLANS:
condition expressions:
0 {key}
1 {value}
- 2 {value} {ds} {hr}
+ 2 {value}
handleSkewJoin: false
keys:
0 [class org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge(Column[key]()]
1 [class org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge(Column[key]()]
2 [class org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge(Column[key]()]
- outputColumnNames: _col0, _col5, _col9, _col10, _col11
+ outputColumnNames: _col0, _col5, _col9
Position of Big Table: 2
Select Operator
expressions:
Modified: hive/trunk/ql/src/test/results/clientpositive/lateral_view_ppd.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/lateral_view_ppd.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/lateral_view_ppd.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/lateral_view_ppd.q.out Mon Mar 4 17:58:37 2013
@@ -22,9 +22,12 @@ STAGE PLANS:
type: boolean
Lateral View Forward
Select Operator
- SELECT * : (no compute)
+ expressions:
+ expr: value
+ type: string
+ outputColumnNames: value
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2
+ outputColumnNames: _col1, _col2
Select Operator
expressions:
expr: _col1
@@ -46,7 +49,7 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2
+ outputColumnNames: _col1, _col2
Select Operator
expressions:
expr: _col1
@@ -193,13 +196,9 @@ STAGE PLANS:
expressions:
expr: value
type: string
- expr: ds
- type: string
- expr: hr
- type: string
- outputColumnNames: value, ds, hr
+ outputColumnNames: value
Lateral View Join Operator
- outputColumnNames: _col1, _col2, _col3, _col4
+ outputColumnNames: _col1, _col4
Select Operator
expressions:
expr: _col1
@@ -222,7 +221,7 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col1, _col2, _col3, _col4
+ outputColumnNames: _col1, _col4
Select Operator
expressions:
expr: _col1
@@ -289,14 +288,22 @@ STAGE PLANS:
type: boolean
Lateral View Forward
Select Operator
- SELECT * : (no compute)
+ expressions:
+ expr: value
+ type: string
+ outputColumnNames: value
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2
+ outputColumnNames: _col1, _col2
Lateral View Forward
Select Operator
- SELECT * : (no compute)
+ expressions:
+ expr: _col1
+ type: string
+ expr: _col2
+ type: int
+ outputColumnNames: _col1, _col2
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3
+ outputColumnNames: _col1, _col2, _col3
Select Operator
expressions:
expr: _col1
@@ -318,7 +325,7 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3
+ outputColumnNames: _col1, _col2, _col3
Select Operator
expressions:
expr: _col1
@@ -340,12 +347,17 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2
+ outputColumnNames: _col1, _col2
Lateral View Forward
Select Operator
- SELECT * : (no compute)
+ expressions:
+ expr: _col1
+ type: string
+ expr: _col2
+ type: int
+ outputColumnNames: _col1, _col2
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3
+ outputColumnNames: _col1, _col2, _col3
Select Operator
expressions:
expr: _col1
@@ -367,7 +379,7 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3
+ outputColumnNames: _col1, _col2, _col3
Select Operator
expressions:
expr: _col1
Modified: hive/trunk/ql/src/test/results/clientpositive/louter_join_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/louter_join_ppr.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/louter_join_ppr.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/louter_join_ppr.q.out Mon Mar 4 17:58:37 2013
@@ -1164,8 +1164,6 @@ STAGE PLANS:
type: string
expr: value
type: string
- expr: ds
- type: string
b
TableScan
alias: b
@@ -1332,10 +1330,10 @@ STAGE PLANS:
condition map:
Left Outer Join0 to 1
condition expressions:
- 0 {VALUE._col0} {VALUE._col1} {VALUE._col2}
+ 0 {VALUE._col0} {VALUE._col1}
1 {VALUE._col0} {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col2, _col6, _col7
+ outputColumnNames: _col0, _col1, _col6, _col7
Filter Operator
isSamplingPred: false
predicate:
Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out Mon Mar 4 17:58:37 2013
@@ -358,9 +358,7 @@ STAGE PLANS:
expressions:
expr: _col0
type: int
- expr: _col6
- type: int
- outputColumnNames: _col0, _col1
+ outputColumnNames: _col0
File Output Operator
compressed: false
GlobalTableId: 0
@@ -378,8 +376,6 @@ STAGE PLANS:
value expressions:
expr: _col0
type: int
- expr: _col1
- type: int
d
TableScan
alias: d
@@ -396,10 +392,10 @@ STAGE PLANS:
condition map:
Left Outer Join0 to 1
condition expressions:
- 0 {VALUE._col0} {VALUE._col1}
+ 0 {VALUE._col0}
1 {VALUE._col0} {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col3, _col4
+ outputColumnNames: _col0, _col3, _col4
Filter Operator
predicate:
expr: (_col3 = 1)
Modified: hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out Mon Mar 4 17:58:37 2013
@@ -784,8 +784,6 @@ STAGE PLANS:
type: string
expr: value
type: string
- expr: ds
- type: string
Needs Tagging: true
Path -> Alias:
#### A masked pattern was here ####
@@ -930,9 +928,9 @@ STAGE PLANS:
Right Outer Join0 to 1
condition expressions:
0 {VALUE._col0} {VALUE._col1}
- 1 {VALUE._col0} {VALUE._col1} {VALUE._col2}
+ 1 {VALUE._col0} {VALUE._col1}
handleSkewJoin: false
- outputColumnNames: _col0, _col1, _col4, _col5, _col6
+ outputColumnNames: _col0, _col1, _col4, _col5
Filter Operator
isSamplingPred: false
predicate:
Modified: hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out Mon Mar 4 17:58:37 2013
@@ -46,13 +46,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds}
+ 0 {key}
1 {key} {value} {ds}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col5, _col6, _col7
+ outputColumnNames: _col0, _col5, _col6, _col7
Position of Big Table: 0
Select Operator
expressions:
@@ -141,13 +141,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds}
+ 0 {key}
1 {key} {value} {ds}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col5, _col6, _col7
+ outputColumnNames: _col0, _col5, _col6, _col7
Position of Big Table: 1
Select Operator
expressions:
@@ -269,13 +269,13 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key} {ds}
+ 0 {key}
1 {key} {value} {ds}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col2, _col5, _col6, _col7
+ outputColumnNames: _col0, _col5, _col6, _col7
Position of Big Table: 0
Select Operator
expressions:
Modified: hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out Mon Mar 4 17:58:37 2013
@@ -76,13 +76,12 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key}
+ 0
1
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0
Position of Big Table: 0
Select Operator
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out Mon Mar 4 17:58:37 2013
@@ -84,13 +84,12 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key}
+ 0
1
handleSkewJoin: false
keys:
0 [Column[key], Column[value]]
1 [Column[key], Column[value]]
- outputColumnNames: _col0
Position of Big Table: 0
Select Operator
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out Mon Mar 4 17:58:37 2013
@@ -84,13 +84,12 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key}
+ 0
1
handleSkewJoin: false
keys:
0 [Column[key], Column[value]]
1 [Column[key], Column[value]]
- outputColumnNames: _col0
Position of Big Table: 0
Select Operator
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out Mon Mar 4 17:58:37 2013
@@ -85,7 +85,7 @@ STAGE PLANS:
type: boolean
HashTable Sink Operator
condition expressions:
- 0 {key}
+ 0
1
handleSkewJoin: false
keys:
@@ -107,13 +107,12 @@ STAGE PLANS:
condition map:
Inner Join 0 to 1
condition expressions:
- 0 {key}
+ 0
1
handleSkewJoin: false
keys:
0 [Column[key], Column[value]]
1 [Column[key], Column[value]]
- outputColumnNames: _col0
Position of Big Table: 0
Select Operator
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/stats11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats11.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats11.q.out Mon Mar 4 17:58:37 2013
@@ -306,7 +306,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -332,12 +332,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col5, _col6
+ outputColumnNames: _col0, _col1, _col5
Position of Big Table: 0
BucketMapJoin: true
Select Operator
@@ -796,7 +796,7 @@ STAGE PLANS:
HashTable Sink Operator
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
@@ -822,12 +822,12 @@ STAGE PLANS:
Inner Join 0 to 1
condition expressions:
0 {key} {value}
- 1 {value} {ds}
+ 1 {value}
handleSkewJoin: false
keys:
0 [Column[key]]
1 [Column[key]]
- outputColumnNames: _col0, _col1, _col5, _col6
+ outputColumnNames: _col0, _col1, _col5
Position of Big Table: 1
BucketMapJoin: true
Select Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/union26.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union26.q.out?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union26.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union26.q.out Mon Mar 4 17:58:37 2013
@@ -151,9 +151,14 @@ STAGE PLANS:
alias: srcpart
Lateral View Forward
Select Operator
- SELECT * : (no compute)
+ expressions:
+ expr: key
+ type: string
+ expr: value
+ type: string
+ outputColumnNames: key, value
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3, _col4
+ outputColumnNames: _col0, _col1, _col4
Select Operator
expressions:
expr: _col0
@@ -204,7 +209,7 @@ STAGE PLANS:
UDTF Operator
function name: explode
Lateral View Join Operator
- outputColumnNames: _col0, _col1, _col2, _col3, _col4
+ outputColumnNames: _col0, _col1, _col4
Select Operator
expressions:
expr: _col0
Modified: hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml Mon Mar 4 17:58:37 2013
@@ -1085,35 +1085,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList1" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>aint</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>astring</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>lint</string>
</void>
@@ -1126,24 +1100,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>lstring</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
- <void property="listElementTypeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>lintstring</string>
</void>
@@ -1155,62 +1112,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>mstringstring</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
- <void property="mapKeyTypeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- <void property="mapValueTypeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src_thrift</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1261,7 +1162,113 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList1"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>aint</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>astring</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>lstring</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo">
+ <void property="listElementTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>mstringstring</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo">
+ <void property="mapKeyTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ <void property="mapValueTypeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src_thrift</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml Mon Mar 4 17:58:37 2013
@@ -961,9 +961,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList0" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -975,55 +975,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>value</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo3"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo3"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1071,7 +1022,60 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList0"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo3"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml Mon Mar 4 17:58:37 2013
@@ -963,9 +963,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList1" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -978,7 +978,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -990,42 +990,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1076,7 +1040,50 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList1"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml Mon Mar 4 17:58:37 2013
@@ -949,9 +949,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList1" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -964,7 +964,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -976,42 +976,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src1</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src1</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1062,7 +1026,50 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList1"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo1"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml Mon Mar 4 17:58:37 2013
@@ -945,9 +945,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList1" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -959,55 +959,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>value</string>
- </void>
- <void property="tabAlias">
- <string>src1</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>src1</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>src1</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -1055,7 +1006,60 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList1"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>src1</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=1452423&r1=1452422&r2=1452423&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml Mon Mar 4 17:58:37 2013
@@ -638,9 +638,9 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object id="ArrayList0" class="java.util.ArrayList">
+ <object class="java.util.ArrayList">
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>key</string>
</void>
@@ -653,7 +653,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>value</string>
</void>
@@ -666,7 +666,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo2" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>ds</string>
</void>
@@ -679,7 +679,7 @@
</object>
</void>
<void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <object id="ColumnInfo3" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
<void property="internalName">
<string>hr</string>
</void>
@@ -691,42 +691,6 @@
</void>
</object>
</void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>BLOCK__OFFSET__INSIDE__FILE</string>
- </void>
- <void property="tabAlias">
- <string>srcpart</string>
- </void>
- <void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="hiddenVirtualCol">
- <boolean>true</boolean>
- </void>
- <void property="internalName">
- <string>INPUT__FILE__NAME</string>
- </void>
- <void property="tabAlias">
- <string>srcpart</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
</object>
</void>
</object>
@@ -777,7 +741,56 @@
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
- <object idref="ArrayList0"/>
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ColumnInfo0"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo1"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo2"/>
+ </void>
+ <void method="add">
+ <object idref="ColumnInfo3"/>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="tabAlias">
+ <string>srcpart</string>
+ </void>
+ <void property="type">
+ <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="hiddenVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="internalName">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="tabAlias">
+ <string>srcpart</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
</void>
</object>
</void>