Rename ClientDependencyInfo -> DependencyInfo

Alluxio · Aug 12, 2015 · 3f52f38 · 3f52f38
1 parent 4197db9
commit 3f52f38
Show file tree

Hide file tree

Showing 30 changed files with 95 additions and 95 deletions.
diff --git a/clients/unshaded/src/main/java/tachyon/client/TachyonFS.java b/clients/unshaded/src/main/java/tachyon/client/TachyonFS.java
@@ -38,7 +38,7 @@
 import tachyon.client.table.RawTable;
 import tachyon.conf.TachyonConf;
 import tachyon.master.MasterClient;
-import tachyon.thrift.ClientDependencyInfo;
+import tachyon.thrift.DependencyInfo;
 import tachyon.thrift.FileInfo;
 import tachyon.thrift.RawTableInfo;
 import tachyon.thrift.ClientWorkerInfo;
@@ -448,13 +448,13 @@ synchronized FileBlockInfo getClientBlockInfo(long blockId) throws IOException {
   }
 
   /**
-   * Get a ClientDependencyInfo by the dependency id
+   * Get a DependencyInfo by the dependency id
    *
    * @param depId the dependency id
-   * @return the ClientDependencyInfo of the specified dependency
+   * @return the DependencyInfo of the specified dependency
    * @throws IOException
    */
-  public synchronized ClientDependencyInfo getClientDependencyInfo(int depId) throws IOException {
+  public synchronized DependencyInfo getClientDependencyInfo(int depId) throws IOException {
     return mMasterClient.getClientDependencyInfo(depId);
   }
 

diff --git a/clients/unshaded/src/main/java/tachyon/hadoop/AbstractTFS.java b/clients/unshaded/src/main/java/tachyon/hadoop/AbstractTFS.java
@@ -41,7 +41,7 @@
 import tachyon.client.UfsUtils;
 import tachyon.client.WriteType;
 import tachyon.conf.TachyonConf;
-import tachyon.thrift.ClientDependencyInfo;
+import tachyon.thrift.DependencyInfo;
 import tachyon.thrift.FileInfo;
 import tachyon.thrift.FileBlockInfo;
 import tachyon.thrift.NetAddress;
@@ -148,7 +148,7 @@ public FSDataOutputStream create(Path cPath, FsPermission permission, boolean ov
       depPath = path.getPath();
       depPath = depPath.substring(depPath.indexOf("part-") + 5);
       int index = Integer.parseInt(depPath);
-      ClientDependencyInfo info = mTFS.getClientDependencyInfo(depId);
+      DependencyInfo info = mTFS.getClientDependencyInfo(depId);
       int fileId = info.getChildren().get(index);
       LOG.info("create(" + cPath + ") : " + depPath + " " + index + " " + info + " " + fileId);
 
@@ -168,7 +168,7 @@ public FSDataOutputStream create(Path cPath, FsPermission permission, boolean ov
       depPath = path.getPath();
       depPath = depPath.substring(depPath.indexOf("part-") + 5);
       int index = Integer.parseInt(depPath);
-      ClientDependencyInfo info = mTFS.getClientDependencyInfo(depId);
+      DependencyInfo info = mTFS.getClientDependencyInfo(depId);
       int fileId = info.getChildren().get(index);
       LOG.info("create(" + cPath + ") : " + depPath + " " + index + " " + info + " " + fileId);
 

diff --git a/common/src/main/java/tachyon/master/MasterClient.java b/common/src/main/java/tachyon/master/MasterClient.java
@@ -48,7 +48,7 @@
 import tachyon.retry.ExponentialBackoffRetry;
 import tachyon.retry.RetryPolicy;
 import tachyon.thrift.BlockInfoException;
-import tachyon.thrift.ClientDependencyInfo;
+import tachyon.thrift.DependencyInfo;
 import tachyon.thrift.FileInfo;
 import tachyon.thrift.RawTableInfo;
 import tachyon.thrift.ClientWorkerInfo;
@@ -228,10 +228,10 @@ public synchronized void connect() throws IOException {
    * Get the client dependency info from master server.
    *
    * @param did Dependency id.
-   * @return ClientDependencyInfo returned from master
+   * @return DependencyInfo returned from master
    * @throws IOException
    */
-  public synchronized ClientDependencyInfo getClientDependencyInfo(int did) throws IOException {
+  public synchronized DependencyInfo getClientDependencyInfo(int did) throws IOException {
     while (!mIsClosed) {
       connect();
 

diff --git a/common/src/main/java/tachyon/thrift/BlockInfoException.java b/common/src/main/java/tachyon/thrift/BlockInfoException.java
diff --git a/common/src/main/java/tachyon/thrift/ClientWorkerInfo.java b/common/src/main/java/tachyon/thrift/ClientWorkerInfo.java
diff --git a/common/src/main/java/tachyon/thrift/Command.java b/common/src/main/java/tachyon/thrift/Command.java
diff --git a/common/src/main/java/tachyon/thrift/DependencyDoesNotExistException.java b/common/src/main/java/tachyon/thrift/DependencyDoesNotExistException.java
diff --git a/.../tachyon/thrift/ClientDependencyInfo.java → ...n/java/tachyon/thrift/DependencyInfo.java b/.../tachyon/thrift/ClientDependencyInfo.java → ...n/java/tachyon/thrift/DependencyInfo.java
diff --git a/common/src/main/java/tachyon/thrift/FailedToCheckpointException.java b/common/src/main/java/tachyon/thrift/FailedToCheckpointException.java
diff --git a/common/src/main/java/tachyon/thrift/FileAlreadyExistException.java b/common/src/main/java/tachyon/thrift/FileAlreadyExistException.java
diff --git a/common/src/main/java/tachyon/thrift/FileBlockInfo.java b/common/src/main/java/tachyon/thrift/FileBlockInfo.java
diff --git a/common/src/main/java/tachyon/thrift/FileDoesNotExistException.java b/common/src/main/java/tachyon/thrift/FileDoesNotExistException.java
diff --git a/common/src/main/java/tachyon/thrift/FileInfo.java b/common/src/main/java/tachyon/thrift/FileInfo.java
diff --git a/common/src/main/java/tachyon/thrift/InvalidPathException.java b/common/src/main/java/tachyon/thrift/InvalidPathException.java