You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sz...@apache.org on 2013/04/23 02:11:53 UTC
svn commit: r1470759 - in
/hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs: ./
src/main/java/org/apache/hadoop/hdfs/server/namenode/
src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/
Author: szetszwo
Date: Tue Apr 23 00:11:51 2013
New Revision: 1470759
URL: http://svn.apache.org/r1470759
Log:
HDFS-4719. Remove AbstractINodeDiff.Factory and move its methods to AbstractINodeDiffList. Contributed by Arpit Agarwal
Added:
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java
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/FSImageFormat.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/AbstractINodeDiff.java
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiffList.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/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeFileUnderConstructionWithSnapshot.java
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeFileWithSnapshot.java
hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/SnapshotFSImageFormat.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=1470759&r1=1470758&r2=1470759&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 Tue Apr 23 00:11:51 2013
@@ -266,3 +266,6 @@ Branch-2802 Snapshot (Unreleased)
HDFS-4727. Update inodeMap after deleting files/directories/snapshots.
(Jing Zhao via szetszwo)
+
+ HDFS-4719. Remove AbstractINodeDiff.Factory and move its methods to
+ AbstractINodeDiffList. (Arpit Agarwal via szetszwo)
Modified: hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.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/FSImageFormat.java?rev=1470759&r1=1470758&r2=1470759&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java Tue Apr 23 00:11:51 2013
@@ -53,7 +53,7 @@ import org.apache.hadoop.hdfs.protocol.L
import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager;
import org.apache.hadoop.hdfs.server.common.InconsistentFSStateException;
-import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.FileDiffList;
+import org.apache.hadoop.hdfs.server.namenode.snapshot.FileDiffList;
import org.apache.hadoop.hdfs.server.namenode.snapshot.INodeDirectorySnapshottable;
import org.apache.hadoop.hdfs.server.namenode.snapshot.INodeDirectoryWithSnapshot;
import org.apache.hadoop.hdfs.server.namenode.snapshot.INodeFileUnderConstructionWithSnapshot;
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=1470759&r1=1470758&r2=1470759&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 Tue Apr 23 00:11:51 2013
@@ -142,13 +142,6 @@ public class INodeDirectory extends INod
}
/**
- * Remove the specified child and all its snapshot copies from this directory.
- */
- public boolean removeChildAndAllSnapshotCopies(INode child) {
- return removeChild(child);
- }
-
- /**
* Replace itself with {@link INodeDirectoryWithQuota} or
* {@link INodeDirectoryWithSnapshot} depending on the latest snapshot.
*/
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=1470759&r1=1470758&r2=1470759&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 Tue Apr 23 00:11:51 2013
@@ -34,7 +34,7 @@ import org.apache.hadoop.hdfs.server.blo
import org.apache.hadoop.hdfs.server.namenode.Content.CountsMap.Key;
import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot;
import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.FileDiff;
-import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.FileDiffList;
+import org.apache.hadoop.hdfs.server.namenode.snapshot.FileDiffList;
import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.Util;
import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot;
Modified: hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiff.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/AbstractINodeDiff.java?rev=1470759&r1=1470758&r2=1470759&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiff.java (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiff.java Tue Apr 23 00:11:51 2013
@@ -30,7 +30,7 @@ import com.google.common.base.Preconditi
/**
* The difference of an inode between in two snapshots.
- * {@link AbstractINodeDiff2} maintains a list of snapshot diffs,
+ * {@link AbstractINodeDiffList} maintains a list of snapshot diffs,
* <pre>
* d_1 -> d_2 -> ... -> d_n -> null,
* </pre>
@@ -49,15 +49,6 @@ import com.google.common.base.Preconditi
abstract class AbstractINodeDiff<N extends INode,
D extends AbstractINodeDiff<N, D>>
implements Comparable<Snapshot> {
- /** A factory for creating diff and snapshot copy of an inode. */
- static abstract class Factory<N extends INode,
- D extends AbstractINodeDiff<N, D>> {
- /** @return an {@link AbstractINodeDiff}. */
- abstract D createDiff(Snapshot snapshot, N currentINode);
-
- /** @return a snapshot copy of the current inode. */
- abstract N createSnapshotCopy(N currentINode);
- }
/** The snapshot will be obtained after this diff is applied. */
Snapshot snapshot;
@@ -105,13 +96,9 @@ abstract class AbstractINodeDiff<N exten
}
/** Save the INode state to the snapshot if it is not done already. */
- void saveSnapshotCopy(N snapshotCopy, Factory<N, D> factory, N currentINode) {
- if (snapshotINode == null) {
- if (snapshotCopy == null) {
- snapshotCopy = factory.createSnapshotCopy(currentINode);
- }
- snapshotINode = snapshotCopy;
- }
+ void saveSnapshotCopy(N snapshotCopy, N currentINode) {
+ Preconditions.checkState(snapshotINode == null, "Expected snapshotINode to be null");
+ snapshotINode = snapshotCopy;
}
/** @return the inode corresponding to the snapshot. */
Modified: hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiffList.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/AbstractINodeDiffList.java?rev=1470759&r1=1470758&r2=1470759&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiffList.java (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/AbstractINodeDiffList.java Tue Apr 23 00:11:51 2013
@@ -37,15 +37,9 @@ import org.apache.hadoop.hdfs.server.nam
abstract class AbstractINodeDiffList<N extends INode,
D extends AbstractINodeDiff<N, D>>
implements Iterable<D> {
- private AbstractINodeDiff.Factory<N, D> factory;
-
/** Diff list sorted by snapshot IDs, i.e. in chronological order. */
private final List<D> diffs = new ArrayList<D>();
- void setFactory(AbstractINodeDiff.Factory<N, D> factory) {
- this.factory = factory;
- }
-
/** @return this list as a unmodifiable {@link List}. */
public final List<D> asList() {
return Collections.unmodifiableList(diffs);
@@ -56,6 +50,12 @@ abstract class AbstractINodeDiffList<N e
diffs.clear();
}
+ /** @return an {@link AbstractINodeDiff}. */
+ abstract D createDiff(Snapshot snapshot, N currentINode);
+
+ /** @return a snapshot copy of the current inode. */
+ abstract N createSnapshotCopy(N currentINode);
+
/**
* Delete a snapshot. The synchronization of the diff list will be done
* outside. If the diff to remove is not the first one in the diff list, we
@@ -109,7 +109,7 @@ abstract class AbstractINodeDiffList<N e
final D addDiff(Snapshot latest, N currentINode)
throws QuotaExceededException {
currentINode.addSpaceConsumed(1, 0, true);
- return addLast(factory.createDiff(latest, currentINode));
+ return addLast(createDiff(latest, currentINode));
}
/** Append the diff at the end of the list. */
@@ -258,8 +258,13 @@ abstract class AbstractINodeDiffList<N e
public void saveSelf2Snapshot(Snapshot latest, N currentINode, N snapshotCopy)
throws QuotaExceededException {
if (latest != null) {
- checkAndAddLatestSnapshotDiff(latest, currentINode).saveSnapshotCopy(
- snapshotCopy, factory, currentINode);
+ D diff = checkAndAddLatestSnapshotDiff(latest, currentINode);
+ if (diff.snapshotINode == null) {
+ if (snapshotCopy == null) {
+ snapshotCopy = createSnapshotCopy(currentINode);
+ }
+ diff.saveSnapshotCopy(snapshotCopy, currentINode);
+ }
}
}
Added: hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.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/FileDiffList.java?rev=1470759&view=auto
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java (added)
+++ hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java Tue Apr 23 00:11:51 2013
@@ -0,0 +1,57 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hdfs.server.namenode.snapshot;
+
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.hdfs.server.namenode.INodeFile;
+import org.apache.hadoop.hdfs.server.namenode.INodeFileUnderConstruction;
+import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.FileDiff;
+
+/**
+ * A list of FileDiffs for storing snapshot data.
+ */
+@InterfaceAudience.Private
+public class FileDiffList
+ extends AbstractINodeDiffList<INodeFile, FileDiff> {
+
+
+ @Override
+ FileDiff createDiff(Snapshot snapshot, INodeFile file) {
+ return new FileDiff(snapshot, file);
+ }
+
+ @Override
+ INodeFile createSnapshotCopy(INodeFile currentINode) {
+ if (currentINode instanceof INodeFileUnderConstructionWithSnapshot) {
+ final INodeFileUnderConstruction uc =
+ (INodeFileUnderConstruction) currentINode;
+
+ final INodeFileUnderConstruction copy = new INodeFileUnderConstruction(
+ uc, uc.getClientName(), uc.getClientMachine(), uc.getClientNode());
+
+ copy.setBlocks(null);
+ return copy;
+ } else {
+ final INodeFile copy = new INodeFile(currentINode);
+ copy.setBlocks(null);
+ return copy;
+ }
+ }
+}
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=1470759&r1=1470758&r2=1470759&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 Tue Apr 23 00:11:51 2013
@@ -116,30 +116,6 @@ public interface FileWithSnapshot {
}
}
- static class FileDiffFactory
- extends AbstractINodeDiff.Factory<INodeFile, FileDiff> {
- static final FileDiffFactory INSTANCE = new FileDiffFactory();
-
- @Override
- FileDiff createDiff(Snapshot snapshot, INodeFile file) {
- return new FileDiff(snapshot, file);
- }
-
- @Override
- INodeFile createSnapshotCopy(INodeFile currentINode) {
- final INodeFile copy = new INodeFile(currentINode);
- copy.setBlocks(null);
- return copy;
- }
- }
-
- /**
- * A list of {@link FileDiff}.
- */
- public static class FileDiffList
- extends AbstractINodeDiffList<INodeFile, FileDiff> {
- }
-
/** @return the {@link INodeFile} view of this object. */
public INodeFile asINodeFile();
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=1470759&r1=1470758&r2=1470759&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 Tue Apr 23 00:11:51 2013
@@ -417,9 +417,9 @@ public class INodeDirectoryWithSnapshot
}
}
- static class DirectoryDiffFactory
- extends AbstractINodeDiff.Factory<INodeDirectory, DirectoryDiff> {
- static final DirectoryDiffFactory INSTANCE = new DirectoryDiffFactory();
+ /** A list of directory diffs. */
+ static class DirectoryDiffList
+ extends AbstractINodeDiffList<INodeDirectory, DirectoryDiff> {
@Override
DirectoryDiff createDiff(Snapshot snapshot, INodeDirectory currentDir) {
@@ -435,15 +435,7 @@ public class INodeDirectoryWithSnapshot
copy.clearChildren();
return copy;
}
- }
- /** A list of directory diffs. */
- static class DirectoryDiffList
- extends AbstractINodeDiffList<INodeDirectory, DirectoryDiff> {
- DirectoryDiffList() {
- setFactory(DirectoryDiffFactory.INSTANCE);
- }
-
/** Replace the given child in the created/deleted list, if there is any. */
private boolean replaceChild(final ListType type, final INode oldChild,
final INode newChild) {
@@ -635,23 +627,6 @@ public class INodeDirectoryWithSnapshot
}
return removed;
}
-
- @Override
- public boolean removeChildAndAllSnapshotCopies(INode child) {
- if (!removeChild(child)) {
- return false;
- }
-
- // remove same child from the created list, if there is any.
- final List<DirectoryDiff> diffList = diffs.asList();
- for(int i = diffList.size() - 1; i >= 0; i--) {
- final ChildrenDiff diff = diffList.get(i).diff;
- if (diff.removeChild(ListType.CREATED, child)) {
- return true;
- }
- }
- return true;
- }
@Override
public void replaceChild(final INode oldChild, final INode newChild) {
Modified: hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeFileUnderConstructionWithSnapshot.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/INodeFileUnderConstructionWithSnapshot.java?rev=1470759&r1=1470758&r2=1470759&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeFileUnderConstructionWithSnapshot.java (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeFileUnderConstructionWithSnapshot.java Tue Apr 23 00:11:51 2013
@@ -29,28 +29,10 @@ import org.apache.hadoop.hdfs.server.nam
/**
* Represent an {@link INodeFileUnderConstruction} that is snapshotted.
- * Note that snapshot files are represented by
- * {@link INodeFileUnderConstructionSnapshot}.
*/
@InterfaceAudience.Private
public class INodeFileUnderConstructionWithSnapshot
extends INodeFileUnderConstruction implements FileWithSnapshot {
- /**
- * Factory for {@link INodeFileUnderConstruction} diff.
- */
- static class FileUcDiffFactory extends FileDiffFactory {
- static final FileUcDiffFactory INSTANCE = new FileUcDiffFactory();
-
- @Override
- INodeFileUnderConstruction createSnapshotCopy(INodeFile file) {
- final INodeFileUnderConstruction uc = (INodeFileUnderConstruction)file;
- final INodeFileUnderConstruction copy = new INodeFileUnderConstruction(
- uc, uc.getClientName(), uc.getClientMachine(), uc.getClientNode());
- copy.setBlocks(null);
- return copy;
- }
- }
-
private final FileDiffList diffs;
private boolean isCurrentFileDeleted = false;
@@ -61,7 +43,6 @@ public class INodeFileUnderConstructionW
final FileDiffList diffs) {
super(f, clientName, clientMachine, clientNode);
this.diffs = diffs != null? diffs: new FileDiffList();
- this.diffs.setFactory(FileUcDiffFactory.INSTANCE);
}
/**
Modified: hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeFileWithSnapshot.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/INodeFileWithSnapshot.java?rev=1470759&r1=1470758&r2=1470759&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeFileWithSnapshot.java (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeFileWithSnapshot.java Tue Apr 23 00:11:51 2013
@@ -28,7 +28,6 @@ import org.apache.hadoop.hdfs.server.nam
/**
* Represent an {@link INodeFile} that is snapshotted.
- * Note that snapshot files are represented by {@link INodeFileSnapshot}.
*/
@InterfaceAudience.Private
public class INodeFileWithSnapshot extends INodeFile
@@ -44,7 +43,6 @@ public class INodeFileWithSnapshot exten
public INodeFileWithSnapshot(INodeFile f, FileDiffList diffs) {
super(f);
this.diffs = diffs != null? diffs: new FileDiffList();
- this.diffs.setFactory(FileDiffFactory.INSTANCE);
}
@Override
Modified: hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/SnapshotFSImageFormat.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/SnapshotFSImageFormat.java?rev=1470759&r1=1470758&r2=1470759&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/SnapshotFSImageFormat.java (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/SnapshotFSImageFormat.java Tue Apr 23 00:11:51 2013
@@ -34,7 +34,7 @@ import org.apache.hadoop.hdfs.server.nam
import org.apache.hadoop.hdfs.server.namenode.INodeFile;
import org.apache.hadoop.hdfs.server.namenode.INodeReference;
import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.FileDiff;
-import org.apache.hadoop.hdfs.server.namenode.snapshot.FileWithSnapshot.FileDiffList;
+import org.apache.hadoop.hdfs.server.namenode.snapshot.FileDiffList;
import org.apache.hadoop.hdfs.server.namenode.snapshot.INodeDirectoryWithSnapshot.DirectoryDiff;
import org.apache.hadoop.hdfs.server.namenode.snapshot.INodeDirectoryWithSnapshot.DirectoryDiffList;
import org.apache.hadoop.hdfs.tools.snapshot.SnapshotDiff;