[REBASE] Rebasing with master branch and Fixing rebase conflict
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/239a6cad Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/239a6cad Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/239a6cad Branch: refs/heads/carbonstore Commit: 239a6cadb14dfb1dc5dbfcc58f69c5675cbcbbf2 Parents: d4a28a2 Author: Jacky Li <jacky.li...@qq.com> Authored: Wed Jul 18 10:14:43 2018 +0800 Committer: Jacky Li <jacky.li...@qq.com> Committed: Wed Jul 18 10:14:54 2018 +0800 ---------------------------------------------------------------------- .../carbondata/core/metadata/schema/table/TableSchemaBuilder.java | 3 ++- .../main/scala/org/apache/spark/sql/CarbonSessionBuilder.scala | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/239a6cad/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchemaBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchemaBuilder.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchemaBuilder.java index 80f0aa5..8edf73b 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchemaBuilder.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableSchemaBuilder.java @@ -139,7 +139,8 @@ public class TableSchemaBuilder { String localdictionaryThreshold = localDictionaryThreshold.equalsIgnoreCase("0") ? CarbonCommonConstants.LOCAL_DICTIONARY_THRESHOLD_DEFAULT : localDictionaryThreshold; - tableProperties.put(CarbonCommonConstants.LOCAL_DICTIONARY_THRESHOLD, localdictionaryThreshold); + tableProperties.put( + CarbonCommonConstants.LOCAL_DICTIONARY_THRESHOLD, localdictionaryThreshold); for (int index = 0; index < allColumns.size(); index++) { ColumnSchema colSchema = allColumns.get(index); if (colSchema.getDataType() == DataTypes.STRING http://git-wip-us.apache.org/repos/asf/carbondata/blob/239a6cad/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSessionBuilder.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSessionBuilder.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSessionBuilder.scala index 29bcbaa..47b5c8c 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSessionBuilder.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSessionBuilder.scala @@ -20,8 +20,8 @@ package org.apache.spark.sql import java.io.File import org.apache.hadoop.conf.Configuration -import org.apache.spark.scheduler.{SparkListener, SparkListenerApplicationEnd} import org.apache.spark.{SparkConf, SparkContext} +import org.apache.spark.scheduler.{SparkListener, SparkListenerApplicationEnd} import org.apache.spark.sql.SparkSession.Builder import org.apache.spark.sql.profiler.Profiler import org.apache.spark.util.Utils
