diff options
author | Roman Kulyk <rom.kulyk@gmail.com> | 2017-08-29 14:10:24 +0000 |
---|---|---|
committer | Volodymyr Vysotskyi <vvovyk@gmail.com> | 2018-01-16 12:10:13 +0200 |
commit | 9fabb612f16f6f541b3bde68ad7d734cad26df33 (patch) | |
tree | de9369679724aaf5ccd29d6f0b7e2b12e7506b9c /contrib/storage-jdbc/src | |
parent | 450e67094eb6e9a6484d7f86c49b51c77a08d7b2 (diff) |
DRILL-3993: Changes to support Calcite 1.13
- fixed all compiling errors (main changes were: Maven changes, chenges RelNode -> RelRoot, implementing some new methods from updated interfaces, chenges some literals, logger changes);
- fixed unexpected column errors, validation errors and assertion errors after Calcite update;
- fixed describe table/schema statement according to updated logic;
- added fixes with time-intervals;
- changed precision of BINARY to 65536 (was 1048576) according to updated logic (Calcite overrides bigger precision to own maxPrecision);
- ignored some incorrect tests with DRILL-3244;
- changed "Table not found" message to "Object not found within" according to new Calcite changes.
Diffstat (limited to 'contrib/storage-jdbc/src')
-rw-r--r-- | contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcExpressionCheck.java | 20 | ||||
-rw-r--r-- | contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcPrel.java | 2 |
2 files changed, 20 insertions, 2 deletions
diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcExpressionCheck.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcExpressionCheck.java index 2015a7754..e0b01b388 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcExpressionCheck.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcExpressionCheck.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -27,7 +27,10 @@ import org.apache.calcite.rex.RexLiteral; import org.apache.calcite.rex.RexLocalRef; import org.apache.calcite.rex.RexNode; import org.apache.calcite.rex.RexOver; +import org.apache.calcite.rex.RexPatternFieldRef; import org.apache.calcite.rex.RexRangeRef; +import org.apache.calcite.rex.RexSubQuery; +import org.apache.calcite.rex.RexTableInputRef; import org.apache.calcite.rex.RexVisitor; import org.apache.calcite.rex.RexWindow; import org.apache.drill.exec.planner.sql.DrillSqlOperator; @@ -116,4 +119,19 @@ class JdbcExpressionCheck implements RexVisitor<Boolean> { return paramRexFieldAccess.getReferenceExpr().accept(this); } + @Override + public Boolean visitSubQuery(RexSubQuery subQuery) { + return null; + } + + @Override + public Boolean visitTableInputRef(RexTableInputRef fieldRef) { + return false; + } + + @Override + public Boolean visitPatternFieldRef(RexPatternFieldRef fieldRef) { + return false; + } + } diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcPrel.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcPrel.java index 58549db76..e335c0813 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcPrel.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcPrel.java @@ -62,7 +62,7 @@ public class JdbcPrel extends AbstractRelNode implements Prel { (JavaTypeFactory) getCluster().getTypeFactory()); final JdbcImplementor.Result result = jdbcImplementor.visitChild(0, input.accept(new SubsetRemover())); - sql = result.asQuery().toSqlString(dialect).getSql(); + sql = result.asSelect().toSqlString(dialect).getSql(); rowType = input.getRowType(); } |