Use filesystem sub-package

Alluxio · Aug 10, 2015 · f261923 · f261923
1 parent df2c62f
commit f261923
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/servers/src/main/java/tachyon/master/next/FileSystemMaster.java b/servers/src/main/java/tachyon/master/next/FileSystemMaster.java
@@ -33,6 +33,12 @@
 import tachyon.master.Dependency;
 import tachyon.master.next.block.BlockId;
 import tachyon.master.next.block.BlockWorkerInfo;
+import tachyon.master.next.filesystem.DependencyMap;
+import tachyon.master.next.filesystem.FileBlockInfo;
+import tachyon.master.next.filesystem.Inode;
+import tachyon.master.next.filesystem.InodeDirectory;
+import tachyon.master.next.filesystem.InodeFile;
+import tachyon.master.next.filesystem.InodeTree;
 import tachyon.thrift.BlockInfoException;
 import tachyon.thrift.ClientBlockInfo;
 import tachyon.thrift.ClientDependencyInfo;

diff --git a/...va/tachyon/master/next/DependencyMap.java → ...master/next/filesystem/DependencyMap.java b/...va/tachyon/master/next/DependencyMap.java → ...master/next/filesystem/DependencyMap.java
@@ -13,7 +13,7 @@
  * the License.
  */
 
-package tachyon.master.next;
+package tachyon.master.next.filesystem;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -29,7 +29,7 @@
 import tachyon.Constants;
 import tachyon.master.Dependency;
 
-class DependencyMap {
+public class DependencyMap {
   private static final Logger LOG = LoggerFactory.getLogger(Constants.LOGGER_TYPE);
 
   private final Map<Integer, Dependency> mDependencyMap;

diff --git a/...va/tachyon/master/next/FileBlockInfo.java → ...master/next/filesystem/FileBlockInfo.java b/...va/tachyon/master/next/FileBlockInfo.java → ...master/next/filesystem/FileBlockInfo.java
@@ -13,7 +13,7 @@
  * the License.
  */
 
-package tachyon.master.next;
+package tachyon.master.next.filesystem;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -63,7 +63,7 @@ public static long computeBlockId(int inodeId, int blockIndex) {
    * @param blockIndex
    * @param length must be smaller than 2^31 (i.e., 2GB)
    */
-  FileBlockInfo(InodeFile inodeFile, int blockIndex, long length) {
+  public FileBlockInfo(InodeFile inodeFile, int blockIndex, long length) {
     Preconditions.checkArgument((length >> 31) == 0, "length must be smaller than 2^31");
     mInodeFile = inodeFile;
     mBlockIndex = blockIndex;

diff --git a/.../main/java/tachyon/master/next/Inode.java → ...tachyon/master/next/filesystem/Inode.java b/.../main/java/tachyon/master/next/Inode.java → ...tachyon/master/next/filesystem/Inode.java
@@ -13,7 +13,7 @@
  * the License.
  */
 
-package tachyon.master.next;
+package tachyon.master.next.filesystem;
 
 import tachyon.thrift.ClientFileInfo;
 

diff --git a/...a/tachyon/master/next/InodeDirectory.java → ...aster/next/filesystem/InodeDirectory.java b/...a/tachyon/master/next/InodeDirectory.java → ...aster/next/filesystem/InodeDirectory.java
@@ -13,10 +13,8 @@
  * the License.
  */
 
-package tachyon.master.next;
+package tachyon.master.next.filesystem;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -26,9 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectWriter;
 import com.google.common.collect.ImmutableSet;
 
 import tachyon.Constants;

diff --git a/...n/java/tachyon/master/next/InodeFile.java → ...yon/master/next/filesystem/InodeFile.java b/...n/java/tachyon/master/next/InodeFile.java → ...yon/master/next/filesystem/InodeFile.java
@@ -13,7 +13,7 @@
  * the License.
  */
 
-package tachyon.master.next;
+package tachyon.master.next.filesystem;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...n/java/tachyon/master/next/InodeTree.java → ...yon/master/next/filesystem/InodeTree.java b/...n/java/tachyon/master/next/InodeTree.java → ...yon/master/next/filesystem/InodeTree.java
@@ -13,7 +13,7 @@
  * the License.
  */
 
-package tachyon.master.next;
+package tachyon.master.next.filesystem;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,7 +38,7 @@
 import tachyon.util.FormatUtils;
 import tachyon.util.io.PathUtils;
 
-class InodeTree {
+public class InodeTree {
   private static final Logger LOG = LoggerFactory.getLogger(Constants.LOGGER_TYPE);
 
   private InodeDirectory mRoot;