You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2018/09/09 12:52:08 UTC

carbondata git commit: [CARBONDATA-2908] Add SORT_SCOPE option support in dataframe API

Repository: carbondata
Updated Branches:
  refs/heads/master b0589e502 -> 0483b46e9


[CARBONDATA-2908] Add SORT_SCOPE option support in dataframe API

This closes #2684


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

Branch: refs/heads/master
Commit: 0483b46e9de49787c5bdac82bb9570ded1664bce
Parents: b0589e5
Author: qiuchenjian <80...@qq.com>
Authored: Wed Sep 5 22:00:24 2018 +0800
Committer: Jacky Li <ja...@qq.com>
Committed: Sun Sep 9 20:51:49 2018 +0800

----------------------------------------------------------------------
 .../src/main/scala/org/apache/carbondata/spark/CarbonOption.scala  | 2 ++
 .../main/scala/org/apache/spark/sql/CarbonDataFrameWriter.scala    | 1 +
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/0483b46e/integration/spark-common/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
index 76b0618..fbbca56 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
@@ -50,6 +50,8 @@ class CarbonOption(options: Map[String, String]) {
 
   lazy val sortColumns: Option[String] = options.get("sort_columns")
 
+  lazy val sortScope: Option[String] = options.get("sort_scope")
+
   lazy val dictionaryInclude: Option[String] = options.get("dictionary_include")
 
   lazy val dictionaryExclude: Option[String] = options.get("dictionary_exclude")

http://git-wip-us.apache.org/repos/asf/carbondata/blob/0483b46e/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDataFrameWriter.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDataFrameWriter.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDataFrameWriter.scala
index 80d17a2..cd189d2 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDataFrameWriter.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDataFrameWriter.scala
@@ -81,6 +81,7 @@ class CarbonDataFrameWriter(sqlContext: SQLContext, val dataFrame: DataFrame) {
   private def makeCreateTableString(schema: StructType, options: CarbonOption): String = {
     val property = Map(
       "SORT_COLUMNS" -> options.sortColumns,
+      "SORT_SCOPE" -> options.sortScope,
       "DICTIONARY_INCLUDE" -> options.dictionaryInclude,
       "DICTIONARY_EXCLUDE" -> options.dictionaryExclude,
       "LONG_STRING_COLUMNS" -> options.longStringColumns,