Return-Path: X-Original-To: apmail-falcon-commits-archive@minotaur.apache.org Delivered-To: apmail-falcon-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D063211301 for ; Thu, 28 Aug 2014 08:26:33 +0000 (UTC) Received: (qmail 66674 invoked by uid 500); 28 Aug 2014 08:26:33 -0000 Delivered-To: apmail-falcon-commits-archive@falcon.apache.org Received: (qmail 66631 invoked by uid 500); 28 Aug 2014 08:26:33 -0000 Mailing-List: contact commits-help@falcon.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.incubator.apache.org Delivered-To: mailing list commits@falcon.incubator.apache.org Received: (qmail 66622 invoked by uid 99); 28 Aug 2014 08:26:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Aug 2014 08:26:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 28 Aug 2014 08:26:10 +0000 Received: (qmail 66407 invoked by uid 99); 28 Aug 2014 08:26:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Aug 2014 08:26:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06BDCA023D5; Thu, 28 Aug 2014 08:26:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samarthg@apache.org To: commits@falcon.incubator.apache.org Date: Thu, 28 Aug 2014 08:26:07 -0000 Message-Id: <12b2615f4e5a4e23a4ca5c87695b5f55@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: FALCON-629 Add javadoc for method stitchTwoHdfsPaths contributed by Raghav Kumar Gautam X-Virus-Checked: Checked by ClamAV on apache.org 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 Authored: Thu Aug 28 13:51:30 2014 +0530 Committer: Samarth Gupta 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("^/*", ""); }