Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DE133200B38 for ; Fri, 8 Jul 2016 23:30:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DCB4F160A78; Fri, 8 Jul 2016 21:30:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3059A160A36 for ; Fri, 8 Jul 2016 23:30:16 +0200 (CEST) Received: (qmail 7058 invoked by uid 500); 8 Jul 2016 21:30:09 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 6190 invoked by uid 99); 8 Jul 2016 21:30:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jul 2016 21:30:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 65E62EAD9A; Fri, 8 Jul 2016 21:30:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lei@apache.org To: common-commits@hadoop.apache.org Date: Fri, 08 Jul 2016 21:30:18 -0000 Message-Id: <8b30bbc2c484431490d0bd288bcebc2b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/21] hadoop git commit: Rename clearHashByPrefix() to clearHashByAncestor() archived-at: Fri, 08 Jul 2016 21:30:17 -0000 Rename clearHashByPrefix() to clearHashByAncestor() This is a more accurate name. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a354674f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a354674f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a354674f Branch: refs/heads/s3_create Commit: a354674f1b5e86841884e91d2b8ffd1a500919b7 Parents: f39f5b3 Author: Aaron Fabbri Authored: Thu Jun 30 16:31:51 2016 -0700 Committer: Aaron Fabbri Committed: Thu Jun 30 16:31:51 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/fs/s3a/LocalMetadataStore.java | 8 ++++---- .../org/apache/hadoop/fs/s3a/TestLocalMetadataStore.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a354674f/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/LocalMetadataStore.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/LocalMetadataStore.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/LocalMetadataStore.java index 6fc4571..a66f619 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/LocalMetadataStore.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/LocalMetadataStore.java @@ -62,8 +62,8 @@ public class LocalMetadataStore implements MetadataStore { if (recursive && cfs.getFileStatus().isDirectory()) { // Remove all entries that have this dir as path prefix. - clearHashByPrefix(f, dirHash); - clearHashByPrefix(f, fileHash); + clearHashByAncestor(f, dirHash); + clearHashByAncestor(f, fileHash); } return true; } @@ -133,13 +133,13 @@ public class LocalMetadataStore implements MetadataStore { } @VisibleForTesting - static void clearHashByPrefix(Path prefix, Map hash) { + static void clearHashByAncestor(Path ancestor, Map hash) { for (Iterator> it = hash.entrySet().iterator(); it.hasNext(); ) { Map.Entry entry = it.next(); Path f = entry.getKey(); - if (isAncestorOf(prefix, f)) { + if (isAncestorOf(ancestor, f)) { it.remove(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/a354674f/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestLocalMetadataStore.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestLocalMetadataStore.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestLocalMetadataStore.java index f30166d..4af60ea 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestLocalMetadataStore.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestLocalMetadataStore.java @@ -182,13 +182,13 @@ public class TestLocalMetadataStore extends Assert { for (String pathStr : paths) { testMap.put(new Path(pathStr), "blah"); } - LocalMetadataStore.clearHashByPrefix(new Path("/a1/b1"), testMap); + LocalMetadataStore.clearHashByAncestor(new Path("/a1/b1"), testMap); assertEquals("Two were deleted", paths.size()-2, testMap.size()); assertNull("c1 deleted", testMap.get("/a1/b1/c1")); assertNull("e1 deleted", testMap.get("/a1/b1/c1/d1/e1")); /* Make sure false prefix match doesn't work. */ - LocalMetadataStore.clearHashByPrefix(new Path("/a"), testMap); + LocalMetadataStore.clearHashByAncestor(new Path("/a"), testMap); assertEquals("Partial prefix dir doesn't match", paths.size()-2, testMap.size()); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org