From 13670a431af7d6275076ed440b4f4c4072c62513 Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 19 Apr 2018 23:38:33 +0800 Subject: [PATCH] improved hiver support. for issue 2510 --- .../druid/sql/parser/SQLExprParser.java | 2 +- .../SchemaResolveVisitorFactory.java | 8 +++ .../druid/sql/visitor/SchemaStatVisitor.java | 1 + .../druid/bvt/sql/hive/HiveInsert_3.java | 59 +++++++++++++++++++ 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index 7dc1157696..4ffc427fcc 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -1207,7 +1207,7 @@ public class SQLExprParser extends SQLParser { if (lexer.token == Token.OVER) { over(methodInvokeExpr); } - + expr = methodInvokeExpr; } else { SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(name); diff --git a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java index 71189ac153..fdae4d5b62 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java +++ b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java @@ -23,6 +23,7 @@ import com.alibaba.druid.sql.dialect.db2.ast.DB2Object; import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock; import com.alibaba.druid.sql.dialect.db2.visitor.DB2ASTVisitorAdapter; import com.alibaba.druid.sql.dialect.hive.ast.HiveInsert; +import com.alibaba.druid.sql.dialect.hive.ast.HiveMultiInsertStatement; import com.alibaba.druid.sql.dialect.hive.visitor.HiveASTVisitorAdapter; import com.alibaba.druid.sql.dialect.mysql.ast.MysqlForeignKey; import com.alibaba.druid.sql.dialect.mysql.ast.clause.MySqlCursorDeclareStatement; @@ -2067,6 +2068,13 @@ class SchemaResolveVisitorFactory { ctx.setTableSource(from); from.accept(visitor); + } else if (x.getParent() != null && x.getParent().getParent() instanceof HiveInsert + && x.getParent().getParent().getParent() instanceof HiveMultiInsertStatement){ + HiveMultiInsertStatement insert = (HiveMultiInsertStatement) x.getParent().getParent().getParent(); + if (insert.getFrom() instanceof SQLExprTableSource) { + from = insert.getFrom(); + ctx.setTableSource(from); + } } List selectList = x.getSelectList(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java index 6b5772e6e0..61da207cdb 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -1292,6 +1292,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { } } else if (tableSource instanceof SQLWithSubqueryClause.Entry || tableSource instanceof SQLSubqueryTableSource + || tableSource instanceof SQLValuesTableSource || tableSource instanceof SQLLateralViewTableSource) { return false; } else { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java new file mode 100644 index 0000000000..eb05634f73 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java @@ -0,0 +1,59 @@ +package com.alibaba.druid.bvt.sql.hive; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; + +public class HiveInsert_3 extends TestCase { + public void test_select() throws Exception { + String sql = "FROM sale_detail\n" + + "INSERT OVERWRITE TABLE sale_detail_multi partition (sale_date='2010', region='china' )\n" + + "SELECT shop_name, customer_id, total_price\n" + + "INSERT OVERWRITE TABLE sale_detail_multi partition (sale_date='2010', region='china' )\n" + + "SELECT shop_name, customer_id, total_price;";// + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); + SQLStatement stmt = statementList.get(0); + + assertEquals(1, statementList.size()); + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); + stmt.accept(visitor); + + assertEquals("FROM sale_detail\n" + + "INSERT OVERWRITE TABLE sale_detail_multi PARTITION (sale_date='2010', region='china')\n" + + "SELECT shop_name, customer_id, total_price\n" + + "INSERT OVERWRITE TABLE sale_detail_multi PARTITION (sale_date='2010', region='china')\n" + + "SELECT shop_name, customer_id, total_price;", SQLUtils.formatHive(sql)); + + assertEquals("from sale_detail\n" + + "insert overwrite table sale_detail_multi partition (sale_date='2010', region='china')\n" + + "select shop_name, customer_id, total_price\n" + + "insert overwrite table sale_detail_multi partition (sale_date='2010', region='china')\n" + + "select shop_name, customer_id, total_price;", SQLUtils.formatHive(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + + + assertEquals(2, visitor.getTables().size()); + assertEquals(5, visitor.getColumns().size()); + assertEquals(0, visitor.getConditions().size()); + + assertTrue(visitor.containsColumn("sale_detail_multi", "sale_date")); + assertTrue(visitor.containsColumn("sale_detail_multi", "region")); + assertTrue(visitor.containsColumn("sale_detail", "shop_name")); + assertTrue(visitor.containsColumn("sale_detail", "customer_id")); + assertTrue(visitor.containsColumn("sale_detail", "total_price")); + + + } +}