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 349AC200C46 for ; Wed, 22 Feb 2017 01:06:38 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 337CA160B77; Wed, 22 Feb 2017 00:06:38 +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 84D4D160B68 for ; Wed, 22 Feb 2017 01:06:37 +0100 (CET) Received: (qmail 66123 invoked by uid 500); 22 Feb 2017 00:06:30 -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 65301 invoked by uid 99); 22 Feb 2017 00:06:30 -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; Wed, 22 Feb 2017 00:06:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 30923E0D7B; Wed, 22 Feb 2017 00:06:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xgong@apache.org To: common-commits@hadoop.apache.org Date: Wed, 22 Feb 2017 00:07:02 -0000 Message-Id: <6cae0db11c26440c8b80cf606e99aa8b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [34/50] [abbrv] hadoop git commit: HDFS-11410. Use the cached instance when edit logging SetAclOp, SetXAttrOp and RemoveXAttrOp. archived-at: Wed, 22 Feb 2017 00:06:38 -0000 HDFS-11410. Use the cached instance when edit logging SetAclOp, SetXAttrOp and RemoveXAttrOp. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/02c54948 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/02c54948 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/02c54948 Branch: refs/heads/YARN-5734 Commit: 02c549484a4fe6215c7f1a18d89389dbba6ea723 Parents: 658702e Author: Xiao Chen Authored: Thu Feb 16 18:07:55 2017 -0800 Committer: Xiao Chen Committed: Thu Feb 16 18:07:55 2017 -0800 ---------------------------------------------------------------------- .../hadoop/hdfs/server/namenode/FSEditLog.java | 6 +++--- .../hdfs/server/namenode/FSEditLogOp.java | 21 +++++++++----------- 2 files changed, 12 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/02c54948/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java index 8454a46..d3f4447 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java @@ -1206,14 +1206,14 @@ public class FSEditLog implements LogsPurgeable { } void logSetAcl(String src, List entries) { - SetAclOp op = SetAclOp.getInstance(); + final SetAclOp op = SetAclOp.getInstance(cache.get()); op.src = src; op.aclEntries = entries; logEdit(op); } void logSetXAttrs(String src, List xAttrs, boolean toLogRpcIds) { - final SetXAttrOp op = SetXAttrOp.getInstance(); + final SetXAttrOp op = SetXAttrOp.getInstance(cache.get()); op.src = src; op.xAttrs = xAttrs; logRpcIds(op, toLogRpcIds); @@ -1221,7 +1221,7 @@ public class FSEditLog implements LogsPurgeable { } void logRemoveXAttrs(String src, List xAttrs, boolean toLogRpcIds) { - final RemoveXAttrOp op = RemoveXAttrOp.getInstance(); + final RemoveXAttrOp op = RemoveXAttrOp.getInstance(cache.get()); op.src = src; op.xAttrs = xAttrs; logRpcIds(op, toLogRpcIds); http://git-wip-us.apache.org/repos/asf/hadoop/blob/02c54948/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java index a3285a9..6293557 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java @@ -3745,8 +3745,7 @@ public abstract class FSEditLogOp { } static AddCacheDirectiveInfoOp getInstance(OpInstanceCache cache) { - return (AddCacheDirectiveInfoOp) cache - .get(OP_ADD_CACHE_DIRECTIVE); + return (AddCacheDirectiveInfoOp) cache.get(OP_ADD_CACHE_DIRECTIVE); } @Override @@ -3816,8 +3815,7 @@ public abstract class FSEditLogOp { } static ModifyCacheDirectiveInfoOp getInstance(OpInstanceCache cache) { - return (ModifyCacheDirectiveInfoOp) cache - .get(OP_MODIFY_CACHE_DIRECTIVE); + return (ModifyCacheDirectiveInfoOp) cache.get(OP_MODIFY_CACHE_DIRECTIVE); } @Override @@ -3893,8 +3891,7 @@ public abstract class FSEditLogOp { } static RemoveCacheDirectiveInfoOp getInstance(OpInstanceCache cache) { - return (RemoveCacheDirectiveInfoOp) cache - .get(OP_REMOVE_CACHE_DIRECTIVE); + return (RemoveCacheDirectiveInfoOp) cache.get(OP_REMOVE_CACHE_DIRECTIVE); } @Override @@ -4146,8 +4143,8 @@ public abstract class FSEditLogOp { super(OP_REMOVE_XATTR); } - static RemoveXAttrOp getInstance() { - return new RemoveXAttrOp(); + static RemoveXAttrOp getInstance(OpInstanceCache cache) { + return (RemoveXAttrOp) cache.get(OP_REMOVE_XATTR); } @Override @@ -4199,8 +4196,8 @@ public abstract class FSEditLogOp { super(OP_SET_XATTR); } - static SetXAttrOp getInstance() { - return new SetXAttrOp(); + static SetXAttrOp getInstance(OpInstanceCache cache) { + return (SetXAttrOp) cache.get(OP_SET_XATTR); } @Override @@ -4252,8 +4249,8 @@ public abstract class FSEditLogOp { super(OP_SET_ACL); } - static SetAclOp getInstance() { - return new SetAclOp(); + static SetAclOp getInstance(OpInstanceCache cache) { + return (SetAclOp) cache.get(OP_SET_ACL); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org