HDFS-10875. Optimize du -x to cache intermediate result. Contributed by Xiao Chen.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e52d6e7a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e52d6e7a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e52d6e7a Branch: refs/heads/HADOOP-12756 Commit: e52d6e7a46ceef74dd8d8a3d49c49420e3271365 Parents: 98bdb51 Author: Xiao Chen <x...@apache.org> Authored: Mon Sep 19 21:44:42 2016 -0700 Committer: Xiao Chen <x...@apache.org> Committed: Mon Sep 19 21:44:42 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/server/namenode/INodeDirectory.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e52d6e7a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java index 9a8f9b2..24c8815 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java @@ -630,14 +630,15 @@ public class INodeDirectory extends INodeWithAdditionalFields ContentSummaryComputationContext summary) { final DirectoryWithSnapshotFeature sf = getDirectoryWithSnapshotFeature(); if (sf != null && snapshotId == Snapshot.CURRENT_STATE_ID) { + final ContentCounts counts = new ContentCounts.Builder().build(); // if the getContentSummary call is against a non-snapshot path, the // computation should include all the deleted files/directories sf.computeContentSummary4Snapshot(summary.getBlockStoragePolicySuite(), - summary.getCounts()); - // Also compute ContentSummary for snapshotCounts (So we can extract it + counts); + summary.getCounts().addContents(counts); + // Also add ContentSummary to snapshotCounts (So we can extract it // later from the ContentSummary of all). - sf.computeContentSummary4Snapshot(summary.getBlockStoragePolicySuite(), - summary.getSnapshotCounts()); + summary.getSnapshotCounts().addContents(counts); } final DirectoryWithQuotaFeature q = getDirectoryWithQuotaFeature(); if (q != null && snapshotId == Snapshot.CURRENT_STATE_ID) { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
