Author: szetszwo
Date: Thu Jan 24 21:33:34 2013
New Revision: 1438203
URL: http://svn.apache.org/viewvc?rev=1438203&view=rev
Log:
HDFS-4436. Change INode.recordModification(..) to return only the current inode
and remove the updateCircularList parameter from some methods in
INodeDirectoryWithSnapshot.Diff.
Modified:
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-2802.txt
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWithSnapshot.java
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeDirectoryWithSnapshot.java
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestINodeDirectoryWithSnapshot.java
Modified:
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-2802.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-2802.txt?rev=1438203&r1=1438202&r2=1438203&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-2802.txt
(original)
+++
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-2802.txt
Thu Jan 24 21:33:34 2013
@@ -116,3 +116,7 @@ Branch-2802 Snapshot (Unreleased)
HDFS-4126. Add reading/writing snapshot information to FSImage.
(Jing Zhao via suresh)
+
+ HDFS-4436. Change INode.recordModification(..) to return only the current
+ inode and remove the updateCircularList parameter from some methods in
+ INodeDirectoryWithSnapshot.Diff. (szetszwo)
Modified:
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1438203&r1=1438202&r2=1438203&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Thu Jan 24 21:33:34 2013
@@ -1983,7 +1983,7 @@ public class FSNamesystem implements Nam
String leaseHolder, String clientMachine, DatanodeDescriptor clientNode,
boolean writeToEditLog, Snapshot latestSnapshot) throws IOException {
if (latestSnapshot != null) {
- file = (INodeFile)file.recordModification(latestSnapshot).left;
+ file = file.recordModification(latestSnapshot);
}
final INodeFileUnderConstruction cons = file.toUnderConstruction(
leaseHolder, clientMachine, clientNode);
Modified:
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java?rev=1438203&r1=1438202&r2=1438203&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java
(original)
+++
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java
Thu Jan 24 21:33:34 2013
@@ -242,8 +242,7 @@ public abstract class INode implements C
}
private INode updatePermissionStatus(PermissionStatusFormat f, long n,
Snapshot latest) {
- Pair<? extends INode, ? extends INode> pair = recordModification(latest);
- INode nodeToUpdate = pair != null ? pair.left : this;
+ final INode nodeToUpdate = recordModification(latest);
nodeToUpdate.permission = f.combine(n, permission);
return nodeToUpdate;
}
@@ -314,12 +313,14 @@ public abstract class INode implements C
*
* @param latest the latest snapshot that has been taken.
* Note that it is null if no snapshots have been taken.
- * @return see {@link #createSnapshotCopy()}.
+ * @return The current inode, which usually is the same object of this inode.
+ * However, in some cases, this inode may be replaced with a new
inode
+ * for maintaining snapshots. The current inode is then the new
inode.
*/
- Pair<? extends INode, ? extends INode> recordModification(Snapshot latest) {
+ INode recordModification(final Snapshot latest) {
Preconditions.checkState(!isDirectory(),
"this is an INodeDirectory, this=%s", this);
- return latest == null? null: parent.saveChild2Snapshot(this, latest);
+ return parent.saveChild2Snapshot(this, latest);
}
/**
@@ -489,8 +490,7 @@ public abstract class INode implements C
* Always set the last modification time of inode.
*/
public INode setModificationTime(long modtime, Snapshot latest) {
- Pair<? extends INode, ? extends INode> pair = recordModification(latest);
- INode nodeToUpdate = pair != null ? pair.left : this;
+ final INode nodeToUpdate = recordModification(latest);
nodeToUpdate.modificationTime = modtime;
return nodeToUpdate;
}
@@ -514,8 +514,7 @@ public abstract class INode implements C
* Set last access time of inode.
*/
public INode setAccessTime(long atime, Snapshot latest) {
- Pair<? extends INode, ? extends INode> pair = recordModification(latest);
- INode nodeToUpdate = pair != null ? pair.left : this;
+ final INode nodeToUpdate = recordModification(latest);
nodeToUpdate.accessTime = atime;
return nodeToUpdate;
}
Modified:
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java?rev=1438203&r1=1438202&r2=1438203&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
(original)
+++
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
Thu Jan 24 21:33:34 2013
@@ -171,7 +171,7 @@ public class INodeDirectory extends INod
= INodeDirectoryWithSnapshot.newInstance(this, null);
s.setQuota(nsQuota, dsQuota, null);
replaceSelf(s);
- s.save2Snapshot(latest, this);
+ s.saveSelf2Snapshot(latest, this);
return s;
}
}
@@ -180,7 +180,7 @@ public class INodeDirectory extends INod
Snapshot latest) {
final INodeDirectorySnapshottable s = new
INodeDirectorySnapshottable(this);
replaceSelf(s);
- s.save2Snapshot(latest, this);
+ s.saveSelf2Snapshot(latest, this);
return s;
}
@@ -229,25 +229,24 @@ public class INodeDirectory extends INod
}
@Override
- public Pair<? extends INode, ? extends INode> recordModification(Snapshot
latest) {
+ public INodeDirectory recordModification(Snapshot latest) {
if (latest == null) {
- return null;
+ return this;
}
- return replaceSelf4INodeDirectoryWithSnapshot(latest)
- .save2Snapshot(latest, this);
+ final INodeDirectoryWithSnapshot withSnapshot
+ = replaceSelf4INodeDirectoryWithSnapshot(latest);
+ withSnapshot.saveSelf2Snapshot(latest, this);
+ return withSnapshot;
}
/**
* Save the child to the latest snapshot.
*
- * @return a pair of inodes, where the left inode is the original child and
- * the right inode is the snapshot copy of the child; see also
- * {@link INode#createSnapshotCopy()}.
+ * @return the child inode, which may be replaced.
*/
- public Pair<? extends INode, ? extends INode> saveChild2Snapshot(
- INode child, Snapshot latest) {
+ public INode saveChild2Snapshot(INode child, Snapshot latest) {
if (latest == null) {
- return null;
+ return child;
}
return replaceSelf4INodeDirectoryWithSnapshot(latest)
.saveChild2Snapshot(child, latest);
Modified:
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java?rev=1438203&r1=1438202&r2=1438203&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
(original)
+++
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
Thu Jan 24 21:33:34 2013
@@ -112,6 +112,12 @@ public class INodeFile extends INode imp
}
@Override
+ INodeFile recordModification(final Snapshot latest) {
+ //TODO: change it to use diff list
+ return (INodeFile)super.recordModification(latest);
+ }
+
+ @Override
public Pair<? extends INodeFile, ? extends INodeFile> createSnapshotCopy() {
return parent.replaceINodeFile(this).createSnapshotCopy();
}
@@ -155,13 +161,9 @@ public class INodeFile extends INode imp
public void setFileReplication(short replication, Snapshot latest) {
if (latest != null) {
- final Pair<? extends INode, ? extends INode> p =
recordModification(latest);
- if (p != null) {
- ((INodeFile)p.left).setFileReplication(replication, null);
- return;
- }
+ recordModification(latest).setFileReplication(replication, null);
+ return;
}
-
header = HeaderFormat.combineReplication(header, replication);
}
Modified:
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWithSnapshot.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWithSnapshot.java?rev=1438203&r1=1438202&r2=1438203&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWithSnapshot.java
(original)
+++
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileWithSnapshot.java
Thu Jan 24 21:33:34 2013
@@ -64,13 +64,16 @@ public interface FileWithSnapshot {
/** Replace the old file with the new file in the circular linked list. */
static void replace(FileWithSnapshot oldFile, FileWithSnapshot newFile) {
- //set next element
- FileWithSnapshot i = oldFile.getNext();
- newFile.setNext(i);
- oldFile.setNext(null);
- //find previous element and update it
- for(; i.getNext() != oldFile; i = i.getNext());
- i.setNext(newFile);
+ final FileWithSnapshot oldNext = oldFile.getNext();
+ if (oldNext == null) {
+ newFile.setNext(null);
+ } else {
+ if (oldNext != oldFile) {
+ newFile.setNext(oldNext);
+ getPrevious(oldFile).setNext(newFile);
+ }
+ oldFile.setNext(null);
+ }
}
/**
Modified:
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeDirectoryWithSnapshot.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeDirectoryWithSnapshot.java?rev=1438203&r1=1438202&r2=1438203&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeDirectoryWithSnapshot.java
(original)
+++
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeDirectoryWithSnapshot.java
Thu Jan 24 21:33:34 2013
@@ -169,18 +169,13 @@ public class INodeDirectoryWithSnapshot
* Delete an inode from current state.
* @return a triple for undo.
*/
- Triple<Integer, INode, Integer> delete(final INode inode,
- boolean updateCircularList) {
+ Triple<Integer, INode, Integer> delete(final INode inode) {
final int c = search(created, inode);
INode previous = null;
Integer d = null;
if (c >= 0) {
// remove a newly created inode
previous = created.remove(c);
- if (updateCircularList && previous instanceof FileWithSnapshot) {
- // also we should remove previous from the circular list
- ((FileWithSnapshot) previous).removeSelf();
- }
} else {
// not in c-list, it must be in previous
d = search(deleted, inode);
@@ -204,7 +199,7 @@ public class INodeDirectoryWithSnapshot
* @return a triple for undo.
*/
Triple<Integer, INode, Integer> modify(final INode oldinode,
- final INode newinode, boolean updateCircularList) {
+ final INode newinode) {
if (!oldinode.equals(newinode)) {
throw new AssertionError("The names do not match: oldinode="
+ oldinode + ", newinode=" + newinode);
@@ -216,14 +211,6 @@ public class INodeDirectoryWithSnapshot
// Case 1.1.3 and 2.3.3: inode is already in c-list,
previous = created.set(c, newinode);
- if (updateCircularList && newinode instanceof FileWithSnapshot) {
- // also should remove oldinode from the circular list
- FileWithSnapshot newNodeWithLink = (FileWithSnapshot) newinode;
- FileWithSnapshot oldNodeWithLink = (FileWithSnapshot) oldinode;
- newNodeWithLink.setNext(oldNodeWithLink.getNext());
- oldNodeWithLink.setNext(null);
- }
-
//TODO: fix a bug that previous != oldinode. Set it to oldinode for
now
previous = oldinode;
} else {
@@ -356,11 +343,8 @@ public class INodeDirectoryWithSnapshot
* @param the posterior diff to combine
* @param deletedINodeProcesser Used in case 2.1, 2.3, 3.1, and 3.3
* to process the deleted inodes.
- * @param updateCircularList Whether to update the circular linked list
- * while combining the diffs.
*/
- void combinePostDiff(Diff postDiff, Processor deletedINodeProcesser,
- boolean updateCircularList) {
+ void combinePostDiff(Diff postDiff, Processor deletedINodeProcesser) {
final List<INode> postCreated = postDiff.created != null?
postDiff.created: Collections.<INode>emptyList();
final List<INode> postDeleted = postDiff.deleted != null?
@@ -381,16 +365,14 @@ public class INodeDirectoryWithSnapshot
c = createdIterator.hasNext()? createdIterator.next(): null;
} else if (cmp > 0) {
// case 2: only in d-list
- Triple<Integer, INode, Integer> triple = delete(d,
- updateCircularList);
+ Triple<Integer, INode, Integer> triple = delete(d);
if (deletedINodeProcesser != null) {
deletedINodeProcesser.process(triple.middle);
}
d = deletedIterator.hasNext()? deletedIterator.next(): null;
} else {
// case 3: in both c-list and d-list
- final Triple<Integer, INode, Integer> triple = modify(d, c,
- updateCircularList);
+ final Triple<Integer, INode, Integer> triple = modify(d, c);
if (deletedINodeProcesser != null) {
deletedINodeProcesser.process(triple.middle);
}
@@ -562,18 +544,14 @@ public class INodeDirectoryWithSnapshot
}
/** Copy the INode state to the snapshot if it is not done already. */
- private Pair<INodeDirectory, INodeDirectory> checkAndInitINode(
- INodeDirectory snapshotCopy) {
- if (snapshotINode != null) {
- // already initialized.
- return null;
- }
- final INodeDirectoryWithSnapshot dir = INodeDirectoryWithSnapshot.this;
- if (snapshotCopy == null) {
- snapshotCopy = new INodeDirectory(dir, false);
+ private void checkAndInitINode(INodeDirectory snapshotCopy) {
+ if (snapshotINode == null) {
+ if (snapshotCopy == null) {
+ snapshotCopy = new INodeDirectory(INodeDirectoryWithSnapshot.this,
+ false);
+ }
+ snapshotINode = snapshotCopy;
}
- snapshotINode = snapshotCopy;
- return new Pair<INodeDirectory, INodeDirectory>(dir, snapshotCopy);
}
/** @return the snapshot object of this diff. */
@@ -605,7 +583,7 @@ public class INodeDirectoryWithSnapshot
if (children == null) {
final Diff combined = new Diff();
for(SnapshotDiff d = SnapshotDiff.this; d != null; d =
d.posteriorDiff) {
- combined.combinePostDiff(d.diff, null, false);
+ combined.combinePostDiff(d.diff, null);
}
children = combined.apply2Current(ReadOnlyList.Util.asList(
INodeDirectoryWithSnapshot.this.getChildrenList(null)));
@@ -748,7 +726,7 @@ public class INodeDirectoryWithSnapshot
((INodeFile)inode).collectSubtreeBlocksAndClear(collectedBlocks);
}
}
- }, true);
+ });
previousDiff.posteriorDiff = diffToRemove.posteriorDiff;
diffToRemove.posteriorDiff = null;
@@ -839,32 +817,44 @@ public class INodeDirectoryWithSnapshot
}
@Override
- public Pair<INodeDirectory, INodeDirectory> recordModification(Snapshot
latest) {
- return save2Snapshot(latest, null);
+ public INodeDirectoryWithSnapshot recordModification(Snapshot latest) {
+ saveSelf2Snapshot(latest, null);
+ return this;
}
/** Save the snapshot copy to the latest snapshot. */
- public Pair<INodeDirectory, INodeDirectory> save2Snapshot(Snapshot latest,
- INodeDirectory snapshotCopy) {
- return latest == null? null
- :
checkAndAddLatestSnapshotDiff(latest).checkAndInitINode(snapshotCopy);
+ public void saveSelf2Snapshot(Snapshot latest, INodeDirectory snapshotCopy) {
+ if (latest != null) {
+ checkAndAddLatestSnapshotDiff(latest).checkAndInitINode(snapshotCopy);
+ }
}
@Override
- public Pair<? extends INode, ? extends INode> saveChild2Snapshot(
- INode child, Snapshot latest) {
+ public INode saveChild2Snapshot(INode child, Snapshot latest) {
Preconditions.checkArgument(!child.isDirectory(),
"child is a directory, child=%s", child);
+ if (latest == null) {
+ return child;
+ }
final SnapshotDiff diff = checkAndAddLatestSnapshotDiff(latest);
if (diff.getChild(child.getLocalNameBytes(), false) != null) {
// it was already saved in the latest snapshot earlier.
- return null;
+ return child;
}
final Pair<? extends INode, ? extends INode> p =
child.createSnapshotCopy();
- diff.diff.modify(p.right, p.left, true);
- return p;
+ if (p.left != p.right) {
+ final Triple<Integer, INode, Integer> triple = diff.diff.modify(p.right,
p.left);
+ if (triple.middle != null && p.left instanceof FileWithSnapshot) {
+ // also should remove oldinode from the circular list
+ FileWithSnapshot newNodeWithLink = (FileWithSnapshot) p.left;
+ FileWithSnapshot oldNodeWithLink = (FileWithSnapshot) p.right;
+ newNodeWithLink.setNext(oldNodeWithLink.getNext());
+ oldNodeWithLink.setNext(null);
+ }
+ }
+ return p.left;
}
@Override
@@ -888,11 +878,20 @@ public class INodeDirectoryWithSnapshot
Triple<Integer, INode, Integer> undoInfo = null;
if (latest != null) {
diff = checkAndAddLatestDiff(latest);
- undoInfo = diff.delete(child, true);
+ undoInfo = diff.delete(child);
}
final INode removed = super.removeChild(child, null);
- if (removed == null && undoInfo != null) {
- diff.undoDelete(child, undoInfo);
+ if (undoInfo != null) {
+ if (removed == null) {
+ //remove failed, undo
+ diff.undoDelete(child, undoInfo);
+ } else {
+ //clean up the previously created file, if there is any.
+ final INode previous = undoInfo.middle;
+ if (previous != null && previous instanceof FileWithSnapshot) {
+ ((FileWithSnapshot)previous).removeSelf();
+ }
+ }
}
return removed;
}
Modified:
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestINodeDirectoryWithSnapshot.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestINodeDirectoryWithSnapshot.java?rev=1438203&r1=1438202&r2=1438203&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestINodeDirectoryWithSnapshot.java
(original)
+++
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestINodeDirectoryWithSnapshot.java
Thu Jan 24 21:33:34 2013
@@ -148,7 +148,7 @@ public class TestINodeDirectoryWithSnaps
// combine all diffs
final Diff combined = diffs[0];
for(int i = 1; i < diffs.length; i++) {
- combined.combinePostDiff(diffs[i], null, false);
+ combined.combinePostDiff(diffs[i], null);
}
{
@@ -284,7 +284,7 @@ public class TestINodeDirectoryWithSnaps
before = toString(diff);
}
- final Triple<Integer, INode, Integer> undoInfo = diff.delete(inode,
true);
+ final Triple<Integer, INode, Integer> undoInfo = diff.delete(inode);
if (testUndo) {
final String after = toString(diff);
@@ -292,7 +292,7 @@ public class TestINodeDirectoryWithSnaps
diff.undoDelete(inode, undoInfo);
assertDiff(before, diff);
//re-do
- diff.delete(inode, true);
+ diff.delete(inode);
assertDiff(after, diff);
}
}
@@ -314,7 +314,7 @@ public class TestINodeDirectoryWithSnaps
before = toString(diff);
}
- final Triple<Integer, INode, Integer> undoInfo = diff.modify(oldinode,
newinode, true);
+ final Triple<Integer, INode, Integer> undoInfo = diff.modify(oldinode,
newinode);
if (testUndo) {
final String after = toString(diff);
@@ -322,7 +322,7 @@ public class TestINodeDirectoryWithSnaps
diff.undoModify(oldinode, newinode, undoInfo);
assertDiff(before, diff);
//re-do
- diff.modify(oldinode, newinode, true);
+ diff.modify(oldinode, newinode);
assertDiff(after, diff);
}
}
