You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2016/08/30 15:01:57 UTC
[1/2] incubator-carbondata git commit: Fix review comments
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 2f13668c2 -> ac5ddda9e
Fix review comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/911aabd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/911aabd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/911aabd5
Branch: refs/heads/master
Commit: 911aabd574ce5a4a87408b05ba006f4b01890cd7
Parents: 2f13668
Author: Zhangshunyu <zh...@huawei.com>
Authored: Tue Aug 30 16:10:25 2016 +0800
Committer: ravipesala <ra...@gmail.com>
Committed: Tue Aug 30 20:30:22 2016 +0530
----------------------------------------------------------------------
.../spark/tasks/DictionaryWriterTask.scala | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/911aabd5/integration/spark/src/main/scala/org/apache/carbondata/spark/tasks/DictionaryWriterTask.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/carbondata/spark/tasks/DictionaryWriterTask.scala b/integration/spark/src/main/scala/org/apache/carbondata/spark/tasks/DictionaryWriterTask.scala
index 958f5a6..d1b8bf3 100644
--- a/integration/spark/src/main/scala/org/apache/carbondata/spark/tasks/DictionaryWriterTask.scala
+++ b/integration/spark/src/main/scala/org/apache/carbondata/spark/tasks/DictionaryWriterTask.scala
@@ -63,15 +63,13 @@ class DictionaryWriterTask(valuesBuffer: mutable.HashSet[String],
if (values.length >= 1) {
if (model.dictFileExists(columnIndex)) {
for (value <- values) {
- if (dictionary.getSurrogateKey(value) ==
- CarbonCommonConstants.INVALID_SURROGATE_KEY) {
- val parsedValue = org.apache.carbondata.core.util.DataTypeUtil
- .normalizeColumnValueForItsDataType(value,
- model.primDimensions(columnIndex))
- if (null != parsedValue) {
- writer.write(parsedValue)
- distinctValues.add(parsedValue)
- }
+ val parsedValue = org.apache.carbondata.core.util.DataTypeUtil
+ .normalizeColumnValueForItsDataType(value,
+ model.primDimensions(columnIndex))
+ if (null != parsedValue && dictionary.getSurrogateKey(parsedValue) ==
+ CarbonCommonConstants.INVALID_SURROGATE_KEY) {
+ writer.write(parsedValue)
+ distinctValues.add(parsedValue)
}
}
[2/2] incubator-carbondata git commit: [CARBONDATA-187]Fix the bug
that when using Decimal type as dictionary the generated surrogate key would
mismatch for the same values during increment load. This closes #103
Posted by ra...@apache.org.
[CARBONDATA-187]Fix the bug that when using Decimal type as dictionary the generated surrogate key would mismatch for the same values during increment load. This closes #103
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/ac5ddda9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/ac5ddda9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/ac5ddda9
Branch: refs/heads/master
Commit: ac5ddda9e6054aa86b82a97ce205962abfc154e6
Parents: 2f13668 911aabd
Author: ravipesala <ra...@gmail.com>
Authored: Tue Aug 30 20:31:24 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Tue Aug 30 20:31:24 2016 +0530
----------------------------------------------------------------------
.../spark/tasks/DictionaryWriterTask.scala | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------