GEODE-8337: git mv VersionOrdinal.java->Version.java

ringles · Jul 18, 2020 · 2a3b609 · 2a3b609
1 parent 17d6679
commit 2a3b609
Show file tree

Hide file tree

Showing 67 changed files with 218 additions and 208 deletions.
diff --git a/...e/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java b/...e/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
@@ -354,8 +354,8 @@ public void testOldClientIDDeserialization() throws Exception {
     InternalDistributedMember memberID =
         (InternalDistributedMember) clientCache.getDistributedSystem().getDistributedMember();
     MemberIdentifier gmsID = memberID;
-    memberID.setVersionObjectForTest(KnownVersion.GFE_82);
-    assertThat(memberID.getVersionOrdinalObject()).isEqualTo(KnownVersion.GFE_82);
+    memberID.setVersionForTest(KnownVersion.GFE_82);
+    assertThat(memberID.getVersion()).isEqualTo(KnownVersion.GFE_82);
 
     ClientProxyMembershipID clientID = ClientProxyMembershipID.getClientId(memberID);
     HeapDataOutputStream out = new HeapDataOutputStream(KnownVersion.GFE_82);
@@ -367,14 +367,14 @@ public void testOldClientIDDeserialization() throws Exception {
     ClientProxyMembershipID newID = DataSerializer.readObject(in);
     InternalDistributedMember newMemberID =
         (InternalDistributedMember) newID.getDistributedMember();
-    assertThat(newMemberID.getVersionOrdinalObject()).isEqualTo(KnownVersion.GFE_82);
+    assertThat(newMemberID.getVersion()).isEqualTo(KnownVersion.GFE_82);
     assertThat(newID.getClientVersion()).isEqualTo(KnownVersion.GFE_82);
 
     assertThat(newMemberID.getUuidLeastSignificantBits()).isEqualTo(0);
     assertThat(newMemberID.getUuidMostSignificantBits()).isEqualTo(0);
 
     gmsID.setUUID(new UUID(1234L, 5678L));
-    memberID.setVersionObjectForTest(KnownVersion.CURRENT);
+    memberID.setVersionForTest(KnownVersion.CURRENT);
     clientID = ClientProxyMembershipID.getClientId(memberID);
     out = new HeapDataOutputStream(KnownVersion.CURRENT);
     DataSerializer.writeObject(clientID, out);
@@ -383,7 +383,7 @@ public void testOldClientIDDeserialization() throws Exception {
         KnownVersion.CURRENT);
     newID = DataSerializer.readObject(in);
     newMemberID = (InternalDistributedMember) newID.getDistributedMember();
-    assertThat(newMemberID.getVersionOrdinalObject()).isEqualTo(KnownVersion.CURRENT);
+    assertThat(newMemberID.getVersion()).isEqualTo(KnownVersion.CURRENT);
     assertThat(newID.getClientVersion()).isEqualTo(KnownVersion.CURRENT);
 
     assertThat(newMemberID.getUuidLeastSignificantBits())

diff --git a/...integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java b/...integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
@@ -509,7 +509,7 @@ private CacheClientNotifier createCacheClientNotifier() {
   private InternalDistributedMember createMember() {
     // Create an InternalDistributedMember
     InternalDistributedMember member = mock(InternalDistributedMember.class);
-    when(member.getVersionOrdinalObject()).thenReturn(KnownVersion.CURRENT);
+    when(member.getVersion()).thenReturn(KnownVersion.CURRENT);
     return member;
   }
 

diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
@@ -118,7 +118,7 @@ public static void setVersionForTesting(short ver) {
       overrideClientVersion = ver;
     } else {
       currentClientVersion =
-          Versioning.getKnownVersionOrDefault(Versioning.getVersionOrdinal(ver),
+          Versioning.getKnownVersionOrDefault(Versioning.getVersion(ver),
               KnownVersion.CURRENT);
       overrideClientVersion = -1;
     }
@@ -221,7 +221,7 @@ public ServerQueueStatus handshakeWithServer(Connection conn, ServerLocation loc
         // establish a versioned stream for the other site, if necessary
         if (wanSiteVersion < KnownVersion.CURRENT_ORDINAL) {
           dis = new VersionedDataInputStream(dis, Versioning
-              .getKnownVersionOrDefault(Versioning.getVersionOrdinal(wanSiteVersion),
+              .getKnownVersionOrDefault(Versioning.getVersion(wanSiteVersion),
                   KnownVersion.CURRENT));
         }
       }
@@ -248,7 +248,7 @@ public ServerQueueStatus handshakeWithServer(Connection conn, ServerLocation loc
       // validate that the remote side has a different distributed system id.
       if (communicationMode.isWAN()
           && KnownVersion.GFE_66
-              .compareTo(Versioning.getVersionOrdinal(conn.getWanSiteVersion())) <= 0
+              .compareTo(Versioning.getVersion(conn.getWanSiteVersion())) <= 0
           && currentClientVersion.isNotOlderThan(KnownVersion.GFE_66)) {
         int remoteDistributedSystemId = in.read();
         int localDistributedSystemId =
@@ -263,7 +263,7 @@ public ServerQueueStatus handshakeWithServer(Connection conn, ServerLocation loc
       // Read the PDX registry size from the remote size
       if (communicationMode.isWAN()
           && KnownVersion.GFE_80
-              .compareTo(Versioning.getVersionOrdinal(conn.getWanSiteVersion())) <= 0
+              .compareTo(Versioning.getVersion(conn.getWanSiteVersion())) <= 0
           && currentClientVersion.isNotOlderThan(KnownVersion.GFE_80)) {
         int remotePdxSize = dis.readInt();
         serverQStatus.setPdxSize(remotePdxSize);

diff --git a/...-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java b/...-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
@@ -1543,13 +1543,13 @@ public Set<InternalDistributedMember> getAllOtherMembers() {
   @Override
   public void retainMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
       KnownVersion version) {
-    members.removeIf(id -> id.getVersionOrdinalObject().compareTo(version) < 0);
+    members.removeIf(id -> id.getVersion().compareTo(version) < 0);
   }
 
   @Override
   public void removeMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
       KnownVersion version) {
-    members.removeIf(id -> id.getVersionOrdinalObject().compareTo(version) >= 0);
+    members.removeIf(id -> id.getVersion().compareTo(version) >= 0);
   }
 
   @Override

diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
@@ -189,7 +189,7 @@ public void retainMembersWithSameOrNewerVersion(Collection<InternalDistributedMe
       KnownVersion version) {
     for (Iterator<InternalDistributedMember> it = members.iterator(); it.hasNext();) {
       InternalDistributedMember id = it.next();
-      if (id.getVersionOrdinalObject().compareTo(version) < 0) {
+      if (id.getVersion().compareTo(version) < 0) {
         it.remove();
       }
     }
@@ -200,7 +200,7 @@ public void removeMembersWithSameOrNewerVersion(Collection<InternalDistributedMe
       KnownVersion version) {
     for (Iterator<InternalDistributedMember> it = members.iterator(); it.hasNext();) {
       InternalDistributedMember id = it.next();
-      if (id.getVersionOrdinalObject().compareTo(version) >= 0) {
+      if (id.getVersion().compareTo(version) >= 0) {
         it.remove();
       }
     }

diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
@@ -34,7 +34,7 @@
 import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
 import org.apache.geode.internal.serialization.DSFIDNotFoundException;
-import org.apache.geode.internal.serialization.VersionOrdinal;
+import org.apache.geode.internal.serialization.Version;
 import org.apache.geode.internal.serialization.Versioning;
 import org.apache.geode.internal.util.Breadcrumbs;
 import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch;
@@ -472,7 +472,7 @@ protected synchronized void processException(ReplyException ex) {
    */
   protected synchronized void processException(DistributionMessage msg, DSFIDNotFoundException ex) {
     final short versionOrdinal = ex.getProductVersionOrdinal();
-    final VersionOrdinal anyVersion = Versioning.getVersionOrdinal(versionOrdinal);
+    final Version anyVersion = Versioning.getVersion(versionOrdinal);
     logger.fatal(String.format(
         "Exception received due to missing DSFID %s on remote node %s running version %s.",
         new Object[] {ex.getUnknownDSFID(), msg.getSender(), anyVersion}), ex);

diff --git a/...main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/...main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -49,7 +49,7 @@
 import org.apache.geode.internal.serialization.DeserializationContext;
 import org.apache.geode.internal.serialization.KnownVersion;
 import org.apache.geode.internal.serialization.SerializationContext;
-import org.apache.geode.internal.serialization.VersionOrdinal;
+import org.apache.geode.internal.serialization.Version;
 import org.apache.geode.logging.internal.OSProcess;
 
 /**
@@ -545,13 +545,13 @@ public String getUniqueId() {
     return memberIdentifier.getUniqueId();
   }
 
-  public void setVersionObjectForTest(KnownVersion v) {
-    memberIdentifier.setVersionObjectForTest(v);
+  public void setVersionForTest(KnownVersion v) {
+    memberIdentifier.setVersionForTest(v);
   }
 
   @Override
-  public VersionOrdinal getVersionOrdinalObject() {
-    return memberIdentifier.getVersionOrdinalObject();
+  public Version getVersion() {
+    return memberIdentifier.getVersion();
   }
 
   @Override

diff --git a/...ore/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java b/...ore/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
@@ -297,7 +297,7 @@ protected void process(final ClusterDistributionManager dm) {
       int chunkSize = socketBufferSize - MSG_OVERHEAD;
       HeapDataOutputStream outStream =
           new HeapDataOutputStream(chunkSize, Versioning
-              .getKnownVersionOrDefault(getSender().getVersionOrdinalObject(),
+              .getKnownVersionOrDefault(getSender().getVersion(),
                   KnownVersion.CURRENT));
       boolean sentFinalMessage = false;
       boolean receiverCacheClosed = false;

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
@@ -344,7 +344,7 @@ protected void checkVersionTag(DistributedRegion rgn, VersionTag tag) {
 
         String msg =
             String.format("memberID cannot be null for persistent regions: %s", tag);
-        RuntimeException ex = (sender.getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80))
+        RuntimeException ex = (sender.getVersion().isOlderThan(KnownVersion.GFE_80))
             ? new InternalGemFireException(msg) : new InvalidVersionException(msg);
         throw ex;
       }

diff --git a/...ain/java/org/apache/geode/internal/cache/ExpireDisconnectedClientTransactionsMessage.java b/...ain/java/org/apache/geode/internal/cache/ExpireDisconnectedClientTransactionsMessage.java
@@ -47,7 +47,7 @@ static void send(DistributionManager dm, Set<InternalDistributedMember> recipien
     Set newVersionRecipients = new HashSet();
     for (InternalDistributedMember recipient : recipients) {
       // to geode 1.7.0 and later version servers
-      if (recipient.getVersionOrdinalObject().isNotOlderThan(KnownVersion.GEODE_1_7_0)) {
+      if (recipient.getVersion().isNotOlderThan(KnownVersion.GEODE_1_7_0)) {
         newVersionRecipients.add(recipient);
       }
     }
@@ -78,7 +78,7 @@ protected void process(ClusterDistributionManager dm) {
     InternalDistributedMember sender = getSender();
     if (cache != null) {
       TXManagerImpl mgr = cache.getTXMgr();
-      if (sender.getVersionOrdinalObject().isNotOlderThan(KnownVersion.GEODE_1_7_0)) {
+      if (sender.getVersion().isNotOlderThan(KnownVersion.GEODE_1_7_0)) {
         // schedule to expire disconnected client transaction.
         mgr.expireDisconnectedClientTransactions(this.txIds, false);
       } else {

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -4400,7 +4400,7 @@ private void sendRemoveCacheServerProfileMessage() {
     // the RemoveCacheServerProfileMessage
     otherMembers
         .removeIf(
-            member -> KnownVersion.GEODE_1_5_0.compareTo(member.getVersionOrdinalObject()) > 0);
+            member -> KnownVersion.GEODE_1_5_0.compareTo(member.getVersion()) > 0);
 
     if (!otherMembers.isEmpty()) {
       if (logger.isDebugEnabled()) {

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
@@ -339,14 +339,14 @@ GIIStatus getFromOne(Set recipientSet, boolean targetReinitialized,
       final ClusterDistributionManager dm =
           (ClusterDistributionManager) this.region.getDistributionManager();
       boolean allowDeltaGII = true;
-      if (FORCE_FULL_GII || recipient.getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) {
+      if (FORCE_FULL_GII || recipient.getVersion().isOlderThan(KnownVersion.GFE_80)) {
         allowDeltaGII = false;
       }
       Set keysOfUnfinishedOps = null;
       RegionVersionVector received_rvv = null;
       RegionVersionVector remote_rvv = null;
       if (this.region.getConcurrencyChecksEnabled()
-          && recipient.getVersionOrdinalObject().isNotOlderThan(KnownVersion.GFE_80)) {
+          && recipient.getVersion().isNotOlderThan(KnownVersion.GFE_80)) {
         if (internalBeforeRequestRVV != null
             && internalBeforeRequestRVV.getRegionName().equals(this.region.getName())) {
           internalBeforeRequestRVV.run();
@@ -747,7 +747,7 @@ private void checkForUnrecordedOperations(InternalDistributedMember imageProvide
           Set recipients = this.region.getCacheDistributionAdvisor().adviseReplicates();
           for (Iterator it = recipients.iterator(); it.hasNext();) {
             InternalDistributedMember mbr = (InternalDistributedMember) it.next();
-            if (mbr.getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) {
+            if (mbr.getVersion().isOlderThan(KnownVersion.GFE_80)) {
               it.remove();
             }
           }
@@ -1191,7 +1191,7 @@ void processRegionStateMessage(RegionStateMessage msg) {
         region.recordEventState(msg.getSender(), msg.eventState);
       }
       if (msg.versionVector != null
-          && msg.getSender().getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)
+          && msg.getSender().getVersion().isOlderThan(KnownVersion.GFE_80)
           && region.getConcurrencyChecksEnabled()) {
         // for older version, save received rvv from RegionStateMessage
         logger.debug("Applying version vector to {}: {}", region.getName(), msg.versionVector);
@@ -1600,7 +1600,7 @@ public int getProcessorType() {
     }
 
     public boolean goWithFullGII(DistributedRegion rgn, RegionVersionVector requesterRVV) {
-      if (getSender().getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) {
+      if (getSender().getVersion().isOlderThan(KnownVersion.GFE_80)) {
         // pre-8.0 could not handle a delta-GII
         return true;
       }
@@ -1745,7 +1745,7 @@ protected void process(final ClusterDistributionManager dm) {
             if (eventState != null && eventState.size() > 0) {
               RegionStateMessage.send(dm, getSender(), this.processorId, eventState, true);
             }
-          } else if (getSender().getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) {
+          } else if (getSender().getVersion().isOlderThan(KnownVersion.GFE_80)) {
             // older versions of the product expect a RegionStateMessage at this point
             if (rgn.getConcurrencyChecksEnabled() && this.versionVector == null
                 && !recoveringForLostMember) {
@@ -1995,7 +1995,7 @@ protected boolean chunkEntries(DistributedRegion rgn, int chunkSizeInBytes,
         }
 
         final KnownVersion knownVersion = Versioning
-            .getKnownVersionOrDefault(sender.getVersionOrdinalObject(), KnownVersion.CURRENT);
+            .getKnownVersionOrDefault(sender.getVersion(), KnownVersion.CURRENT);
 
         do {
           flowControl.acquirePermit();

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
@@ -2074,7 +2074,7 @@ private KnownVersion readProductVersionRecord(DataInput dis, File f) throws IOEx
     short ver = VersioningIO.readOrdinal(dis);
     final KnownVersion recoveredGFVersion =
         Versioning.getKnownVersionOrDefault(
-            Versioning.getVersionOrdinal(ver), null);
+            Versioning.getVersion(ver), null);
     if (recoveredGFVersion == null) {
       throw new DiskAccessException(
           String.format("Unknown version ordinal %s found when recovering Oplogs", ver),

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -4830,7 +4830,7 @@ public void fetchRemoteEntries(
         oneBucketKeys.clear();
         oneBucketKeys.put(e.getKey(), e.getValue());
         try {
-          if (entry.getKey().getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) {
+          if (entry.getKey().getVersion().isOlderThan(KnownVersion.GFE_80)) {
             failures.putAll(nodeToBuckets.get(entry.getKey()));
             continue;
           }
@@ -4882,7 +4882,7 @@ public void fetchAllRemoteEntries(
         bucketId.clear();
         bucketId.add(bucket);
         try {
-          if (entry.getKey().getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80)) {
+          if (entry.getKey().getVersion().isOlderThan(KnownVersion.GFE_80)) {
             failures.addAll(nodeToBuckets.get(entry.getKey()));
             continue;
           }

diff --git a/...e-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java b/...e-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java
@@ -186,7 +186,7 @@ protected boolean processData(List objects, InternalDistributedMember sender, in
     // we will have to sort it
     boolean sortNeeded = false;
     List<CompiledSortCriterion> orderByAttribs = null;
-    if (sender.getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_90)) {
+    if (sender.getVersion().isOlderThan(KnownVersion.GFE_90)) {
       CompiledSelect cs = this.query.getSimpleSelect();
       if (cs != null && cs.isOrderBy()) {
         sortNeeded = true;

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
@@ -65,7 +65,7 @@ public static boolean send(InternalCache cache, Set<InternalDistributedMember> r
 
     // filtered recipients
     for (InternalDistributedMember recipient : recipients) {
-      if (KnownVersion.GFE_81.compareTo(recipient.getVersionOrdinalObject()) <= 0) {
+      if (KnownVersion.GFE_81.compareTo(recipient.getVersion()) <= 0) {
         filteredRecipients.add(recipient);
       }
     }

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
@@ -2118,7 +2118,7 @@ public Object updateHAEventWrapper(InternalDistributedMember sender,
     try {
       inputValue = BlobHelper.deserializeBlob(newValueCd.getSerializedValue(),
           Versioning
-              .getKnownVersionOrDefault(sender.getVersionOrdinalObject(), KnownVersion.CURRENT),
+              .getKnownVersionOrDefault(sender.getVersion(), KnownVersion.CURRENT),
           null);
       newValueCd = new VMCachedDeserializable(inputValue, newValueCd.getSizeInBytes());
     } catch (IOException | ClassNotFoundException e) {

diff --git a/...re/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java b/...re/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java
@@ -240,7 +240,7 @@ public static void sendReply(PartitionedRegion pr, final InternalDistributedMemb
 
       HeapDataOutputStream mos = new HeapDataOutputStream(
           InitialImageOperation.CHUNK_SIZE_IN_BYTES + 2048, Versioning
-              .getKnownVersionOrDefault(recipient.getVersionOrdinalObject(), KnownVersion.CURRENT));
+              .getKnownVersionOrDefault(recipient.getVersion(), KnownVersion.CURRENT));
       Iterator<BucketRegion> mapsIterator = maps.iterator();
       BucketRegion map = null;
       Iterator it = null;

diff --git a/...e-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java b/...e-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java
@@ -293,7 +293,7 @@ static boolean chunkMap(InternalDistributedMember receiver, BucketRegion map,
       // always write at least one chunk
       final HeapDataOutputStream mos = new HeapDataOutputStream(
           InitialImageOperation.CHUNK_SIZE_IN_BYTES + 2048, Versioning
-              .getKnownVersionOrDefault(receiver.getVersionOrdinalObject(), KnownVersion.CURRENT));
+              .getKnownVersionOrDefault(receiver.getVersion(), KnownVersion.CURRENT));
       do {
         mos.reset();
 

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java
@@ -372,7 +372,7 @@ static boolean chunkSet(InternalDistributedMember recipient, Set set, int CHUNK_
       // always write at least one chunk
       final HeapDataOutputStream mos = new HeapDataOutputStream(
           InitialImageOperation.CHUNK_SIZE_IN_BYTES + 2048, Versioning
-              .getKnownVersionOrDefault(recipient.getVersionOrdinalObject(), KnownVersion.CURRENT));
+              .getKnownVersionOrDefault(recipient.getVersion(), KnownVersion.CURRENT));
       do {
         mos.reset();
 

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
@@ -357,7 +357,7 @@ public static PartitionResponse send(InternalDistributedMember recipient, Partit
     }
 
     for (InternalDistributedMember rec : recipients) {
-      if (rec.getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_81)) {
+      if (rec.getVersion().isOlderThan(KnownVersion.GFE_81)) {
         throw new UnsupportedOperationException(
             "Indexes should not be created during rolling upgrade");
       }

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
@@ -124,7 +124,7 @@ protected Object getNextReplyObject(PartitionedRegion pr)
     }
     Object data = this.currentResultIterator.next();
     boolean isPostGFE_8_1 =
-        this.getSender().getVersionOrdinalObject().isNewerThan(KnownVersion.GFE_81);
+        this.getSender().getVersion().isNewerThan(KnownVersion.GFE_81);
 
     // There is a bug in older versions of GFE such that the query node expects the structs to have
     // type as ObjectTypes only & not specific types. So the new version needs to send the
@@ -192,7 +192,7 @@ protected boolean operateOnPartitionedRegion(ClusterDistributionManager dm, Part
       }
       isQueryTraced =
           query.isTraced()
-              && this.sender.getVersionOrdinalObject().isNotOlderThan(KnownVersion.GFE_81);
+              && this.sender.getVersion().isNotOlderThan(KnownVersion.GFE_81);
 
       // Adds a query trace info object to the results list for remote queries
       PRQueryTraceInfo queryTraceInfo = null;