You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by gv...@apache.org on 2016/08/23 19:00:35 UTC
[1/2] incubator-carbondata git commit: colDict_Alldict
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 645860592 -> c11058d74
colDict_Alldict
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/897c12a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/897c12a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/897c12a0
Branch: refs/heads/master
Commit: 897c12a031791f60a80f859093837cbd6989e84c
Parents: 6458605
Author: Jay357089 <li...@huawei.com>
Authored: Mon Aug 22 20:19:06 2016 +0800
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Tue Aug 23 23:42:07 2016 +0530
----------------------------------------------------------------------
.../org/apache/spark/sql/CarbonSqlParser.scala | 8 ++++++++
.../util/ExternalColumnDictionaryTestCase.scala | 20 +++++++++++++++++---
2 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/897c12a0/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 114e397..eeced79 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
@@ -1016,6 +1016,14 @@ class CarbonSqlParser()
throw new MalformedCarbonCommandException(errorMessage)
}
+ // COLUMNDICT and ALL_DICTIONARY_PATH can not be used together.
+ if (options.exists(_._1.equalsIgnoreCase("COLUMNDICT")) &&
+ options.exists(_._1.equalsIgnoreCase("ALL_DICTIONARY_PATH"))) {
+ val errorMessage = "Error: COLUMNDICT and ALL_DICTIONARY_PATH can not be used together" +
+ " in options"
+ throw new MalformedCarbonCommandException(errorMessage)
+ }
+
// check for duplicate options
val duplicateOptions = options filter {
case (_, optionlist) => optionlist.size > 1
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/897c12a0/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala
index f19c3f3..459b99c 100644
--- a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala
+++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala
@@ -20,14 +20,14 @@ package org.apache.carbondata.spark.util
import java.io.File
+import org.apache.carbondata.core.carbon.CarbonDataLoadSchema
+import org.apache.carbondata.spark.exception.MalformedCarbonCommandException
+import org.apache.carbondata.spark.load.CarbonLoadModel
import org.apache.spark.sql.{CarbonEnv, CarbonRelation}
import org.apache.spark.sql.common.util.CarbonHiveContext
import org.apache.spark.sql.common.util.CarbonHiveContext.sql
import org.apache.spark.sql.common.util.QueryTest
-import org.apache.carbondata.core.carbon.CarbonDataLoadSchema
-import org.apache.carbondata.spark.load.CarbonLoadModel
-
import org.scalatest.BeforeAndAfterAll
/**
@@ -205,6 +205,20 @@ class ExternalColumnDictionaryTestCase extends QueryTest with BeforeAndAfterAll
loadSqlRelation, "deviceInformationId", "10086")
}
+ test("COLUMNDICT and ALL_DICTIONARY_PATH can not be used together") {
+ try {
+ sql(s"""
+ LOAD DATA LOCAL INPATH "$complexFilePath1" INTO TABLE loadSqlTest
+ OPTIONS('COLUMNDICT'='$extColDictFilePath1',"ALL_DICTIONARY_PATH"='$extColDictFilePath1')
+ """)
+ assert(false)
+ } catch {
+ case ex: MalformedCarbonCommandException =>
+ assertResult(ex.getMessage)("Error: COLUMNDICT and ALL_DICTIONARY_PATH can not be used together " +
+ "in options")
+ }
+ }
+
override def afterAll: Unit = {
sql("DROP TABLE extComplextypes")
sql("DROP TABLE verticalDelimitedTable")
[2/2] incubator-carbondata git commit: [CARBONDATA-169] This closes
#83
Posted by gv...@apache.org.
[CARBONDATA-169] This closes #83
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/c11058d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/c11058d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/c11058d7
Branch: refs/heads/master
Commit: c11058d7435f4176b1fee1d9fe637eb233936a6a
Parents: 6458605 897c12a
Author: Venkata Ramana G <ra...@huawei.com>
Authored: Wed Aug 24 00:29:57 2016 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Wed Aug 24 00:29:57 2016 +0530
----------------------------------------------------------------------
.../org/apache/spark/sql/CarbonSqlParser.scala | 8 ++++++++
.../util/ExternalColumnDictionaryTestCase.scala | 20 +++++++++++++++++---
2 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------