diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java index 790a92e..b323cb5 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java @@ -670,10 +670,15 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx ctx, Object.. cppCtx.getOpToConstantExprs().put(op, constants); foldOperator(op, cppCtx); List colList = op.getConf().getColList(); + List columnNames = op.getConf().getOutputColumnNames(); + Map columnExprMap = op.getColumnExprMap(); if (colList != null) { for (int i = 0; i < colList.size(); i++) { ExprNodeDesc newCol = foldExpr(colList.get(i), constants, cppCtx, op, 0, false); colList.set(i, newCol); + if (columnExprMap != null) { + columnExprMap.put(columnNames.get(i), newCol); + } } LOG.debug("New column list:(" + StringUtils.join(colList, " ") + ")"); } diff --git a/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q b/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q new file mode 100644 index 0000000..149a290 --- /dev/null +++ b/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q @@ -0,0 +1,4 @@ +explain extended + select * from (select a.key as ak, a.value as av, b.key as bk, b.value as bv from src a join src1 b where a.key = '429' ) c; + + select * from (select a.key as ak, a.value as av, b.key as bk, b.value as bv from src a join src1 b where a.key = '429' ) c; diff --git a/ql/src/test/results/clientpositive/annotate_stats_select.q.out b/ql/src/test/results/clientpositive/annotate_stats_select.q.out index 1b3b334..c181927 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_select.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_select.q.out @@ -690,10 +690,10 @@ STAGE PLANS: Select Operator expressions: null (type: void) outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 2 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 2 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git a/ql/src/test/results/clientpositive/auto_join8.q.out b/ql/src/test/results/clientpositive/auto_join8.q.out index 2e3d1c8..bf9b8b4 100644 --- a/ql/src/test/results/clientpositive/auto_join8.q.out +++ b/ql/src/test/results/clientpositive/auto_join8.q.out @@ -97,7 +97,7 @@ STAGE PLANS: predicate: _col2 is null (type: boolean) Statistics: Num rows: 15 Data size: 163 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToInteger(_col2) (type: int), _col3 (type: string) + expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToInteger(null) (type: int), _col3 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 15 Data size: 163 Basic stats: COMPLETE Column stats: NONE File Output Operator diff --git a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out new file mode 100644 index 0000000..317a642 --- /dev/null +++ b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out @@ -0,0 +1,298 @@ +Warning: Shuffle Join JOIN[4][tables = [a, b]] in Stage 'Stage-1:MAPRED' is a cross product +PREHOOK: query: explain extended + select * from (select a.key as ak, a.value as av, b.key as bk, b.value as bv from src a join src1 b where a.key = '429' ) c +PREHOOK: type: QUERY +POSTHOOK: query: explain extended + select * from (select a.key as ak, a.value as av, b.key as bk, b.value as bv from src a join src1 b where a.key = '429' ) c +POSTHOOK: type: QUERY +ABSTRACT SYNTAX TREE: + +TOK_QUERY + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + src + a + TOK_TABREF + TOK_TABNAME + src1 + b + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + ak + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + av + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + key + bk + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + bv + TOK_WHERE + = + . + TOK_TABLE_OR_COL + a + key + '429' + c + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + + +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: a + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + GatherStats: false + Filter Operator + isSamplingPred: false + predicate: (key = '429') (type: boolean) + Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + sort order: + Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE + tag: 0 + value expressions: value (type: string) + auto parallelism: false + TableScan + alias: b + Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE + GatherStats: false + Reduce Output Operator + sort order: + Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE + tag: 1 + value expressions: key (type: string), value (type: string) + auto parallelism: false + Path -> Alias: +#### A masked pattern was here #### + Path -> Partition: +#### A masked pattern was here #### + Partition + base file name: src + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + COLUMN_STATS_ACCURATE true + bucket_count -1 + columns key,value + columns.comments defaultdefault + columns.types string:string +#### A masked pattern was here #### + name default.src + numFiles 1 + numRows 500 + rawDataSize 5312 + serialization.ddl struct src { string key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + totalSize 5812 +#### A masked pattern was here #### + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + COLUMN_STATS_ACCURATE true + bucket_count -1 + columns key,value + columns.comments defaultdefault + columns.types string:string +#### A masked pattern was here #### + name default.src + numFiles 1 + numRows 500 + rawDataSize 5312 + serialization.ddl struct src { string key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + totalSize 5812 +#### A masked pattern was here #### + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: default.src + name: default.src +#### A masked pattern was here #### + Partition + base file name: src1 + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + COLUMN_STATS_ACCURATE true + bucket_count -1 + columns key,value + columns.comments defaultdefault + columns.types string:string +#### A masked pattern was here #### + name default.src1 + numFiles 1 + numRows 25 + rawDataSize 191 + serialization.ddl struct src1 { string key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + totalSize 216 +#### A masked pattern was here #### + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + COLUMN_STATS_ACCURATE true + bucket_count -1 + columns key,value + columns.comments defaultdefault + columns.types string:string +#### A masked pattern was here #### + name default.src1 + numFiles 1 + numRows 25 + rawDataSize 191 + serialization.ddl struct src1 { string key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + totalSize 216 +#### A masked pattern was here #### + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: default.src1 + name: default.src1 + Truncated Path -> Alias: + /src [c:a] + /src1 [c:b] + Needs Tagging: true + Reduce Operator Tree: + Join Operator + condition map: + Inner Join 0 to 1 + condition expressions: + 0 {VALUE._col1} + 1 {VALUE._col0} {VALUE._col1} + outputColumnNames: _col1, _col5, _col6 + Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: '429' (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string) + outputColumnNames: _col0, _col1, _col2, _col3 + Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + GlobalTableId: 0 +#### A masked pattern was here #### + NumFilesPerFileSink: 1 + Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE +#### A masked pattern was here #### + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + columns _col0,_col1,_col2,_col3 + columns.types string:string:string:string + escape.delim \ + hive.serialization.extend.nesting.levels true + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + TotalFiles: 1 + GatherStats: false + MultiFileSpray: false + + Stage: Stage-0 + Fetch Operator + limit: -1 + Processor Tree: + ListSink + +Warning: Shuffle Join JOIN[4][tables = [a, b]] in Stage 'Stage-1:MAPRED' is a cross product +PREHOOK: query: select * from (select a.key as ak, a.value as av, b.key as bk, b.value as bv from src a join src1 b where a.key = '429' ) c +PREHOOK: type: QUERY +PREHOOK: Input: default@src +PREHOOK: Input: default@src1 +#### A masked pattern was here #### +POSTHOOK: query: select * from (select a.key as ak, a.value as av, b.key as bk, b.value as bv from src a join src1 b where a.key = '429' ) c +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src +POSTHOOK: Input: default@src1 +#### A masked pattern was here #### +429 val_429 +429 val_429 +429 val_429 +429 val_429 406 val_406 +429 val_429 146 val_146 +429 val_429 213 val_213 +429 val_429 128 +429 val_429 66 val_66 +429 val_429 369 +429 val_429 224 +429 val_429 273 val_273 +429 val_429 150 val_150 +429 val_429 401 val_401 +429 val_429 val_193 +429 val_429 val_265 +429 val_429 val_484 +429 val_429 98 val_98 +429 val_429 278 val_278 +429 val_429 255 val_255 +429 val_429 val_409 +429 val_429 val_165 +429 val_429 val_27 +429 val_429 311 val_311 +429 val_429 +429 val_429 238 val_238 +429 val_429 +429 val_429 +429 val_429 +429 val_429 406 val_406 +429 val_429 146 val_146 +429 val_429 213 val_213 +429 val_429 128 +429 val_429 66 val_66 +429 val_429 369 +429 val_429 224 +429 val_429 273 val_273 +429 val_429 150 val_150 +429 val_429 401 val_401 +429 val_429 val_193 +429 val_429 val_265 +429 val_429 val_484 +429 val_429 98 val_98 +429 val_429 278 val_278 +429 val_429 255 val_255 +429 val_429 val_409 +429 val_429 val_165 +429 val_429 val_27 +429 val_429 311 val_311 +429 val_429 +429 val_429 238 val_238 diff --git a/ql/src/test/results/clientpositive/join8.q.out b/ql/src/test/results/clientpositive/join8.q.out index 6435b92..9e13a5e 100644 --- a/ql/src/test/results/clientpositive/join8.q.out +++ b/ql/src/test/results/clientpositive/join8.q.out @@ -90,7 +90,7 @@ STAGE PLANS: predicate: _col2 is null (type: boolean) Statistics: Num rows: 15 Data size: 163 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToInteger(_col2) (type: int), _col3 (type: string) + expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToInteger(null) (type: int), _col3 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 15 Data size: 163 Basic stats: COMPLETE Column stats: NONE File Output Operator diff --git a/ql/src/test/results/clientpositive/join_view.q.out b/ql/src/test/results/clientpositive/join_view.q.out index 3e54177..ef97996 100644 --- a/ql/src/test/results/clientpositive/join_view.q.out +++ b/ql/src/test/results/clientpositive/join_view.q.out @@ -59,7 +59,7 @@ STAGE PLANS: outputColumnNames: _col1, _col6 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col1 (type: string), _col6 (type: int), _col8 (type: string) + expressions: _col1 (type: string), _col6 (type: int), '2011-09-01' (type: string) outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE File Output Operator diff --git a/ql/src/test/results/clientpositive/lateral_view_ppd.q.out b/ql/src/test/results/clientpositive/lateral_view_ppd.q.out index 756679a..b186192 100644 --- a/ql/src/test/results/clientpositive/lateral_view_ppd.q.out +++ b/ql/src/test/results/clientpositive/lateral_view_ppd.q.out @@ -109,7 +109,7 @@ STAGE PLANS: outputColumnNames: _col1, _col5 Statistics: Num rows: 375 Data size: 3984 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: _col1 (type: string), _col5 (type: int) + expressions: _col1 (type: string), 1 (type: int) outputColumnNames: _col0, _col1 Statistics: Num rows: 375 Data size: 3984 Basic stats: COMPLETE Column stats: NONE File Output Operator @@ -133,7 +133,7 @@ STAGE PLANS: outputColumnNames: _col1, _col5 Statistics: Num rows: 375 Data size: 3984 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: _col1 (type: string), _col5 (type: int) + expressions: _col1 (type: string), 1 (type: int) outputColumnNames: _col0, _col1 Statistics: Num rows: 375 Data size: 3984 Basic stats: COMPLETE Column stats: NONE File Output Operator diff --git a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out index 221ee70..85fc092 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out @@ -409,7 +409,7 @@ STAGE PLANS: predicate: (x = 484) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: x (type: int), y (type: string) + expressions: 484 (type: int), y (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE File Output Operator diff --git a/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out b/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out index f51b5a3..e8822b1 100644 --- a/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out +++ b/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out @@ -145,7 +145,7 @@ STAGE PLANS: predicate: (_col7 = 3) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: int), _col6 (type: int), _col7 (type: int) + expressions: _col0 (type: int), _col6 (type: int), 3 (type: int) outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE File Output Operator diff --git a/ql/src/test/results/clientpositive/select_dummy_source.q.out b/ql/src/test/results/clientpositive/select_dummy_source.q.out index 651ce1d..0074a40 100644 --- a/ql/src/test/results/clientpositive/select_dummy_source.q.out +++ b/ql/src/test/results/clientpositive/select_dummy_source.q.out @@ -277,7 +277,7 @@ STAGE PLANS: Row Limit Per Split: 1 Statistics: Num rows: 0 Data size: 1 Basic stats: PARTIAL Column stats: COMPLETE Select Operator - expressions: 5 (type: int), (1 + 2) (type: int) + expressions: 5 (type: int), 3 (type: int) outputColumnNames: _col0, _col1 Statistics: Num rows: 0 Data size: 1 Basic stats: PARTIAL Column stats: COMPLETE File Output Operator diff --git a/ql/src/test/results/clientpositive/subquery_multiinsert.q.out b/ql/src/test/results/clientpositive/subquery_multiinsert.q.out index 399c4f8..ebd47ca 100644 --- a/ql/src/test/results/clientpositive/subquery_multiinsert.q.out +++ b/ql/src/test/results/clientpositive/subquery_multiinsert.q.out @@ -99,7 +99,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator @@ -566,7 +566,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator diff --git a/ql/src/test/results/clientpositive/subquery_notin.q.out b/ql/src/test/results/clientpositive/subquery_notin.q.out index d0e50b9..c5cfe15 100644 --- a/ql/src/test/results/clientpositive/subquery_notin.q.out +++ b/ql/src/test/results/clientpositive/subquery_notin.q.out @@ -150,7 +150,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator @@ -537,7 +537,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator @@ -823,7 +823,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator @@ -1145,7 +1145,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator @@ -1489,7 +1489,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator diff --git a/ql/src/test/results/clientpositive/subquery_notin_having.q.out b/ql/src/test/results/clientpositive/subquery_notin_having.q.out index 91581de..87da349 100644 --- a/ql/src/test/results/clientpositive/subquery_notin_having.q.out +++ b/ql/src/test/results/clientpositive/subquery_notin_having.q.out @@ -99,7 +99,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator @@ -476,7 +476,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator @@ -728,7 +728,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator diff --git a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out index fe99821..273037a 100644 --- a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out +++ b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out @@ -928,7 +928,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator diff --git a/ql/src/test/results/clientpositive/subquery_views.q.out b/ql/src/test/results/clientpositive/subquery_views.q.out index 472fa10..50a5e29 100644 --- a/ql/src/test/results/clientpositive/subquery_views.q.out +++ b/ql/src/test/results/clientpositive/subquery_views.q.out @@ -120,7 +120,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator @@ -287,7 +287,7 @@ STAGE PLANS: predicate: (_col0 = 0) (type: boolean) Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator - expressions: _col0 (type: bigint) + expressions: 0 (type: bigint) outputColumnNames: _col0 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Group By Operator diff --git a/ql/src/test/results/clientpositive/udf4.q.out b/ql/src/test/results/clientpositive/udf4.q.out index 9ea9293..1dfd7f8 100644 --- a/ql/src/test/results/clientpositive/udf4.q.out +++ b/ql/src/test/results/clientpositive/udf4.q.out @@ -79,10 +79,10 @@ STAGE PLANS: Select Operator expressions: 1.0 (type: double), 2.0 (type: double), -2.0 (type: double), 1 (type: bigint), 1 (type: bigint), -2 (type: bigint), 1.0 (type: double), null (type: void), 0.0 (type: double), 1 (type: bigint), 2 (type: bigint), -1 (type: bigint), 1 (type: bigint), rand(3) (type: double), 3 (type: int), -3 (type: int), 3 (type: int), -1 (type: int), -2 (type: int), -2 (type: tinyint), -2 (type: smallint), -2 (type: bigint), 0 (type: tinyint), 0 (type: smallint), 0 (type: int), 0 (type: bigint), 3 (type: tinyint), 3 (type: smallint), 3 (type: int), 3 (type: bigint), 2 (type: tinyint), 2 (type: smallint), 2 (type: int), 2 (type: bigint) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, _col26, _col27, _col28, _col29, _col30, _col31, _col32, _col33 - Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git a/ql/src/test/results/clientpositive/udf7.q.out b/ql/src/test/results/clientpositive/udf7.q.out index 05f2037..e258d0b 100644 --- a/ql/src/test/results/clientpositive/udf7.q.out +++ b/ql/src/test/results/clientpositive/udf7.q.out @@ -49,10 +49,10 @@ STAGE PLANS: Select Operator expressions: 1.098612288668 (type: double), null (type: void), null (type: void), 1.098612288668 (type: double), null (type: void), null (type: void), 1.584962500721 (type: double), null (type: void), null (type: void), 0.47712125472 (type: double), null (type: void), null (type: void), 1.584962500721 (type: double), null (type: void), null (type: void), null (type: void), -1.0 (type: double), 7.389056098931 (type: double), 8.0 (type: double), 8.0 (type: double), 0.125 (type: double), 8.0 (type: double), 2.0 (type: double), NaN (type: double), 1.0 (type: double), power(CAST( 1 AS decimal(10,0)), 0) (type: double), power(CAST( 2 AS decimal(10,0)), 3) (type: double), power(CAST( 2 AS decimal(10,0)), 3) (type: double) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, _col26, _col27 - Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 1 Data size: 136 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 1 Data size: 136 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git a/ql/src/test/results/clientpositive/udf_case.q.out b/ql/src/test/results/clientpositive/udf_case.q.out index 7eab4ab..29905ab 100644 --- a/ql/src/test/results/clientpositive/udf_case.q.out +++ b/ql/src/test/results/clientpositive/udf_case.q.out @@ -91,7 +91,7 @@ STAGE PLANS: Select Operator expressions: 2 (type: int), 5 (type: int), 15 (type: int), null (type: void), CASE (17) WHEN (18) THEN (null) WHEN (17) THEN (20) END (type: int), 24 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 - Statistics: Num rows: 500 Data size: 12000 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 500 Data size: 10000 Basic stats: COMPLETE Column stats: COMPLETE ListSink PREHOOK: query: SELECT CASE 1 diff --git a/ql/src/test/results/clientpositive/udf_elt.q.out b/ql/src/test/results/clientpositive/udf_elt.q.out index fe6c856..f8acbf2 100644 --- a/ql/src/test/results/clientpositive/udf_elt.q.out +++ b/ql/src/test/results/clientpositive/udf_elt.q.out @@ -54,7 +54,7 @@ STAGE PLANS: Select Operator expressions: 'defg' (type: string), 'cc' (type: string), 'abc' (type: string), '2' (type: string), '12345' (type: string), '123456789012' (type: string), '1.25' (type: string), '16.0' (type: string), elt(null, 'abc', 'defg') (type: string), null (type: void), null (type: void) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 - Statistics: Num rows: 500 Data size: 479500 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 500 Data size: 395500 Basic stats: COMPLETE Column stats: COMPLETE ListSink PREHOOK: query: SELECT elt(2, 'abc', 'defg'), diff --git a/ql/src/test/results/clientpositive/udf_when.q.out b/ql/src/test/results/clientpositive/udf_when.q.out index fb262a7..696d7b0 100644 --- a/ql/src/test/results/clientpositive/udf_when.q.out +++ b/ql/src/test/results/clientpositive/udf_when.q.out @@ -91,7 +91,7 @@ STAGE PLANS: Select Operator expressions: 2 (type: int), 9 (type: int), 14 (type: int), null (type: void), CASE WHEN (false) THEN (null) WHEN (true) THEN (24) END (type: int), CASE WHEN (false) THEN (27) WHEN (true) THEN (null) END (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 - Statistics: Num rows: 500 Data size: 12000 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 500 Data size: 10000 Basic stats: COMPLETE Column stats: COMPLETE ListSink PREHOOK: query: SELECT CASE diff --git a/ql/src/test/results/clientpositive/vector_elt.q.out b/ql/src/test/results/clientpositive/vector_elt.q.out index 55f63b7..d3cc179 100644 --- a/ql/src/test/results/clientpositive/vector_elt.q.out +++ b/ql/src/test/results/clientpositive/vector_elt.q.out @@ -104,13 +104,13 @@ STAGE PLANS: Select Operator expressions: 'defg' (type: string), 'cc' (type: string), 'abc' (type: string), '2' (type: string), '12345' (type: string), '123456789012' (type: string), '1.25' (type: string), '16.0' (type: string), null (type: void), null (type: void) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9 - Statistics: Num rows: 12288 Data size: 10752000 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 12288 Data size: 8687616 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 1 - Statistics: Num rows: 1 Data size: 875 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 1 Data size: 707 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 875 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 1 Data size: 707 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git a/ql/src/test/results/compiler/plan/cast1.q.xml b/ql/src/test/results/compiler/plan/cast1.q.xml index fe34e5b..e135567 100644 --- a/ql/src/test/results/compiler/plan/cast1.q.xml +++ b/ql/src/test/results/compiler/plan/cast1.q.xml @@ -378,282 +378,79 @@ _col6 - - - - - - - - - - true - - - - - - - - - org.apache.hadoop.hive.ql.udf.UDFToInteger - - - UDFToInteger - - - + + + 1 + _col5 - - - - - - - - - - 1 - - - - - - - - - org.apache.hadoop.hive.ql.udf.UDFToBoolean - - - UDFToBoolean - - - + + + true + _col4 - - - - - - - - - - 3 - - - - - - - - - - - - - - 2.0 - - - - - - - - - org.apache.hadoop.hive.ql.udf.UDFToInteger - - - UDFToInteger - - - - - - - - - - - - - - false - - - + + + 5 + _col3 - - - - - - - - - - 3.0 - - - - - - - - - - 2.0 - - - - - - - - - false - - - + + + 5.0 + _col2 - - - - - - - - - - 3 - - - - - - - - - - 2.0 - - - - - - - - - false - - - + + + 5.0 + _col1 - - - - - - - - - - 3.0 - - - - - - - - - - 2 - - - - - - - - - false - - - + + + 5.0 + _col0 - - - - - - - - - - 3 - - - - - - - - - - 2 - - - - - - - - - false - - - + + + 5 + @@ -663,74 +460,25 @@ - - - - - - 5 - - + - - - - - - 5.0 - - + - - - - - - 5.0 - - + - - - - - - 5.0 - - + - - - - - - 5 - - + - - - - - - true - - + - - - - - - 1 - - + diff --git a/ql/src/test/results/compiler/plan/groupby1.q.xml b/ql/src/test/results/compiler/plan/groupby1.q.xml index b895372..4f2e132 100755 --- a/ql/src/test/results/compiler/plan/groupby1.q.xml +++ b/ql/src/test/results/compiler/plan/groupby1.q.xml @@ -732,7 +732,7 @@ value - + value @@ -790,7 +790,7 @@ key - + key @@ -809,30 +809,10 @@ - - - key - - - src - - - - - + - - - value - - - src - - - - - + @@ -1233,7 +1213,7 @@ _col1 - + _col1 @@ -1247,7 +1227,7 @@ _col0 - + _col0 @@ -1266,10 +1246,10 @@ - + - + @@ -1335,7 +1315,7 @@ _col0 - + KEY._col0 @@ -1387,7 +1367,7 @@ - + diff --git a/ql/src/test/results/compiler/plan/groupby2.q.xml b/ql/src/test/results/compiler/plan/groupby2.q.xml index 46a7a5f..fe050e2 100755 --- a/ql/src/test/results/compiler/plan/groupby2.q.xml +++ b/ql/src/test/results/compiler/plan/groupby2.q.xml @@ -819,7 +819,7 @@ value - + value @@ -877,7 +877,7 @@ key - + key @@ -896,30 +896,10 @@ - - - key - - - src - - - - - + - - - value - - - src - - - - - + @@ -1397,7 +1377,7 @@ _col1 - + _col1 @@ -1411,7 +1391,7 @@ _col0 - + _col0 @@ -1430,10 +1410,10 @@ - + - + @@ -1524,7 +1504,7 @@ _col0 - + KEY._col0 @@ -1611,7 +1591,7 @@ - + diff --git a/ql/src/test/results/compiler/plan/groupby3.q.xml b/ql/src/test/results/compiler/plan/groupby3.q.xml index 5b6af21..2246a7b 100644 --- a/ql/src/test/results/compiler/plan/groupby3.q.xml +++ b/ql/src/test/results/compiler/plan/groupby3.q.xml @@ -1065,7 +1065,7 @@ value - + value @@ -1142,17 +1142,7 @@ - - - value - - - src - - - - - + @@ -1606,7 +1596,7 @@ _col4 - + _col4 @@ -1620,7 +1610,7 @@ _col3 - + _col3 @@ -1634,7 +1624,7 @@ _col2 - + _col2 @@ -1648,7 +1638,7 @@ _col1 - + _col1 @@ -1662,7 +1652,7 @@ _col0 - + _col0 @@ -1681,6 +1671,9 @@ + + + @@ -1692,9 +1685,6 @@ - - - diff --git a/ql/src/test/results/compiler/plan/groupby4.q.xml b/ql/src/test/results/compiler/plan/groupby4.q.xml index 92086c3..909f6dd 100644 --- a/ql/src/test/results/compiler/plan/groupby4.q.xml +++ b/ql/src/test/results/compiler/plan/groupby4.q.xml @@ -561,7 +561,7 @@ key - + key @@ -580,17 +580,7 @@ - - - key - - - src - - - - - + @@ -980,7 +970,7 @@ _col0 - + _col0 @@ -999,7 +989,7 @@ - + @@ -1049,7 +1039,7 @@ _col0 - + KEY._col0 @@ -1071,7 +1061,7 @@ - + diff --git a/ql/src/test/results/compiler/plan/groupby5.q.xml b/ql/src/test/results/compiler/plan/groupby5.q.xml index 26e59d9..1106075 100644 --- a/ql/src/test/results/compiler/plan/groupby5.q.xml +++ b/ql/src/test/results/compiler/plan/groupby5.q.xml @@ -584,7 +584,7 @@ value - + value @@ -642,7 +642,7 @@ key - + key @@ -661,30 +661,10 @@ - - - key - - - src - - - - - + - - - value - - - src - - - - - + @@ -1105,7 +1085,7 @@ _col1 - + _col1 @@ -1119,7 +1099,7 @@ _col0 - + _col0 @@ -1138,10 +1118,10 @@ - + - + @@ -1213,7 +1193,7 @@ _col0 - + KEY._col0 @@ -1265,7 +1245,7 @@ - + diff --git a/ql/src/test/results/compiler/plan/groupby6.q.xml b/ql/src/test/results/compiler/plan/groupby6.q.xml index 87e83c9..86c00eb 100644 --- a/ql/src/test/results/compiler/plan/groupby6.q.xml +++ b/ql/src/test/results/compiler/plan/groupby6.q.xml @@ -503,7 +503,7 @@ value - + value @@ -580,17 +580,7 @@ - - - value - - - src - - - - - + @@ -980,7 +970,7 @@ _col0 - + _col0 @@ -999,7 +989,7 @@ - + @@ -1049,7 +1039,7 @@ _col0 - + KEY._col0 @@ -1071,7 +1061,7 @@ - + diff --git a/ql/src/test/results/compiler/plan/join8.q.xml b/ql/src/test/results/compiler/plan/join8.q.xml index 2fd7a37..7ef3d43 100644 --- a/ql/src/test/results/compiler/plan/join8.q.xml +++ b/ql/src/test/results/compiler/plan/join8.q.xml @@ -1713,18 +1713,11 @@ _col2 - - - _col2 - - - - - + _col1 - + _col1 @@ -1735,7 +1728,7 @@ _col0 - + _col0 @@ -1751,15 +1744,15 @@ - - - + + + @@ -1882,7 +1875,14 @@ - + + + _col2 + + + + + @@ -1975,7 +1975,7 @@ _col3 - + VALUE._col0 @@ -1986,7 +1986,7 @@ _col2 - + KEY.reducesinkkey0 @@ -1997,7 +1997,7 @@ _col1 - + VALUE._col0 @@ -2008,7 +2008,7 @@ _col0 - + KEY.reducesinkkey0 @@ -2041,10 +2041,10 @@ 0 - + - + @@ -2052,10 +2052,10 @@ 1 - + - + diff --git a/ql/src/test/results/compiler/plan/udf1.q.xml b/ql/src/test/results/compiler/plan/udf1.q.xml index e34f4d1..44988ac 100644 --- a/ql/src/test/results/compiler/plan/udf1.q.xml +++ b/ql/src/test/results/compiler/plan/udf1.q.xml @@ -534,795 +534,189 @@ _col8 - - - - - - - - - - - - - - - - - - - - .* - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFRegExp - - - rlike - - - + + + true + _col7 - - - - - - - - - - ab - - - - - - - - - - a - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFLike - - - like - - - + + + false + _col6 - - - - - - - - - - ab - - - - - - - - - - _a% - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFLike - - - like - - - + + + false + _col5 - - - - - - - - - - ab - - - - - - - - - - \%\_ - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFLike - - - like - - - + + + false + _col4 - - - - - - - - - - %_ - - - - - - - - - - \%\_ - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFLike - - - like - - - + + + true + _col3 - - - - - - - - - - ab - - - - - - - - - - %a_ - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFLike - - - like - - - + + + true + _col2 - - - - - - - - - - ab - - - - - - - - - - %a% - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFLike - - - like - - - + + + true + _col1 - - - - - - - - - - b - - - - - - - - - - %a% - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFLike - - - like - - - + + + false + _col9 - - - - - - - - - - a - - - - - - - - - - [ab] - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFRegExp - - - rlike - - - + + + true + _col13 - - - - - - - - - - abc - - - - - - - - - - b - - - - - - - - - - c - - - - - - - - - org.apache.hadoop.hive.ql.udf.UDFRegExpReplace - - - regexp_replace - - - + + + acc + _col12 - - - - - - - - - - hadoop - - - - - - - - - - o* - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFRegExp - - - rlike - - - + + + true + _col11 - - - - - - - - - - hadoop - - - - - - - - - - [a-z]* - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFRegExp - - - rlike - - - + + + true + _col10 - - - - - - - - - - - - - - - - - - - - [ab] - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFRegExp - - - rlike - - - + + + false + _col16 - - - - - - - - - - hadoop - - - - - - - - - - (.)[a-z]* - - - - - - - - - - $1ive - - - - - - - - - org.apache.hadoop.hive.ql.udf.UDFRegExpReplace - - - regexp_replace - - - + + + hive + _col15 - - - - - - - - - - abbbb - - - - - - - - - - bb - - - - - - - - - - b - - - - - - - - - org.apache.hadoop.hive.ql.udf.UDFRegExpReplace - - - regexp_replace - - - + + + abb + _col14 - - - - - - - - - - abc - - - - - - - - - - z - - - - - - - - - - a - - - - - - - - - org.apache.hadoop.hive.ql.udf.UDFRegExpReplace - - - regexp_replace - - - + + + abc + _col0 - - - - - - - - - - a - - - - - - - - - - %a% - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFLike - - - like - - - + + + true + @@ -1332,174 +726,55 @@ - - - - - - true - - + - - - - - - false - - + - - - - - - true - - + - - - - - - true - - + - - - - - - true - - + - - - - - - false - - + - - - - - - false - - + - - - - - - false - - + - - - - - - true - - + - - - - - - true - - + - - - - - - false - - + - - - - - - true - - + - - - - - - true - - + - - - - - - acc - - + - - - - - - abc - - + - - - - - - abb - - + - - - - - - hive - - + diff --git a/ql/src/test/results/compiler/plan/udf4.q.xml b/ql/src/test/results/compiler/plan/udf4.q.xml index d6dab9e..4ca78bf 100644 --- a/ql/src/test/results/compiler/plan/udf4.q.xml +++ b/ql/src/test/results/compiler/plan/udf4.q.xml @@ -547,290 +547,94 @@ _col8 - - - - - - - - - - 0.0 - - - - - - - - - org.apache.hadoop.hive.ql.udf.UDFSqrt - - - sqrt - - - + + + 0.0 + _col7 - - - - - - - - - - - - - - 1.0 - - - - - - - - - - - - - - - - - - - org.apache.hadoop.hive.ql.udf.UDFSqrt - - - sqrt - - - - - - - + _col6 - - - - - - - - - - 1.0 - - - - - - - - - org.apache.hadoop.hive.ql.udf.UDFSqrt - - - sqrt - - - + + + 1.0 + _col5 - - - - - - - - - - - - - - 1.5 - - - - - - - - - - - - - - - - - - + + + -2 + _col4 - - - - - - - - - - 1.5 - - - - - - - - + + + 1 + _col3 - - - - - - - - - - 1.0 - - - - - - - - + + + 1 + _col2 - - - - - - - - - - - - - - 1.5 - - - - - - - - - - - - - - - - - - + + + -2.0 + _col1 - - - - - - - - - - 1.5 - - - - - - - - + + + 2.0 + _col9 - - - - - - - - - - 1.0 - - - - - - - - + + + 1 + @@ -867,213 +671,73 @@ _col12 - - - - - - - - - - 1.0 - - - - - - - - + + + 1 + _col11 - - - - - - - - - - - - - - 1.5 - - - - - - - - - - - - - - - - - - + + + -1 + _col10 - - - - - - - - - - 1.5 - - - - - - - - + + + 2 + _col17 - - - - - - - - - - 1 - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - - - - - - false - - - + + + -1 + _col16 - - - - - - - - - - 1 - - - - - - - - - - 2 - - - - - - - - - false - - - + + + 3 + _col15 - - - - - - - - - - 3 - - - - - - - - + + + -3 + _col14 - + @@ -1084,62 +748,24 @@ _col0 - - - - - - - - - - 1.0 - - - - - - - - + + + 1.0 + _col18 - - - - - - - - - - 1 - - - - - - - - - true - - - org.apache.hadoop.hive.ql.udf.UDFOPBitNot - - - ~ - - - + + + -2 + @@ -1149,173 +775,61 @@ - - - - - - 1.0 - - + - - - - - - 2.0 - - + - - - - - - -2.0 - - + - - - - - - 1 - - + - - - - - - 1 - - + - - - - - - -2 - - + - - - - - - 1.0 - - + - + - - - - - - 0.0 - - + - - - - - - 1 - - + - - - - - - 2 - - + - - - - - - -1 - - + - - - - - - 1 - - + - + - - - - - - -3 - - + - - - - - - 3 - - + - - - - - - -1 - - + - - - - - - -2 - - + diff --git a/ql/src/test/results/compiler/plan/udf6.q.xml b/ql/src/test/results/compiler/plan/udf6.q.xml index 37b969c..97bece8 100644 --- a/ql/src/test/results/compiler/plan/udf6.q.xml +++ b/ql/src/test/results/compiler/plan/udf6.q.xml @@ -291,86 +291,24 @@ _col1 - - - - - - - - - boolean - - - - - true - - - - - - - - - - 1 - - - - - - - - - - 2 - - - - - - - - + + + 1 + _col0 - - - - - - - - - - a - - - - - - - - - - b - - - - - - - - + + + ab + @@ -380,24 +318,10 @@ - - - - - - ab - - + - - - - - - 1 - - + diff --git a/ql/src/test/results/compiler/plan/udf_case.q.xml b/ql/src/test/results/compiler/plan/udf_case.q.xml index 726f290..dc620cb 100644 --- a/ql/src/test/results/compiler/plan/udf_case.q.xml +++ b/ql/src/test/results/compiler/plan/udf_case.q.xml @@ -346,142 +346,17 @@ _col1 - - - - - - - - - - 11 - - - - - - - - - - 12 - - - - - - - - - - 13 - - - - - - - - - - 14 - - - - - - - - - - 15 - - - - - - - - - - - - + _col0 - - - - - - - - - - 1 - - - - - - - - - - 1 - - - - - - - - - - 2 - - - - - - - - - - 3 - - - - - - - - - - 4 - - - - - - - - - - 5 - - - - - - - - + + + 2 + @@ -491,17 +366,10 @@ - - - - - - 2 - - + - + diff --git a/ql/src/test/results/compiler/plan/udf_when.q.xml b/ql/src/test/results/compiler/plan/udf_when.q.xml index 4179e6b..dc620cb 100644 --- a/ql/src/test/results/compiler/plan/udf_when.q.xml +++ b/ql/src/test/results/compiler/plan/udf_when.q.xml @@ -346,222 +346,17 @@ _col1 - - - - - - - - - - - - - - 12 - - - - - - - - - - 11 - - - - - - - - - - - - boolean - - - - - - - - - - - - 13 - - - - - - - - - - - - - - 14 - - - - - - - - - - 10 - - - - - - - - - - - - - - - - - - - - 15 - - - - - - - - - - - - + _col0 - - - - - - - - - - - - - - 1 - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - 3 - - - - - - - - - - 5 - - - - - - - - - - - - - - - - - - - - 4 - - - - - - - - - - 5 - - - - - - - - + + + 2 + @@ -571,17 +366,10 @@ - - - - - - 2 - - + - + @@ -649,7 +437,7 @@ src - + string @@ -669,7 +457,7 @@ src - + string @@ -688,7 +476,7 @@ src - + bigint @@ -711,7 +499,7 @@ src - + string @@ -747,13 +535,13 @@ - + - + diff --git a/ql/src/test/results/compiler/plan/union.q.xml b/ql/src/test/results/compiler/plan/union.q.xml index 2808b05..e09bee6 100644 --- a/ql/src/test/results/compiler/plan/union.q.xml +++ b/ql/src/test/results/compiler/plan/union.q.xml @@ -235,7 +235,7 @@ - + org.apache.hadoop.mapred.TextInputFormat @@ -449,7 +449,7 @@ - + org.apache.hadoop.mapred.TextInputFormat @@ -593,7 +593,7 @@ - + @@ -640,34 +640,7 @@ true - - - org.apache.hadoop.mapred.TextInputFormat - - - org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - - - - - columns - _col0,_col1 - - - serialization.lib - org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - - - serialization.format - 1 - - - columns.types - string:string - - - - + 1 @@ -1634,7 +1607,7 @@ - +