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 8AAD7200B38 for ; Fri, 8 Jul 2016 23:30:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8934C160A7D; Fri, 8 Jul 2016 21:30:17 +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 D134B160A77 for ; Fri, 8 Jul 2016 23:30:16 +0200 (CEST) Received: (qmail 7340 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 6271 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 86608E08FE; 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:27 -0000 Message-Id: <34430bc1cc9f42eabdbc281e2a78d328@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/21] hadoop git commit: Merge pull request #15 from lei/get_filestatus archived-at: Fri, 08 Jul 2016 21:30:17 -0000 Merge pull request #15 from lei/get_filestatus Implement GetFileStatus and ListStatus() Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b7e876a8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b7e876a8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b7e876a8 Branch: refs/heads/s3_create Commit: b7e876a8254edb8154239af0c3b119db9bf6ee2c Parents: 5353aa7 8fb665d Author: Aaron Fabbri Authored: Thu Jul 7 22:05:19 2016 -0700 Committer: Lei Xu Committed: Fri Jul 8 10:13:36 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/fs/s3a/CachedDirectory.java | 49 ++++++++----- .../apache/hadoop/fs/s3a/CachedFileStatus.java | 20 ++++-- .../hadoop/fs/s3a/DynamoDBMetadataStore.java | 2 +- .../hadoop/fs/s3a/LocalMetadataStore.java | 2 +- .../org/apache/hadoop/fs/s3a/S3AFileStatus.java | 6 ++ .../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 73 ++++++++++++++++++-- .../org/apache/hadoop/fs/s3a/Statistic.java | 2 + .../hadoop/fs/s3a/TestLocalMetadataStore.java | 17 +++-- 8 files changed, 130 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b7e876a8/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/LocalMetadataStore.java ---------------------------------------------------------------------- diff --cc hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/LocalMetadataStore.java index ca3649f,a66f619..e3eee09 --- 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 @@@ -115,16 -101,12 +115,16 @@@ public class LocalMetadataStore impleme dirHash.put(f, dir); } - /* Update cached parent dir, if any. */ - // XXX TODO handle root directory - CachedDirectory parent = dirHash.get(f.getParent()); - if (parent != null) { - parent.addFile(cfs.fileStatus); + /* Update cached parent dir. */ + Path parentPath = f.getParent(); + CachedDirectory parent = dirHash.get(parentPath); + if (parent == null) { + /* Track this new file's listing in parent. Parent is not fullyCached, + since there may be other items in it we don't know about. */ - parent = new CachedDirectory(parentPath, new FileStatus[0], false); ++ parent = new CachedDirectory(parentPath, new S3AFileStatus[0], false); + dirHash.put(parentPath, parent); } + parent.addFile(cfs.fileStatus); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b7e876a8/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b7e876a8/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestLocalMetadataStore.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org