You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by am...@apache.org on 2015/05/13 09:19:36 UTC
[1/2] drill git commit: DRILL-2229: For SqlParseException,
SqlUnsupportedException, throw UserException
Repository: drill
Updated Branches:
refs/heads/master 4199e6bb3 -> 880dff8e2
DRILL-2229: For SqlParseException, SqlUnsupportedException, throw UserException
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/880dff8e
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/880dff8e
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/880dff8e
Branch: refs/heads/master
Commit: 880dff8e2679871267a776c03d0dd72d9893a309
Parents: ce3343f
Author: Hsuan-Yi Chu <hs...@usc.edu>
Authored: Sun May 3 10:29:47 2015 -0700
Committer: Aman Sinha <as...@maprtech.com>
Committed: Tue May 12 22:26:36 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/880dff8e/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java
index 6961ee6..e385600 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java
@@ -61,6 +61,7 @@ import org.apache.calcite.plan.hep.HepProgramBuilder;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.parser.SqlParseException;
import org.apache.calcite.sql.parser.SqlParser;
+import org.apache.drill.exec.work.foreman.SqlUnsupportedException;
import org.apache.hadoop.security.AccessControlException;
public class DrillSqlWorker {
@@ -143,7 +144,7 @@ public class DrillSqlWorker {
injector.injectChecked(context.getExecutionControls(), "sql-parsing", ForemanSetupException.class);
sqlNode = planner.parse(sql);
} catch (SqlParseException e) {
- throw new QueryInputException("Failure parsing SQL. " + e.getMessage(), e);
+ throw UserException.parseError(e).build();
}
AbstractSqlHandler handler;
@@ -179,6 +180,9 @@ public class DrillSqlWorker {
throw UserException.parseError(e).message(errorMessage).build();
} catch (AccessControlException e) {
throw UserException.permissionError(e).build();
+ } catch(SqlUnsupportedException e) {
+ throw UserException.unsupportedError(e)
+ .build();
} catch (IOException | RelConversionException e) {
throw new QueryInputException("Failure handling SQL.", e);
}
[2/2] drill git commit: DRILL-3009: Bump up Calcite version to
1.1.0-drill-r7 (For IN list threshold).
Posted by am...@apache.org.
DRILL-3009: Bump up Calcite version to 1.1.0-drill-r7 (For IN list threshold).
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/ce3343f6
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/ce3343f6
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/ce3343f6
Branch: refs/heads/master
Commit: ce3343f676d556be283dfcc129db1d9b9e99f6fd
Parents: 4199e6b
Author: Aman Sinha <as...@mapr.com>
Authored: Tue May 12 18:14:43 2015 -0700
Committer: Aman Sinha <as...@maprtech.com>
Committed: Tue May 12 22:26:36 2015 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/ce3343f6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6344306..cf17a79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1038,7 +1038,7 @@
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
- <version>1.1.0-drill-r5</version>
+ <version>1.1.0-drill-r7</version>
<exclusions>
<exclusion>
<groupId>org.jgrapht</groupId>