You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by gv...@apache.org on 2017/06/28 11:56:30 UTC
[1/2] carbondata git commit: [CARBONDATA-1236] Support absolute path
without scheme in loading - hdfs path issue fix
Repository: carbondata
Updated Branches:
refs/heads/master 95bd82c7d -> 7efc49d45
[CARBONDATA-1236] Support absolute path without scheme in loading - hdfs path issue fix
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/82ef875e
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/82ef875e
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/82ef875e
Branch: refs/heads/master
Commit: 82ef875ef2163d4fdc7f0d0a098d24c3a539eb55
Parents: 95bd82c
Author: dhatchayani <dh...@gmail.com>
Authored: Wed Jun 28 14:44:54 2017 +0530
Committer: dhatchayani <dh...@gmail.com>
Committed: Wed Jun 28 14:45:38 2017 +0530
----------------------------------------------------------------------
.../main/java/org/apache/carbondata/core/util/CarbonUtil.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/82ef875e/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
index 2cd3114..6e0348b 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
@@ -696,13 +696,13 @@ public final class CarbonUtil {
* @param filePath
*/
public static String checkAndAppendHDFSUrl(String filePath) {
- if (!filePath.startsWith("/")) {
- filePath = "/" + filePath;
- }
String currentPath = filePath;
if (null != filePath && filePath.length() != 0
&& FileFactory.getFileType(filePath) != FileFactory.FileType.HDFS
&& FileFactory.getFileType(filePath) != FileFactory.FileType.VIEWFS) {
+ if (!filePath.startsWith("/")) {
+ filePath = "/" + filePath;
+ }
String baseDFSUrl = CarbonProperties.getInstance()
.getProperty(CarbonCommonConstants.CARBON_DDL_BASE_HDFS_URL);
String dfsUrl = conf.get(FS_DEFAULT_FS);
[2/2] carbondata git commit: [CARBONDATA-1236] Support absolute path
with out scehema in URI. This closes #1107
Posted by gv...@apache.org.
[CARBONDATA-1236] Support absolute path with out scehema in URI. This closes #1107
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/7efc49d4
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/7efc49d4
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/7efc49d4
Branch: refs/heads/master
Commit: 7efc49d451363562d30d97634fa9aad824508e39
Parents: 95bd82c 82ef875
Author: Venkata Ramana G <ra...@huawei.com>
Authored: Wed Jun 28 17:26:15 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Wed Jun 28 17:26:15 2017 +0530
----------------------------------------------------------------------
.../main/java/org/apache/carbondata/core/util/CarbonUtil.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------