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 DB3F6200C16 for ; Thu, 9 Feb 2017 11:00:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D9E2C160B50; Thu, 9 Feb 2017 10:00:46 +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 2CFF4160B4C for ; Thu, 9 Feb 2017 11:00:46 +0100 (CET) Received: (qmail 14843 invoked by uid 500); 9 Feb 2017 10:00:45 -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 14834 invoked by uid 99); 9 Feb 2017 10:00:45 -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; Thu, 09 Feb 2017 10:00:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1B3C4DFBE6; Thu, 9 Feb 2017 10:00:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: drankye@apache.org To: common-commits@hadoop.apache.org Message-Id: <17e3e1f25805404c8844b57eaa07101a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-14065. AliyunOSS: oss directory filestatus should use meta time. Contributed by Fei Hui Date: Thu, 9 Feb 2017 10:00:45 +0000 (UTC) archived-at: Thu, 09 Feb 2017 10:00:47 -0000 Repository: hadoop Updated Branches: refs/heads/trunk 37b4acf7c -> a8a594b4c HADOOP-14065. AliyunOSS: oss directory filestatus should use meta time. Contributed by Fei Hui Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a8a594b4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a8a594b4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a8a594b4 Branch: refs/heads/trunk Commit: a8a594b4c89319bef294534755f0e4ed6198ec88 Parents: 37b4acf Author: Kai Zheng Authored: Thu Feb 9 18:00:22 2017 +0800 Committer: Kai Zheng Committed: Thu Feb 9 18:00:22 2017 +0800 ---------------------------------------------------------------------- .../apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java | 3 ++- .../hadoop/fs/aliyun/oss/TestAliyunOSSInputStream.java | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a8a594b4/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java index 3b266c8..3426319 100644 --- a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java +++ b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java @@ -218,7 +218,8 @@ public class AliyunOSSFileSystem extends FileSystem { throw new FileNotFoundException(path + ": No such file or directory!"); } } else if (objectRepresentsDirectory(key, meta.getContentLength())) { - return new FileStatus(0, true, 1, 0, 0, qualifiedPath); + return new FileStatus(0, true, 1, 0, meta.getLastModified().getTime(), + qualifiedPath); } else { return new FileStatus(meta.getContentLength(), false, 1, getDefaultBlockSize(path), meta.getLastModified().getTime(), http://git-wip-us.apache.org/repos/asf/hadoop/blob/a8a594b4/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/TestAliyunOSSInputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/TestAliyunOSSInputStream.java b/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/TestAliyunOSSInputStream.java index 37af28f..10c4edd 100644 --- a/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/TestAliyunOSSInputStream.java +++ b/hadoop-tools/hadoop-aliyun/src/test/java/org/apache/hadoop/fs/aliyun/oss/TestAliyunOSSInputStream.java @@ -24,6 +24,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.contract.ContractTestUtils; import org.apache.hadoop.io.IOUtils; +import org.apache.hadoop.fs.FileStatus; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -142,4 +143,12 @@ public class TestAliyunOSSInputStream { assertTrue(instream.available() == 0); IOUtils.closeStream(instream); } + @Test + public void testDirectoryModifiedTime() throws Exception { + Path emptyDirPath = setPath("/test/emptyDirectory"); + fs.mkdirs(emptyDirPath); + FileStatus dirFileStatus = fs.getFileStatus(emptyDirPath); + assertTrue("expected the empty dir is new", + dirFileStatus.getModificationTime() > 0L); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org