carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jack...@apache.org
Subject [1/2] incubator-carbondata git commit: CARBONDATA-336 Align the the name description
Date Tue, 25 Oct 2016 06:32:17 GMT
Repository: incubator-carbondata
Updated Branches:
  refs/heads/master 2fed52639 -> eb8528770


CARBONDATA-336 Align the the name description

CARBONDATA-336 Align the the name description


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

Branch: refs/heads/master
Commit: 839ce392e2308681e5e114e54b7d0721386d3bac
Parents: 2fed526
Author: chenliang613 <chenliang613@apache.org>
Authored: Sat Oct 22 18:51:16 2016 +0800
Committer: jackylk <jacky.likun@huawei.com>
Committed: Mon Oct 24 23:22:42 2016 +0800

----------------------------------------------------------------------
 .../src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/839ce392/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 30760ed..22019c8 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
@@ -926,14 +926,15 @@ class CarbonSqlParser()
       (INTO ~> TABLE ~> (ident <~ ".").? ~ ident) ~
       (OPTIONS ~> "(" ~> repsep(loadOptions, ",") <~ ")").? <~ opt(";") ^^ {
         case filePath ~ isOverwrite ~ table ~ partionDataOptions =>
-          val (schema, tablename) = table match {
+          val (databaseNameOp, tableName) = table match {
             case databaseName ~ tableName => (databaseName, tableName.toLowerCase())
           }
           if(partionDataOptions.isDefined) {
             validateOptions(partionDataOptions)
           }
           val patitionOptionsMap = partionDataOptions.getOrElse(List.empty[(String, String)]).toMap
-          LoadTable(schema, tablename, filePath, Seq(), patitionOptionsMap, isOverwrite.isDefined)
+          LoadTable(databaseNameOp, tableName, filePath, Seq(), patitionOptionsMap,
+            isOverwrite.isDefined)
       }
 
   private def validateOptions(partionDataOptions: Option[List[(String, String)]]): Unit =
{


Mime
View raw message