You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/04/21 18:31:53 UTC
[1/2] incubator-carbondata git commit: Added check to display error
message
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 2ac60a0f7 -> 174bfadc7
Added check to display error message
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/c331854c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/c331854c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/c331854c
Branch: refs/heads/master
Commit: c331854c4c6af5e6728b86b4de6d3530039fb0f0
Parents: 2ac60a0
Author: Manohar <ma...@gmail.com>
Authored: Mon Apr 17 16:02:08 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Sat Apr 22 00:01:08 2017 +0530
----------------------------------------------------------------------
.../spark/exception/MalformedCarbonCommandException.java | 2 ++
.../apache/spark/sql/parser/CarbonSparkSqlParser.scala | 11 ++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/c331854c/integration/spark-common/src/main/java/org/apache/carbondata/spark/exception/MalformedCarbonCommandException.java
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/exception/MalformedCarbonCommandException.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/exception/MalformedCarbonCommandException.java
index 30bbbdb..9f441d3 100644
--- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/exception/MalformedCarbonCommandException.java
+++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/exception/MalformedCarbonCommandException.java
@@ -17,6 +17,8 @@
package org.apache.carbondata.spark.exception;
+// After parsing carbon query successfully , if any validation fails then
+// use MalformedCarbonCommandException
public class MalformedCarbonCommandException extends Exception {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/c331854c/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSparkSqlParser.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSparkSqlParser.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSparkSqlParser.scala
index 141f890..02c1366 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSparkSqlParser.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSparkSqlParser.scala
@@ -48,7 +48,16 @@ class CarbonSparkSqlParser(conf: SQLConf) extends AbstractSqlParser {
case ce: MalformedCarbonCommandException =>
throw ce
case ex =>
- astBuilder.parser.parse(sqlText)
+ try {
+ astBuilder.parser.parse(sqlText)
+ } catch {
+ case mce: MalformedCarbonCommandException =>
+ throw mce
+ case e =>
+ sys
+ .error("\n" + "BaseSqlParser>>>> " + ex.getMessage + "\n" + "CarbonSqlParser>>>> " +
+ e.getMessage)
+ }
}
}
[2/2] incubator-carbondata git commit: [CARBONDATA-943] Added check
to display error message in catch block. This closes #808
Posted by ra...@apache.org.
[CARBONDATA-943] Added check to display error message in catch block. This closes #808
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/174bfadc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/174bfadc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/174bfadc
Branch: refs/heads/master
Commit: 174bfadc77bef96db7d9be5536e777882e356038
Parents: 2ac60a0 c331854
Author: ravipesala <ra...@gmail.com>
Authored: Sat Apr 22 00:01:36 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Sat Apr 22 00:01:36 2017 +0530
----------------------------------------------------------------------
.../spark/exception/MalformedCarbonCommandException.java | 2 ++
.../apache/spark/sql/parser/CarbonSparkSqlParser.scala | 11 ++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------