Move block information into block package

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

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/servers/src/main/java/tachyon/master/next/BlockMaster.java b/servers/src/main/java/tachyon/master/next/BlockMaster.java
@@ -35,6 +35,8 @@
 import tachyon.master.next.block.BlockLocation;
 import tachyon.master.next.block.BlockWorkerInfo;
 import tachyon.master.next.block.ContainerIdGenerator;
+import tachyon.master.next.block.UserBlockInfo;
+import tachyon.master.next.block.UserBlockLocation;
 import tachyon.thrift.NetAddress;
 import tachyon.util.FormatUtils;
 

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,8 @@
 import tachyon.master.Dependency;
 import tachyon.master.next.block.BlockId;
 import tachyon.master.next.block.BlockWorkerInfo;
+import tachyon.master.next.block.UserBlockInfo;
+import tachyon.master.next.block.UserBlockLocation;
 import tachyon.master.next.filesystem.DependencyMap;
 import tachyon.master.next.filesystem.FileBlockInfo;
 import tachyon.master.next.filesystem.Inode;

diff --git a/...va/tachyon/master/next/UserBlockInfo.java → ...hyon/master/next/block/UserBlockInfo.java b/...va/tachyon/master/next/UserBlockInfo.java → ...hyon/master/next/block/UserBlockInfo.java
@@ -13,7 +13,7 @@
  * the License.
  */
 
-package tachyon.master.next;
+package tachyon.master.next.block;
 
 import java.util.List;
 
@@ -25,7 +25,7 @@ public class UserBlockInfo {
   public long mLength;
   public List<UserBlockLocation> mLocations;
 
-  UserBlockInfo(long blockId, long length, List<UserBlockLocation> locations) {
+  public UserBlockInfo(long blockId, long length, List<UserBlockLocation> locations) {
     mBlockId = blockId;
     mLength = length;
     mLocations = locations;

diff --git a/...achyon/master/next/UserBlockLocation.java → .../master/next/block/UserBlockLocation.java b/...achyon/master/next/UserBlockLocation.java → .../master/next/block/UserBlockLocation.java
@@ -13,7 +13,7 @@
  * the License.
  */
 
-package tachyon.master.next;
+package tachyon.master.next.block;
 
 import tachyon.thrift.NetAddress;
 
@@ -25,7 +25,7 @@ public class UserBlockLocation {
   public NetAddress mAddress;
   public int mTier;
 
-  UserBlockLocation(long workerId, NetAddress address, int tier) {
+  public UserBlockLocation(long workerId, NetAddress address, int tier) {
     mWorkerId = workerId;
     mAddress = address;
     mTier = tier;