Return-Path: <commits-return-4765-archive-asf-public=cust-asf.ponee.io@carbondata.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 46244200CBB
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 19 Jun 2017 17:08:57 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 455C0160BE1; Mon, 19 Jun 2017 15:08:57 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 89FD7160BE4
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 19 Jun 2017 17:08:56 +0200 (CEST)
Received: (qmail 67644 invoked by uid 500); 19 Jun 2017 15:08:55 -0000
Mailing-List: contact commits-help@carbondata.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@carbondata.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@carbondata.apache.org>
List-Post: <mailto:commits@carbondata.apache.org>
List-Id: <commits.carbondata.apache.org>
Reply-To: dev@carbondata.apache.org
Delivered-To: mailing list commits@carbondata.apache.org
Received: (qmail 67615 invoked by uid 99); 19 Jun 2017 15:08:55 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2017 15:08:55 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 8B850DFB01; Mon, 19 Jun 2017 15:08:55 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: gvramana@apache.org
To: commits@carbondata.apache.org
Date: Mon, 19 Jun 2017 15:08:55 -0000
Message-Id: <ff3c8b572b9b4eb68693ae76f2805020@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] carbondata git commit: fix comment
archived-at: Mon, 19 Jun 2017 15:08:57 -0000

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 {