Repository: hive Updated Branches: refs/heads/master fc15086bd -> 63ada6d94
HIVE-14436: Hive 1.2.1/Hitting "ql.Driver: FAILED: IllegalArgumentException Error: , expected at the end of 'decimal(9'" after enabling hive.optimize.skewjoin and with MR engine (Daniel Dai, reviewed by Ashutosh Chauhan) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/63ada6d9 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/63ada6d9 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/63ada6d9 Branch: refs/heads/master Commit: 63ada6d94a0617681cb715ef1f4ffbe5a77f9077 Parents: fc15086 Author: Daniel Dai <da...@hortonworks.com> Authored: Tue Aug 9 22:55:52 2016 -0700 Committer: Daniel Dai <da...@hortonworks.com> Committed: Tue Aug 9 22:55:52 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hive/ql/exec/Utilities.java | 10 +-- .../queries/clientpositive/decimal_skewjoin.q | 21 ++++++ .../clientpositive/decimal_skewjoin.q.out | 77 ++++++++++++++++++++ 3 files changed, 101 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/63ada6d9/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index fd25978..e78c3d5 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -1878,13 +1878,9 @@ public final class Utilities { public static List<String> getColumnTypes(Properties props) { List<String> names = new ArrayList<String>(); String colNames = props.getProperty(serdeConstants.LIST_COLUMN_TYPES); - String[] cols = colNames.trim().split(","); - if (cols != null) { - for (String col : cols) { - if (col != null && !col.trim().equals("")) { - names.add(col); - } - } + ArrayList<TypeInfo> cols = TypeInfoUtils.getTypeInfosFromTypeString(colNames); + for (TypeInfo col : cols) { + names.add(col.getTypeName()); } return names; } http://git-wip-us.apache.org/repos/asf/hive/blob/63ada6d9/ql/src/test/queries/clientpositive/decimal_skewjoin.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/decimal_skewjoin.q b/ql/src/test/queries/clientpositive/decimal_skewjoin.q new file mode 100644 index 0000000..cac0d89 --- /dev/null +++ b/ql/src/test/queries/clientpositive/decimal_skewjoin.q @@ -0,0 +1,21 @@ + +set hive.execution.engine=mr; +set hive.optimize.skewjoin=true; +set hive.auto.convert.join=false; + +drop table if exists decimal_skewjoin_1; +drop table if exists decimal_skewjoin_2; + +create table decimal_skewjoin_1 (t decimal(4,2), u decimal(5), v decimal); +create table decimal_skewjoin_2 (t decimal(4,2), u decimal(5), v decimal); + +insert overwrite table decimal_skewjoin_1 + select cast('17.29' as decimal(4,2)), 3.1415926BD, 3115926.54321BD from src tablesample (1 rows); + +insert overwrite table decimal_skewjoin_2 + select cast('17.29' as decimal(4,2)), 3.1415926BD, 3115926.54321BD from src tablesample (1 rows); + +select a.u from decimal_skewjoin_1 a INNER JOIN decimal_skewjoin_2 b ON a.t=b.t; + +drop table decimal_skewjoin_1; +drop table decimal_skewjoin_2; http://git-wip-us.apache.org/repos/asf/hive/blob/63ada6d9/ql/src/test/results/clientpositive/decimal_skewjoin.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/decimal_skewjoin.q.out b/ql/src/test/results/clientpositive/decimal_skewjoin.q.out new file mode 100644 index 0000000..a335aef --- /dev/null +++ b/ql/src/test/results/clientpositive/decimal_skewjoin.q.out @@ -0,0 +1,77 @@ +PREHOOK: query: drop table if exists decimal_skewjoin_1 +PREHOOK: type: DROPTABLE +POSTHOOK: query: drop table if exists decimal_skewjoin_1 +POSTHOOK: type: DROPTABLE +PREHOOK: query: drop table if exists decimal_skewjoin_2 +PREHOOK: type: DROPTABLE +POSTHOOK: query: drop table if exists decimal_skewjoin_2 +POSTHOOK: type: DROPTABLE +PREHOOK: query: create table decimal_skewjoin_1 (t decimal(4,2), u decimal(5), v decimal) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@decimal_skewjoin_1 +POSTHOOK: query: create table decimal_skewjoin_1 (t decimal(4,2), u decimal(5), v decimal) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@decimal_skewjoin_1 +PREHOOK: query: create table decimal_skewjoin_2 (t decimal(4,2), u decimal(5), v decimal) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@decimal_skewjoin_2 +POSTHOOK: query: create table decimal_skewjoin_2 (t decimal(4,2), u decimal(5), v decimal) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@decimal_skewjoin_2 +PREHOOK: query: insert overwrite table decimal_skewjoin_1 + select cast('17.29' as decimal(4,2)), 3.1415926BD, 3115926.54321BD from src tablesample (1 rows) +PREHOOK: type: QUERY +PREHOOK: Input: default@src +PREHOOK: Output: default@decimal_skewjoin_1 +POSTHOOK: query: insert overwrite table decimal_skewjoin_1 + select cast('17.29' as decimal(4,2)), 3.1415926BD, 3115926.54321BD from src tablesample (1 rows) +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src +POSTHOOK: Output: default@decimal_skewjoin_1 +POSTHOOK: Lineage: decimal_skewjoin_1.t EXPRESSION [] +POSTHOOK: Lineage: decimal_skewjoin_1.u EXPRESSION [] +POSTHOOK: Lineage: decimal_skewjoin_1.v EXPRESSION [] +PREHOOK: query: insert overwrite table decimal_skewjoin_2 + select cast('17.29' as decimal(4,2)), 3.1415926BD, 3115926.54321BD from src tablesample (1 rows) +PREHOOK: type: QUERY +PREHOOK: Input: default@src +PREHOOK: Output: default@decimal_skewjoin_2 +POSTHOOK: query: insert overwrite table decimal_skewjoin_2 + select cast('17.29' as decimal(4,2)), 3.1415926BD, 3115926.54321BD from src tablesample (1 rows) +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src +POSTHOOK: Output: default@decimal_skewjoin_2 +POSTHOOK: Lineage: decimal_skewjoin_2.t EXPRESSION [] +POSTHOOK: Lineage: decimal_skewjoin_2.u EXPRESSION [] +POSTHOOK: Lineage: decimal_skewjoin_2.v EXPRESSION [] +PREHOOK: query: select a.u from decimal_skewjoin_1 a INNER JOIN decimal_skewjoin_2 b ON a.t=b.t +PREHOOK: type: QUERY +PREHOOK: Input: default@decimal_skewjoin_1 +PREHOOK: Input: default@decimal_skewjoin_2 +#### A masked pattern was here #### +POSTHOOK: query: select a.u from decimal_skewjoin_1 a INNER JOIN decimal_skewjoin_2 b ON a.t=b.t +POSTHOOK: type: QUERY +POSTHOOK: Input: default@decimal_skewjoin_1 +POSTHOOK: Input: default@decimal_skewjoin_2 +#### A masked pattern was here #### +3 +PREHOOK: query: drop table decimal_skewjoin_1 +PREHOOK: type: DROPTABLE +PREHOOK: Input: default@decimal_skewjoin_1 +PREHOOK: Output: default@decimal_skewjoin_1 +POSTHOOK: query: drop table decimal_skewjoin_1 +POSTHOOK: type: DROPTABLE +POSTHOOK: Input: default@decimal_skewjoin_1 +POSTHOOK: Output: default@decimal_skewjoin_1 +PREHOOK: query: drop table decimal_skewjoin_2 +PREHOOK: type: DROPTABLE +PREHOOK: Input: default@decimal_skewjoin_2 +PREHOOK: Output: default@decimal_skewjoin_2 +POSTHOOK: query: drop table decimal_skewjoin_2 +POSTHOOK: type: DROPTABLE +POSTHOOK: Input: default@decimal_skewjoin_2 +POSTHOOK: Output: default@decimal_skewjoin_2
