You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2016/08/26 07:35:53 UTC
[1/2] incubator-carbondata git commit: CARBONDATA-129 Do null check
before adding value to CarbonProperties
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 1a28ada21 -> 24d93b15a
CARBONDATA-129 Do null check before adding value to CarbonProperties
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/27f7c4c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/27f7c4c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/27f7c4c7
Branch: refs/heads/master
Commit: 27f7c4c7a0f310764c148aa9786ee51ad4884f8f
Parents: 1a28ada
Author: Praveen Adlakha <ad...@gmail.com>
Authored: Fri Aug 12 18:11:38 2016 +0530
Committer: chenliang613 <ch...@apache.org>
Committed: Fri Aug 26 15:34:26 2016 +0800
----------------------------------------------------------------------
.../carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/27f7c4c7/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala b/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala
index 59db05b..fa32d99 100644
--- a/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala
+++ b/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala
@@ -299,15 +299,15 @@ class CarbonGlobalDictionaryGenerateRDD(
val pathService = CarbonCommonFactory.getPathService
val carbonTablePath = pathService.getCarbonTablePath(model.columnIdentifier(split.index),
model.hdfsLocation, model.table)
- if (null != model.hdfsTempLocation) {
+ if (StringUtils.isNotBlank(model.hdfsTempLocation )) {
CarbonProperties.getInstance.addProperty(CarbonCommonConstants.HDFS_TEMP_LOCATION,
model.hdfsTempLocation)
}
- if (null != model.lockType) {
+ if (StringUtils.isNotBlank(model.lockType)) {
CarbonProperties.getInstance.addProperty(CarbonCommonConstants.LOCK_TYPE,
model.lockType)
}
- if (null != model.zooKeeperUrl) {
+ if (StringUtils.isNotBlank(model.zooKeeperUrl)) {
CarbonProperties.getInstance.addProperty(CarbonCommonConstants.ZOOKEEPER_URL,
model.zooKeeperUrl)
}
[2/2] incubator-carbondata git commit: CARBONDATA-129 Do null check
before adding value to CarbonProperties This closes #73
Posted by ch...@apache.org.
CARBONDATA-129 Do null check before adding value to CarbonProperties This closes #73
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/24d93b15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/24d93b15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/24d93b15
Branch: refs/heads/master
Commit: 24d93b15a2302a7747c5cf2bc8486496efc9e47f
Parents: 1a28ada 27f7c4c
Author: chenliang613 <ch...@apache.org>
Authored: Fri Aug 26 15:35:36 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Fri Aug 26 15:35:36 2016 +0800
----------------------------------------------------------------------
.../carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------