From 1102ab71d43de3d01946a4d611f4e6b73b4146a0 Mon Sep 17 00:00:00 2001
From: Gene Pang <gene.pang@gmail.com>
Date: Fri, 7 Aug 2015 13:48:22 -0700
Subject: [PATCH] Move block information into block package

---
 servers/src/main/java/tachyon/master/next/BlockMaster.java    | 2 ++
 .../src/main/java/tachyon/master/next/FileSystemMaster.java   | 2 ++
 .../java/tachyon/master/next/{ => block}/UserBlockInfo.java   | 4 ++--
 .../tachyon/master/next/{ => block}/UserBlockLocation.java    | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)
 rename servers/src/main/java/tachyon/master/next/{ => block}/UserBlockInfo.java (89%)
 rename servers/src/main/java/tachyon/master/next/{ => block}/UserBlockLocation.java (90%)

diff --git a/servers/src/main/java/tachyon/master/next/BlockMaster.java b/servers/src/main/java/tachyon/master/next/BlockMaster.java
index fc5b0d9dc8d5..8c03301c876e 100644
--- 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
index e59d045ba633..79735cb83926 100644
--- 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/servers/src/main/java/tachyon/master/next/UserBlockInfo.java b/servers/src/main/java/tachyon/master/next/block/UserBlockInfo.java
similarity index 89%
rename from servers/src/main/java/tachyon/master/next/UserBlockInfo.java
rename to servers/src/main/java/tachyon/master/next/block/UserBlockInfo.java
index 00dca0bc0e34..2c1876caadb8 100644
--- a/servers/src/main/java/tachyon/master/next/UserBlockInfo.java
+++ b/servers/src/main/java/tachyon/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/servers/src/main/java/tachyon/master/next/UserBlockLocation.java b/servers/src/main/java/tachyon/master/next/block/UserBlockLocation.java
similarity index 90%
rename from servers/src/main/java/tachyon/master/next/UserBlockLocation.java
rename to servers/src/main/java/tachyon/master/next/block/UserBlockLocation.java
index e7678cd9f248..9a16b2e41f3d 100644
--- a/servers/src/main/java/tachyon/master/next/UserBlockLocation.java
+++ b/servers/src/main/java/tachyon/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;