Author: szetszwo
Date: Wed Nov 5 10:42:28 2008
New Revision: 711654
URL: http://svn.apache.org/viewvc?rev=711654&view=rev
Log:
HADOOP-4572. Change INode and its sub-classes to package private. (szetszwo)
Added:
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
(contents, props changed)
- copied, changed from r711649,
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/FileNameGenerator.java
(contents, props changed)
- copied, changed from r711649,
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/FileNameGenerator.java
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
(contents, props changed)
- copied, changed from r711649,
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/NNThroughputBenchmark.java
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNThroughputBenchmark.java
(contents, props changed)
- copied, changed from r711649,
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestNNThroughputBenchmark.java
Removed:
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/FileNameGenerator.java
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/NNThroughputBenchmark.java
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestNNThroughputBenchmark.java
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INode.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=711654&r1=711653&r2=711654&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Nov 5 10:42:28 2008
@@ -58,6 +58,8 @@
HADOOP-4437. Use Halton sequence instead of java.util.Random in
PiEstimator.
(szetszwo)
+ HADOOP-4572. Change INode and its sub-classes to package private.
(szetszwo)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INode.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INode.java?rev=711654&r1=711653&r2=711654&view=diff
==============================================================================
---
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INode.java
(original)
+++
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INode.java
Wed Nov 5 10:42:28 2008
@@ -33,7 +33,7 @@
* This is a base INode class containing common fields for file and
* directory inodes.
*/
-public abstract class INode implements Comparable<byte[]> {
+abstract class INode implements Comparable<byte[]> {
protected byte[] name;
protected INodeDirectory parent;
protected long modificationTime;
Modified:
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java?rev=711654&r1=711653&r2=711654&view=diff
==============================================================================
---
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
(original)
+++
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
Wed Nov 5 10:42:28 2008
@@ -30,7 +30,7 @@
/**
* Directory INode class.
*/
-public class INodeDirectory extends INode {
+class INodeDirectory extends INode {
protected static final int DEFAULT_FILES_PER_DIRECTORY = 5;
final static String ROOT_NAME = "";
Modified:
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFile.java?rev=711654&r1=711653&r2=711654&view=diff
==============================================================================
---
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
(original)
+++
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
Wed Nov 5 10:42:28 2008
@@ -26,7 +26,7 @@
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
-public class INodeFile extends INode {
+class INodeFile extends INode {
static final FsPermission UMASK = FsPermission.createImmutable((short)0111);
protected BlockInfo blocks[] = null;
Modified:
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java?rev=711654&r1=711653&r2=711654&view=diff
==============================================================================
---
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java
(original)
+++
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java
Wed Nov 5 10:42:28 2008
@@ -24,7 +24,7 @@
import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
-public class INodeFileUnderConstruction extends INodeFile {
+class INodeFileUnderConstruction extends INodeFile {
final String clientName; // lease holder
private final String clientMachine;
private final DatanodeDescriptor clientNode; // if client is a cluster node
too.
Copied:
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
(from r711649,
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java)
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java&r1=711649&r2=711654&rev=711654&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/CreateEditsLog.java
(original)
+++
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
Wed Nov 5 10:42:28 2008
@@ -15,22 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.hdfs;
+package org.apache.hadoop.hdfs.server.namenode;
import java.io.File;
import java.io.IOException;
-
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.fs.permission.PermissionStatus;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.server.common.GenerationStamp;
import org.apache.hadoop.hdfs.server.common.Storage;
-import org.apache.hadoop.hdfs.server.namenode.FSEditLog;
-import org.apache.hadoop.hdfs.server.namenode.FSImage;
-import org.apache.hadoop.hdfs.server.namenode.INodeDirectory;
-import org.apache.hadoop.hdfs.server.namenode.INodeFileUnderConstruction;
import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
-import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.fs.permission.PermissionStatus;
/**
*
Propchange:
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/FileNameGenerator.java
(from r711649,
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/FileNameGenerator.java)
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/FileNameGenerator.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/FileNameGenerator.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/FileNameGenerator.java&r1=711649&r2=711654&rev=711654&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/FileNameGenerator.java
(original)
+++
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/FileNameGenerator.java
Wed Nov 5 10:42:28 2008
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.hdfs;
+package org.apache.hadoop.hdfs.server.namenode;
import java.util.Arrays;
Propchange:
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/FileNameGenerator.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
(from r711649,
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/NNThroughputBenchmark.java)
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/NNThroughputBenchmark.java&r1=711649&r2=711654&rev=711654&view=diff
==============================================================================
---
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/NNThroughputBenchmark.java
(original)
+++
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
Wed Nov 5 10:42:28 2008
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.hdfs;
+package org.apache.hadoop.hdfs.server.namenode;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.ArrayList;
import javax.security.auth.login.LoginException;
@@ -38,9 +38,6 @@
import org.apache.hadoop.hdfs.protocol.LocatedBlock;
import org.apache.hadoop.hdfs.server.datanode.DataNode;
import org.apache.hadoop.hdfs.server.datanode.DataStorage;
-import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
-import org.apache.hadoop.hdfs.server.namenode.NameNode;
-import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
import org.apache.hadoop.hdfs.server.protocol.BlockCommand;
import org.apache.hadoop.hdfs.server.protocol.DatanodeCommand;
import org.apache.hadoop.hdfs.server.protocol.DatanodeProtocol;
@@ -48,8 +45,9 @@
import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
import org.apache.hadoop.net.DNS;
import org.apache.hadoop.net.NetworkTopology;
+import org.apache.hadoop.security.UnixUserGroupInformation;
+import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.StringUtils;
-import org.apache.hadoop.security.*;
import org.apache.log4j.Level;
/**
Propchange:
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNThroughputBenchmark.java
(from r711649,
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestNNThroughputBenchmark.java)
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNThroughputBenchmark.java?p2=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNThroughputBenchmark.java&p1=hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestNNThroughputBenchmark.java&r1=711649&r2=711654&rev=711654&view=diff
==============================================================================
---
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestNNThroughputBenchmark.java
(original)
+++
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNThroughputBenchmark.java
Wed Nov 5 10:42:28 2008
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.hdfs;
+package org.apache.hadoop.hdfs.server.namenode;
import java.util.Arrays;
import junit.framework.TestCase;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.hdfs.server.namenode.NameNode;
public class TestNNThroughputBenchmark extends TestCase {
Propchange:
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/server/namenode/TestNNThroughputBenchmark.java
------------------------------------------------------------------------------
svn:mergeinfo =
