You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ra...@apache.org on 2017/02/17 14:50:10 UTC
[30/50] [abbrv] hadoop git commit: HDFS-11410. Use the cached
instance when edit logging SetAclOp, SetXAttrOp and RemoveXAttrOp.
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/HDFS-10285
Commit: 02c549484a4fe6215c7f1a18d89389dbba6ea723
Parents: 658702e
Author: Xiao Chen <xi...@apache.org>
Authored: Thu Feb 16 18:07:55 2017 -0800
Committer: Xiao Chen <xi...@apache.org>
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<AclEntry> 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<XAttr> 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<XAttr> 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