Renaming version() to getServiceVersion().

Alluxio · Nov 13, 2015 · a3e1527 · a3e1527
1 parent d451180
commit a3e1527
Show file tree

Hide file tree

Showing 17 changed files with 399 additions and 398 deletions.
diff --git a/clients/unshaded/src/main/java/tachyon/client/BlockMasterClient.java b/clients/unshaded/src/main/java/tachyon/client/BlockMasterClient.java
@@ -59,15 +59,15 @@ protected String getServiceName() {
   @Override
   protected void afterConnect() {
     mClient = new BlockMasterService.Client(mProtocol);
-    if (mServerVersion == Constants.UNKNOWN_SERVICE_VERSION) {
+    if (mServiceVersion == Constants.UNKNOWN_SERVICE_VERSION) {
       try {
-        mServerVersion = mClient.version();
+        mServiceVersion = mClient.getServiceVersion();
       } catch (TException e) {
         throw new RuntimeException(e.getMessage());
       }
-      if (!mCompatibleVersions.contains(mServerVersion)) {
+      if (!mCompatibleVersions.contains(mServiceVersion)) {
         throw new RuntimeException(ExceptionMessage.INCOMPATIBLE_VERSION.getMessage(
-            Constants.BLOCK_MASTER_SERVICE_VERSION, mServerVersion));
+            Constants.BLOCK_MASTER_SERVICE_VERSION, mServiceVersion));
       }
     }
   }

diff --git a/clients/unshaded/src/main/java/tachyon/client/FileSystemMasterClient.java b/clients/unshaded/src/main/java/tachyon/client/FileSystemMasterClient.java
@@ -63,15 +63,15 @@ protected String getServiceName() {
   @Override
   protected void afterConnect() {
     mClient = new FileSystemMasterService.Client(mProtocol);
-    if (mServerVersion == Constants.UNKNOWN_SERVICE_VERSION) {
+    if (mServiceVersion == Constants.UNKNOWN_SERVICE_VERSION) {
       try {
-        mServerVersion = mClient.version();
+        mServiceVersion = mClient.getServiceVersion();
       } catch (TException e) {
         throw new RuntimeException(e.getMessage());
       }
-      if (!mCompatibleVersions.contains(mServerVersion)) {
+      if (!mCompatibleVersions.contains(mServiceVersion)) {
         throw new RuntimeException(ExceptionMessage.INCOMPATIBLE_VERSION.getMessage(
-            Constants.FILE_SYSTEM_MASTER_SERVICE_VERSION, mServerVersion));
+            Constants.FILE_SYSTEM_MASTER_SERVICE_VERSION, mServiceVersion));
       }
     }
   }

diff --git a/clients/unshaded/src/main/java/tachyon/client/RawTableMasterClient.java b/clients/unshaded/src/main/java/tachyon/client/RawTableMasterClient.java
@@ -59,15 +59,15 @@ protected String getServiceName() {
   @Override
   protected void afterConnect() {
     mClient = new RawTableMasterService.Client(mProtocol);
-    if (mServerVersion == Constants.UNKNOWN_SERVICE_VERSION) {
+    if (mServiceVersion == Constants.UNKNOWN_SERVICE_VERSION) {
       try {
-        mServerVersion = mClient.version();
+        mServiceVersion = mClient.getServiceVersion();
       } catch (TException e) {
         throw new RuntimeException(e.getMessage());
       }
-      if (!mCompatibleVersions.contains(mServerVersion)) {
+      if (!mCompatibleVersions.contains(mServiceVersion)) {
         throw new RuntimeException(ExceptionMessage.INCOMPATIBLE_VERSION.getMessage(
-            Constants.RAW_TABLE_MASTER_SERVICE_VERSION, mServerVersion));
+            Constants.RAW_TABLE_MASTER_SERVICE_VERSION, mServiceVersion));
       }
     }
   }

diff --git a/clients/unshaded/src/main/java/tachyon/client/lineage/LineageMasterClient.java b/clients/unshaded/src/main/java/tachyon/client/lineage/LineageMasterClient.java
@@ -59,15 +59,15 @@ protected String getServiceName() {
   @Override
   protected void afterConnect() {
     mClient = new LineageMasterService.Client(mProtocol);
-    if (mServerVersion == Constants.UNKNOWN_SERVICE_VERSION) {
+    if (mServiceVersion == Constants.UNKNOWN_SERVICE_VERSION) {
       try {
-        mServerVersion = mClient.version();
+        mServiceVersion = mClient.getServiceVersion();
       } catch (TException e) {
         throw new RuntimeException(e.getMessage());
       }
-      if (!mCompatibleVersions.contains(mServerVersion)) {
+      if (!mCompatibleVersions.contains(mServiceVersion)) {
         throw new RuntimeException(ExceptionMessage.INCOMPATIBLE_VERSION.getMessage(
-            Constants.LINEAGE_MASTER_SERVICE_VERSION, mServerVersion));
+            Constants.LINEAGE_MASTER_SERVICE_VERSION, mServiceVersion));
       }
     }
   }

diff --git a/common/src/main/java/tachyon/MasterClientBase.java b/common/src/main/java/tachyon/MasterClientBase.java
@@ -37,7 +37,7 @@ public abstract class MasterClientBase extends ClientBase {
 
   protected final boolean mUseZookeeper;
   protected Set<Long> mCompatibleVersions;
-  protected long mServerVersion;
+  protected long mServiceVersion;
 
   /**
    * Creates a new master client base.
@@ -49,7 +49,7 @@ public MasterClientBase(InetSocketAddress masterAddress, TachyonConf tachyonConf
     super(masterAddress, tachyonConf, "master");
     mUseZookeeper = mTachyonConf.getBoolean(Constants.ZOOKEEPER_ENABLED);
     mCompatibleVersions = new HashSet<Long>();
-    mServerVersion = Constants.UNKNOWN_SERVICE_VERSION;
+    mServiceVersion = Constants.UNKNOWN_SERVICE_VERSION;
   }
 
   /**