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 2017/02/21 15:44:50 UTC
[1/2] incubator-carbondata git commit: [CARBONDATA-716] fix invalid
hdfs lock path if config viewfs
Repository: incubator-carbondata
Updated Branches:
refs/heads/master b4db25164 -> 1bce0bc0d
[CARBONDATA-716] fix invalid hdfs lock path if config viewfs
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/d024b9fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/d024b9fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/d024b9fc
Branch: refs/heads/master
Commit: d024b9fc05c76255f3cc1f343783d528c36eccd4
Parents: b4db251
Author: hexiaoqiao <he...@meituan.com>
Authored: Tue Feb 21 18:42:42 2017 +0800
Committer: hexiaoqiao <he...@meituan.com>
Committed: Tue Feb 21 18:42:42 2017 +0800
----------------------------------------------------------------------
.../apache/carbondata/core/constants/CarbonCommonConstants.java | 4 ++++
.../main/java/org/apache/carbondata/core/locks/HdfsFileLock.java | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d024b9fc/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
index f1faa57..d4347f1 100644
--- a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
+++ b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
@@ -135,6 +135,10 @@ public final class CarbonCommonConstants {
*/
public static final String HDFSURL_PREFIX = "hdfs://";
/**
+ * VIEWFSURL_PREFIX
+ */
+ public static final String VIEWFSURL_PREFIX = "viewfs://";
+ /**
* FS_DEFAULT_FS
*/
public static final String FS_DEFAULT_FS = "fs.defaultFS";
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d024b9fc/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java b/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java
index 3c8a1fd..b3d79e9 100644
--- a/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java
+++ b/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java
@@ -54,7 +54,8 @@ public class HdfsFileLock extends AbstractCarbonLock {
// If can not get the STORE_LOCATION, then use hadoop.tmp.dir .
tmpPath = CarbonProperties.getInstance().getProperty(CarbonCommonConstants.STORE_LOCATION,
System.getProperty(CarbonCommonConstants.HDFS_TEMP_LOCATION));
- if (!tmpPath.startsWith(CarbonCommonConstants.HDFSURL_PREFIX)) {
+ if (!tmpPath.startsWith(CarbonCommonConstants.HDFSURL_PREFIX)
+ && !tmpPath.startsWith(CarbonCommonConstants.VIEWFSURL_PREFIX)) {
tmpPath = hdfsPath + tmpPath;
}
}
[2/2] incubator-carbondata git commit: [CARBONDATA-716] fix invalid
hdfs lock path if config viewfs This closes #608
Posted by ra...@apache.org.
[CARBONDATA-716] fix invalid hdfs lock path if config viewfs This closes #608
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/1bce0bc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/1bce0bc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/1bce0bc0
Branch: refs/heads/master
Commit: 1bce0bc0d7e3b3b2925354cd589d4b2b59a78436
Parents: b4db251 d024b9f
Author: ravipesala <ra...@gmail.com>
Authored: Tue Feb 21 21:14:29 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Tue Feb 21 21:14:29 2017 +0530
----------------------------------------------------------------------
.../apache/carbondata/core/constants/CarbonCommonConstants.java | 4 ++++
.../main/java/org/apache/carbondata/core/locks/HdfsFileLock.java | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------