carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gvram...@apache.org
Subject [1/3] carbondata git commit: fix comment
Date Mon, 19 Jun 2017 15:08:55 GMT
Repository: carbondata
Updated Branches:
  refs/heads/master 967f8aca6 -> 6299b50fc


fix comment


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

Branch: refs/heads/master
Commit: 51c60fdeb21bfeb4ad0ebc1fe19896d9ec30632a
Parents: 5b4cf70
Author: QiangCai <qiangcai@qq.com>
Authored: Thu Jun 15 19:56:57 2017 +0800
Committer: Venkata Ramana G <ramana.gollamudi@huawei.com>
Committed: Mon Jun 19 20:37:32 2017 +0530

----------------------------------------------------------------------
 .../core/dictionary/generator/ServerDictionaryGenerator.java      | 2 ++
 .../testsuite/partition/TestDataLoadingForPartitionTable.scala    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/51c60fde/core/src/main/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGenerator.java
b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGenerator.java
index 6e0bc3f..9246830 100644
--- a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGenerator.java
@@ -55,6 +55,8 @@ public class ServerDictionaryGenerator implements DictionaryGenerator<Integer,
D
       synchronized (tableMap) {
         if (tableMap.get(key.getTableUniqueName()) == null) {
           tableMap.put(key.getTableUniqueName(), new TableDictionaryGenerator(dimension));
+        } else {
+          tableMap.get(key.getTableUniqueName()).updateGenerator(dimension);
         }
       }
     } else {

http://git-wip-us.apache.org/repos/asf/carbondata/blob/51c60fde/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestDataLoadingForPartitionTable.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestDataLoadingForPartitionTable.scala
b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestDataLoadingForPartitionTable.scala
index 3adc0ed..81e6983 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestDataLoadingForPartitionTable.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestDataLoadingForPartitionTable.scala
@@ -16,16 +16,17 @@
  */
 package org.apache.carbondata.spark.testsuite.partition
 
+import org.apache.spark.sql.Row
 import org.apache.spark.sql.common.util.QueryTest
 import org.apache.spark.sql.test.TestQueryExecutor
 import org.scalatest.BeforeAndAfterAll
+
 import org.apache.carbondata.core.constants.CarbonCommonConstants
 import org.apache.carbondata.core.datastore.filesystem.{CarbonFile, CarbonFileFilter}
 import org.apache.carbondata.core.datastore.impl.FileFactory
 import org.apache.carbondata.core.metadata.CarbonMetadata
 import org.apache.carbondata.core.util.CarbonProperties
 import org.apache.carbondata.core.util.path.CarbonTablePath
-import org.apache.spark.sql.Row
 
 class TestDataLoadingForPartitionTable extends QueryTest with BeforeAndAfterAll {
 


Mime
View raw message