diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 21bf248..a6a947a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -8040,9 +8040,6 @@ void genLateralViewPlans(Map aliasToOpInfo, QB qb) RowResolver lvForwardRR = new RowResolver(); RowResolver source = opParseCtx.get(op).getRowResolver(); for (ColumnInfo col : source.getColumnInfos()) { - if (col.getIsVirtualCol() && col.isHiddenVirtualCol()) { - continue; - } String[] tabCol = source.reverseLookup(col.getInternalName()); lvForwardRR.put(tabCol[0], tabCol[1], col); } @@ -8130,7 +8127,7 @@ private void LVmergeRowResolvers(RowResolver source, RowResolver dest, String internalName = getColumnInternalName(outputInternalColNames.size()); outputInternalColNames.add(internalName); ColumnInfo newCol = new ColumnInfo(internalName, c.getType(), c - .getTabAlias(), c.getIsVirtualCol()); + .getTabAlias(), c.getIsVirtualCol(), c.isHiddenVirtualCol()); String[] tableCol = source.reverseLookup(c.getInternalName()); String tableAlias = tableCol[0]; String colAlias = tableCol[1]; diff --git ql/src/test/queries/clientpositive/udtf_explode.q ql/src/test/queries/clientpositive/udtf_explode.q index 9d732c7..638a4e9 100644 --- ql/src/test/queries/clientpositive/udtf_explode.q +++ ql/src/test/queries/clientpositive/udtf_explode.q @@ -15,4 +15,11 @@ SELECT explode(map(1,'one',2,'two',3,'three')) as (myKey,myVal) FROM src LIMIT 3 SELECT a.myKey, a.myVal, count(1) FROM (SELECT explode(map(1,'one',2,'two',3,'three')) as (myKey,myVal) FROM src LIMIT 3) a GROUP BY a.myKey, a.myVal; SELECT src.key, myCol FROM src lateral view explode(array(1,2,3)) x AS myCol LIMIT 3; -SELECT src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3; \ No newline at end of file +SELECT src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3; + +-- HIVE-4295 +SELECT BLOCK__OFFSET__INSIDE__FILE, src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3; + +set hive.optimize.cp=false; +SELECT src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3; +SELECT BLOCK__OFFSET__INSIDE__FILE, src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3; diff --git ql/src/test/results/clientnegative/udf_assert_true.q.out ql/src/test/results/clientnegative/udf_assert_true.q.out index 8a63572..80368ed 100644 --- ql/src/test/results/clientnegative/udf_assert_true.q.out +++ ql/src/test/results/clientnegative/udf_assert_true.q.out @@ -24,10 +24,10 @@ STAGE PLANS: Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Select Operator expressions: - expr: assert_true((_col2 > 0)) + expr: assert_true((_col4 > 0)) type: void outputColumnNames: _col0 Limit @@ -45,10 +45,10 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Select Operator expressions: - expr: assert_true((_col2 > 0)) + expr: assert_true((_col4 > 0)) type: void outputColumnNames: _col0 Limit @@ -95,10 +95,10 @@ STAGE PLANS: Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Select Operator expressions: - expr: assert_true((_col2 < 2)) + expr: assert_true((_col4 < 2)) type: void outputColumnNames: _col0 Limit @@ -116,10 +116,10 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Select Operator expressions: - expr: assert_true((_col2 < 2)) + expr: assert_true((_col4 < 2)) type: void outputColumnNames: _col0 Limit diff --git ql/src/test/results/clientnegative/udf_assert_true2.q.out ql/src/test/results/clientnegative/udf_assert_true2.q.out index 508a653..9c2cdff 100644 --- ql/src/test/results/clientnegative/udf_assert_true2.q.out +++ ql/src/test/results/clientnegative/udf_assert_true2.q.out @@ -19,10 +19,10 @@ STAGE PLANS: Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Select Operator expressions: - expr: (1 + assert_true((_col2 < 2))) + expr: (1 + assert_true((_col4 < 2))) type: int outputColumnNames: _col0 Limit @@ -40,10 +40,10 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Select Operator expressions: - expr: (1 + assert_true((_col2 < 2))) + expr: (1 + assert_true((_col4 < 2))) type: int outputColumnNames: _col0 Limit diff --git ql/src/test/results/clientpositive/lateral_view.q.out ql/src/test/results/clientpositive/lateral_view.q.out index 61bb6ea..5150a63 100644 --- ql/src/test/results/clientpositive/lateral_view.q.out +++ ql/src/test/results/clientpositive/lateral_view.q.out @@ -34,16 +34,21 @@ STAGE PLANS: alias: src 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 + outputColumnNames: _col0, _col1, _col4 Select Operator expressions: expr: _col0 type: string expr: _col1 type: string - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0, _col1, _col2 Reduce Output Operator @@ -69,14 +74,14 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col0, _col1, _col2 + outputColumnNames: _col0, _col1, _col4 Select Operator expressions: expr: _col0 type: string expr: _col1 type: string - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0, _col1, _col2 Reduce Output Operator @@ -160,10 +165,10 @@ STAGE PLANS: Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Select Operator expressions: - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0 Limit @@ -181,10 +186,10 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Select Operator expressions: - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0 Limit @@ -222,20 +227,20 @@ STAGE PLANS: Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Lateral View Forward Select Operator expressions: - expr: _col2 + expr: _col4 type: int - outputColumnNames: _col2 + outputColumnNames: _col4 Lateral View Join Operator - outputColumnNames: _col2, _col3 + outputColumnNames: _col4, _col5 Select Operator expressions: - expr: _col2 + expr: _col4 type: int - expr: _col3 + expr: _col5 type: string outputColumnNames: _col0, _col1 Limit @@ -253,12 +258,12 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col2, _col3 + outputColumnNames: _col4, _col5 Select Operator expressions: - expr: _col2 + expr: _col4 type: int - expr: _col3 + expr: _col5 type: string outputColumnNames: _col0, _col1 Limit @@ -276,20 +281,20 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Lateral View Forward Select Operator expressions: - expr: _col2 + expr: _col4 type: int - outputColumnNames: _col2 + outputColumnNames: _col4 Lateral View Join Operator - outputColumnNames: _col2, _col3 + outputColumnNames: _col4, _col5 Select Operator expressions: - expr: _col2 + expr: _col4 type: int - expr: _col3 + expr: _col5 type: string outputColumnNames: _col0, _col1 Limit @@ -307,12 +312,12 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col2, _col3 + outputColumnNames: _col4, _col5 Select Operator expressions: - expr: _col2 + expr: _col4 type: int - expr: _col3 + expr: _col5 type: string outputColumnNames: _col0, _col1 Limit @@ -350,14 +355,14 @@ STAGE PLANS: Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col3 + outputColumnNames: _col5 Select Operator expressions: - expr: _col3 + expr: _col5 type: int outputColumnNames: _col0 Limit @@ -369,16 +374,16 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat Select Operator expressions: - expr: _col2 + expr: _col4 type: array outputColumnNames: _col0 UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col3 + outputColumnNames: _col5 Select Operator expressions: - expr: _col3 + expr: _col5 type: int outputColumnNames: _col0 Limit @@ -396,14 +401,14 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col2 + outputColumnNames: _col4 Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col3 + outputColumnNames: _col5 Select Operator expressions: - expr: _col3 + expr: _col5 type: int outputColumnNames: _col0 Limit @@ -415,16 +420,16 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat Select Operator expressions: - expr: _col2 + expr: _col4 type: array outputColumnNames: _col0 UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col3 + outputColumnNames: _col5 Select Operator expressions: - expr: _col3 + expr: _col5 type: int outputColumnNames: _col0 Limit @@ -524,10 +529,10 @@ STAGE PLANS: Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col1 + outputColumnNames: _col3 Select Operator expressions: - expr: _col1 + expr: _col3 type: int outputColumnNames: _col0 Limit @@ -545,10 +550,10 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col1 + outputColumnNames: _col3 Select Operator expressions: - expr: _col1 + expr: _col3 type: int outputColumnNames: _col0 Limit diff --git ql/src/test/results/clientpositive/lateral_view_ppd.q.out ql/src/test/results/clientpositive/lateral_view_ppd.q.out index 79d607a..65f4e14 100644 --- ql/src/test/results/clientpositive/lateral_view_ppd.q.out +++ ql/src/test/results/clientpositive/lateral_view_ppd.q.out @@ -27,12 +27,12 @@ STAGE PLANS: type: string outputColumnNames: value Lateral View Join Operator - outputColumnNames: _col1, _col2 + outputColumnNames: _col1, _col4 Select Operator expressions: expr: _col1 type: string - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0, _col1 File Output Operator @@ -49,12 +49,12 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col1, _col2 + outputColumnNames: _col1, _col4 Select Operator expressions: expr: _col1 type: string - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0, _col1 File Output Operator @@ -110,18 +110,23 @@ STAGE PLANS: type: boolean 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 + outputColumnNames: _col0, _col1, _col4 Filter Operator predicate: - expr: ((_col0 = '0') and (_col2 = 1)) + expr: ((_col0 = '0') and (_col4 = 1)) type: boolean Select Operator expressions: expr: _col1 type: string - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0, _col1 File Output Operator @@ -138,16 +143,16 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col0, _col1, _col2 + outputColumnNames: _col0, _col1, _col4 Filter Operator predicate: - expr: ((_col0 = '0') and (_col2 = 1)) + expr: ((_col0 = '0') and (_col4 = 1)) type: boolean Select Operator expressions: expr: _col1 type: string - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0, _col1 File Output Operator @@ -198,12 +203,12 @@ STAGE PLANS: type: string outputColumnNames: value Lateral View Join Operator - outputColumnNames: _col1, _col4 + outputColumnNames: _col1, _col6 Select Operator expressions: expr: _col1 type: string - expr: _col4 + expr: _col6 type: int outputColumnNames: _col0, _col1 Limit @@ -221,12 +226,12 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col1, _col4 + outputColumnNames: _col1, _col6 Select Operator expressions: expr: _col1 type: string - expr: _col4 + expr: _col6 type: int outputColumnNames: _col0, _col1 Limit @@ -293,22 +298,22 @@ STAGE PLANS: type: string outputColumnNames: value Lateral View Join Operator - outputColumnNames: _col1, _col2 + outputColumnNames: _col1, _col4 Lateral View Forward Select Operator expressions: expr: _col1 type: string - expr: _col2 + expr: _col4 type: int - outputColumnNames: _col1, _col2 + outputColumnNames: _col1, _col4 Lateral View Join Operator - outputColumnNames: _col1, _col2, _col3 + outputColumnNames: _col1, _col4, _col5 Select Operator expressions: expr: _col1 type: string - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0, _col1 File Output Operator @@ -325,12 +330,12 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col1, _col2, _col3 + outputColumnNames: _col1, _col4, _col5 Select Operator expressions: expr: _col1 type: string - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0, _col1 File Output Operator @@ -347,22 +352,22 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col1, _col2 + outputColumnNames: _col1, _col4 Lateral View Forward Select Operator expressions: expr: _col1 type: string - expr: _col2 + expr: _col4 type: int - outputColumnNames: _col1, _col2 + outputColumnNames: _col1, _col4 Lateral View Join Operator - outputColumnNames: _col1, _col2, _col3 + outputColumnNames: _col1, _col4, _col5 Select Operator expressions: expr: _col1 type: string - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0, _col1 File Output Operator @@ -379,12 +384,12 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col1, _col2, _col3 + outputColumnNames: _col1, _col4, _col5 Select Operator expressions: expr: _col1 type: string - expr: _col2 + expr: _col4 type: int outputColumnNames: _col0, _col1 File Output Operator diff --git ql/src/test/results/clientpositive/udtf_explode.q.out ql/src/test/results/clientpositive/udtf_explode.q.out index 1912cf1..2905d44 100644 --- ql/src/test/results/clientpositive/udtf_explode.q.out +++ ql/src/test/results/clientpositive/udtf_explode.q.out @@ -621,3 +621,38 @@ POSTHOOK: Input: default@src 238 1 one 238 2 two 238 3 three +PREHOOK: query: -- HIVE-4295 +SELECT BLOCK__OFFSET__INSIDE__FILE, src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3 +PREHOOK: type: QUERY +PREHOOK: Input: default@src +#### A masked pattern was here #### +POSTHOOK: query: -- HIVE-4295 +SELECT BLOCK__OFFSET__INSIDE__FILE, src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src +#### A masked pattern was here #### +0 238 1 one +0 238 2 two +0 238 3 three +PREHOOK: query: SELECT src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3 +PREHOOK: type: QUERY +PREHOOK: Input: default@src +#### A masked pattern was here #### +POSTHOOK: query: SELECT src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src +#### A masked pattern was here #### +238 1 one +238 2 two +238 3 three +PREHOOK: query: SELECT BLOCK__OFFSET__INSIDE__FILE, src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3 +PREHOOK: type: QUERY +PREHOOK: Input: default@src +#### A masked pattern was here #### +POSTHOOK: query: SELECT BLOCK__OFFSET__INSIDE__FILE, src.key, myKey, myVal FROM src lateral view explode(map(1,'one',2,'two',3,'three')) x AS myKey,myVal LIMIT 3 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src +#### A masked pattern was here #### +0 238 1 one +0 238 2 two +0 238 3 three diff --git ql/src/test/results/clientpositive/udtf_json_tuple.q.out ql/src/test/results/clientpositive/udtf_json_tuple.q.out index f40e1fb..a43a009 100644 --- ql/src/test/results/clientpositive/udtf_json_tuple.q.out +++ ql/src/test/results/clientpositive/udtf_json_tuple.q.out @@ -68,21 +68,21 @@ STAGE PLANS: type: string outputColumnNames: key Lateral View Join Operator - outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6 + outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8 Select Operator expressions: expr: _col0 type: string - expr: _col2 - type: string - expr: _col3 - type: string expr: _col4 type: string expr: _col5 type: string expr: _col6 type: string + expr: _col7 + type: string + expr: _col8 + type: string outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 Reduce Output Operator key expressions: @@ -121,21 +121,21 @@ STAGE PLANS: UDTF Operator function name: json_tuple Lateral View Join Operator - outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6 + outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8 Select Operator expressions: expr: _col0 type: string - expr: _col2 - type: string - expr: _col3 - type: string expr: _col4 type: string expr: _col5 type: string expr: _col6 type: string + expr: _col7 + type: string + expr: _col8 + type: string outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 Reduce Output Operator key expressions: @@ -305,14 +305,14 @@ STAGE PLANS: type: string outputColumnNames: key Lateral View Join Operator - outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6 + outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8 Select Operator expressions: expr: _col0 type: string - expr: _col3 + expr: _col5 type: string - expr: _col6 + expr: _col8 type: string outputColumnNames: _col0, _col1, _col2 Reduce Output Operator @@ -346,14 +346,14 @@ STAGE PLANS: UDTF Operator function name: json_tuple Lateral View Join Operator - outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6 + outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8 Select Operator expressions: expr: _col0 type: string - expr: _col3 + expr: _col5 type: string - expr: _col6 + expr: _col8 type: string outputColumnNames: _col0, _col1, _col2 Reduce Output Operator @@ -425,22 +425,22 @@ STAGE PLANS: Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col2, _col3, _col4, _col5, _col6 + outputColumnNames: _col4, _col5, _col6, _col7, _col8 Filter Operator predicate: - expr: _col2 is not null + expr: _col4 is not null type: boolean Select Operator expressions: - expr: _col3 + expr: _col5 type: string - outputColumnNames: _col3 + outputColumnNames: _col5 Group By Operator aggregations: expr: count() bucketGroup: false keys: - expr: _col3 + expr: _col5 type: string mode: hash outputColumnNames: _col0, _col1 @@ -474,22 +474,22 @@ STAGE PLANS: UDTF Operator function name: json_tuple Lateral View Join Operator - outputColumnNames: _col2, _col3, _col4, _col5, _col6 + outputColumnNames: _col4, _col5, _col6, _col7, _col8 Filter Operator predicate: - expr: _col2 is not null + expr: _col4 is not null type: boolean Select Operator expressions: - expr: _col3 + expr: _col5 type: string - outputColumnNames: _col3 + outputColumnNames: _col5 Group By Operator aggregations: expr: count() bucketGroup: false keys: - expr: _col3 + expr: _col5 type: string mode: hash outputColumnNames: _col0, _col1 diff --git ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out index ec127db..10b32a3 100644 --- ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out +++ ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out @@ -89,15 +89,11 @@ STAGE PLANS: type: string outputColumnNames: key Lateral View Join Operator - outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 + outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 Select Operator expressions: expr: _col0 type: string - expr: _col2 - type: string - expr: _col3 - type: string expr: _col4 type: string expr: _col5 @@ -112,6 +108,10 @@ STAGE PLANS: type: string expr: _col10 type: string + expr: _col11 + type: string + expr: _col12 + type: string outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9 Reduce Output Operator key expressions: @@ -166,15 +166,11 @@ STAGE PLANS: UDTF Operator function name: parse_url_tuple Lateral View Join Operator - outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 + outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 Select Operator expressions: expr: _col0 type: string - expr: _col2 - type: string - expr: _col3 - type: string expr: _col4 type: string expr: _col5 @@ -189,6 +185,10 @@ STAGE PLANS: type: string expr: _col10 type: string + expr: _col11 + type: string + expr: _col12 + type: string outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9 Reduce Output Operator key expressions: @@ -384,23 +384,23 @@ STAGE PLANS: type: string outputColumnNames: key Lateral View Join Operator - outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13 + outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15 Select Operator expressions: expr: _col0 type: string - expr: _col2 - type: string expr: _col4 type: string - expr: _col10 - type: string - expr: _col11 + expr: _col6 type: string expr: _col12 type: string expr: _col13 type: string + expr: _col14 + type: string + expr: _col15 + type: string outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6 Reduce Output Operator key expressions: @@ -455,23 +455,23 @@ STAGE PLANS: UDTF Operator function name: parse_url_tuple Lateral View Join Operator - outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13 + outputColumnNames: _col0, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15 Select Operator expressions: expr: _col0 type: string - expr: _col2 - type: string expr: _col4 type: string - expr: _col10 - type: string - expr: _col11 + expr: _col6 type: string expr: _col12 type: string expr: _col13 type: string + expr: _col14 + type: string + expr: _col15 + type: string outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6 Reduce Output Operator key expressions: @@ -549,22 +549,22 @@ STAGE PLANS: Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 + outputColumnNames: _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 Filter Operator predicate: - expr: _col10 is not null + expr: _col12 is not null type: boolean Select Operator expressions: - expr: _col2 + expr: _col4 type: string - outputColumnNames: _col2 + outputColumnNames: _col4 Group By Operator aggregations: expr: count() bucketGroup: false keys: - expr: _col2 + expr: _col4 type: string mode: hash outputColumnNames: _col0, _col1 @@ -606,22 +606,22 @@ STAGE PLANS: UDTF Operator function name: parse_url_tuple Lateral View Join Operator - outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 + outputColumnNames: _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 Filter Operator predicate: - expr: _col10 is not null + expr: _col12 is not null type: boolean Select Operator expressions: - expr: _col2 + expr: _col4 type: string - outputColumnNames: _col2 + outputColumnNames: _col4 Group By Operator aggregations: expr: count() bucketGroup: false keys: - expr: _col2 + expr: _col4 type: string mode: hash outputColumnNames: _col0, _col1 diff --git ql/src/test/results/clientpositive/udtf_stack.q.out ql/src/test/results/clientpositive/udtf_stack.q.out index 0b21901..e95e2b3 100644 --- ql/src/test/results/clientpositive/udtf_stack.q.out +++ ql/src/test/results/clientpositive/udtf_stack.q.out @@ -24,12 +24,12 @@ STAGE PLANS: Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col2, _col3 + outputColumnNames: _col4, _col5 Select Operator expressions: - expr: _col2 + expr: _col4 type: string - expr: _col3 + expr: _col5 type: array outputColumnNames: _col0, _col1 Limit @@ -53,12 +53,12 @@ STAGE PLANS: UDTF Operator function name: stack Lateral View Join Operator - outputColumnNames: _col2, _col3 + outputColumnNames: _col4, _col5 Select Operator expressions: - expr: _col2 + expr: _col4 type: string - expr: _col3 + expr: _col5 type: array outputColumnNames: _col0, _col1 Limit @@ -95,12 +95,12 @@ STAGE PLANS: Lateral View Forward Select Operator Lateral View Join Operator - outputColumnNames: _col2, _col3 + outputColumnNames: _col4, _col5 Select Operator expressions: - expr: _col2 + expr: _col4 type: string - expr: _col3 + expr: _col5 type: array outputColumnNames: _col0, _col1 Limit @@ -126,12 +126,12 @@ STAGE PLANS: UDTF Operator function name: stack Lateral View Join Operator - outputColumnNames: _col2, _col3 + outputColumnNames: _col4, _col5 Select Operator expressions: - expr: _col2 + expr: _col4 type: string - expr: _col3 + expr: _col5 type: array outputColumnNames: _col0, _col1 Limit diff --git ql/src/test/results/clientpositive/union26.q.out ql/src/test/results/clientpositive/union26.q.out index 432b08d..5212d22 100644 --- ql/src/test/results/clientpositive/union26.q.out +++ ql/src/test/results/clientpositive/union26.q.out @@ -158,7 +158,7 @@ STAGE PLANS: type: string outputColumnNames: key, value Lateral View Join Operator - outputColumnNames: _col0, _col1, _col4 + outputColumnNames: _col0, _col1, _col6 Select Operator expressions: expr: _col0 @@ -209,7 +209,7 @@ STAGE PLANS: UDTF Operator function name: explode Lateral View Join Operator - outputColumnNames: _col0, _col1, _col4 + outputColumnNames: _col0, _col1, _col6 Select Operator expressions: expr: _col0