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 2016/08/14 02:39:52 UTC

[1/2] incubator-carbondata git commit: Stored by 'carbondata' or 'org.apache.carbondata.format' shoulb be not case senstive

Repository: incubator-carbondata
Updated Branches:
  refs/heads/master c2ee9cd45 -> ef9f3287e


Stored by 'carbondata' or 'org.apache.carbondata.format' shoulb be not case senstive


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/14c9a420
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/14c9a420
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/14c9a420

Branch: refs/heads/master
Commit: 14c9a42071bd72534ab4c2b138b7a136422a2cea
Parents: c2ee9cd
Author: Zhangshunyu <zh...@huawei.com>
Authored: Fri Jul 29 10:52:59 2016 +0800
Committer: ravipesala <ra...@gmail.com>
Committed: Sun Aug 14 08:07:15 2016 +0530

----------------------------------------------------------------------
 .../src/main/scala/org/apache/spark/sql/CarbonContext.scala      | 2 +-
 .../src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/14c9a420/integration/spark/src/main/scala/org/apache/spark/sql/CarbonContext.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonContext.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonContext.scala
index 150b2dc..fc4f173 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonContext.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonContext.scala
@@ -119,7 +119,7 @@ class CarbonContext(
   @transient
   val LOGGER = LogServiceFactory.getLogService(CarbonContext.getClass.getName)
 
-  override def sql(sql: String): SchemaRDD = {
+  override def sql(sql: String): DataFrame = {
     // queryId will be unique for each query, creting query detail holder
     val queryId: String = System.nanoTime() + ""
     this.setConf("queryId", queryId)

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/14c9a420/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
index 585ef74..c2b0e8e 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
@@ -421,8 +421,8 @@ class CarbonSqlParser()
             case Token("TOK_LIKETABLE", child :: Nil) =>
               likeTableName = child.getChild(0).getText()
 
-            case Token("TOK_STORAGEHANDLER", child :: Nil) =>
-              storedBy = BaseSemanticAnalyzer.unescapeSQLString(child.getText)
+          case Token("TOK_STORAGEHANDLER", child :: Nil) =>
+            storedBy = BaseSemanticAnalyzer.unescapeSQLString(child.getText).trim.toLowerCase
 
             case _ => // Unsupport features
           }


[2/2] incubator-carbondata git commit: [CARBONDATA-123] Stored by 'carbondata' or 'org.apache.carbondata.format' shoulb be not case senstive This closes #57

Posted by ra...@apache.org.
[CARBONDATA-123] Stored by 'carbondata' or 'org.apache.carbondata.format' shoulb be not case senstive This closes #57


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/ef9f3287
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/ef9f3287
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/ef9f3287

Branch: refs/heads/master
Commit: ef9f3287e3700d9a753d7dfc6e369601592c0feb
Parents: c2ee9cd 14c9a42
Author: ravipesala <ra...@gmail.com>
Authored: Sun Aug 14 08:08:23 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Sun Aug 14 08:08:23 2016 +0530

----------------------------------------------------------------------
 .../src/main/scala/org/apache/spark/sql/CarbonContext.scala      | 2 +-
 .../src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------