falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samar...@apache.org
Subject [1/2] git commit: FALCON-629 Add javadoc for method stitchTwoHdfsPaths contributed by Raghav Kumar Gautam
Date Thu, 28 Aug 2014 08:26:07 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/FALCON-585 e9c6a2dcf -> 577d47f37


FALCON-629 Add javadoc for method stitchTwoHdfsPaths contributed by Raghav Kumar Gautam


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/7a37f691
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/7a37f691
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/7a37f691

Branch: refs/heads/FALCON-585
Commit: 7a37f69175b1d87b60c480341ab46b97925d916d
Parents: e9c6a2d
Author: Samarth Gupta <samarth.gupta@inmobi.com>
Authored: Thu Aug 28 13:51:30 2014 +0530
Committer: Samarth Gupta <samarth.gupta@inmobi.com>
Committed: Thu Aug 28 13:51:30 2014 +0530

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                                | 4 ++++
 .../org/apache/falcon/regression/core/util/HadoopUtil.java   | 8 ++++++++
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/7a37f691/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index a0b318f..58a49b8 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -7,6 +7,10 @@ Trunk (Unreleased)
   NEW FEATURES
 
   IMPROVEMENTS
+
+   FALCON-629 Add javadoc for method stitchTwoHdfsPaths (Raghav Kumar Gautam
+   via Samarth Gupta) 
+
    FALCON-585 Remove requirement to have write access to / (Raghav Kumar Gautam)
       FALCON-606 hcat tests should stop using root dir (Raghav Kumar Gautam 
       via Arpit Gupta)

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/7a37f691/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java
b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java
index 925ee76..c348348 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java
@@ -439,6 +439,14 @@ public final class HadoopUtil {
         return retValue;
     }
 
+    /**
+     * Stitch two hadoop paths. For eg: stitchTwoHdfsPaths("/tmp/", "/test") = "/tmp/test",
+     * stitchTwoHdfsPaths("/tmp/", "test") = "/tmp/test",
+     * stitchTwoHdfsPaths("/tmp", "test") = "/tmp/test"
+     * @param path1 the first path to be stitched
+     * @param path2 the second path to be stitched
+     * @return final stitched path
+     */
     private static String stitchTwoHdfsPaths(String path1, String path2) {
         return path1.replaceAll("/*$", "") + "/" + path2.replaceAll("^/*", "");
     }


Mime
View raw message