Skip to content

Commit 12f393d

Browse files
BillBill
committed
Revert "GEODE-8337: git mv VersionOrdinal.java->Version.java"
This reverts commit 2a3b609
1 parent 78e182e commit 12f393d

67 files changed

Lines changed: 208 additions & 218 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ public void testOldClientIDDeserialization() throws Exception {
354354
InternalDistributedMember memberID =
355355
(InternalDistributedMember) clientCache.getDistributedSystem().getDistributedMember();
356356
MemberIdentifier gmsID = memberID;
357-
memberID.setVersionForTest(KnownVersion.GFE_82);
358-
assertThat(memberID.getVersion()).isEqualTo(KnownVersion.GFE_82);
357+
memberID.setVersionObjectForTest(KnownVersion.GFE_82);
358+
assertThat(memberID.getVersionOrdinalObject()).isEqualTo(KnownVersion.GFE_82);
359359

360360
ClientProxyMembershipID clientID = ClientProxyMembershipID.getClientId(memberID);
361361
HeapDataOutputStream out = new HeapDataOutputStream(KnownVersion.GFE_82);
@@ -367,14 +367,14 @@ public void testOldClientIDDeserialization() throws Exception {
367367
ClientProxyMembershipID newID = DataSerializer.readObject(in);
368368
InternalDistributedMember newMemberID =
369369
(InternalDistributedMember) newID.getDistributedMember();
370-
assertThat(newMemberID.getVersion()).isEqualTo(KnownVersion.GFE_82);
370+
assertThat(newMemberID.getVersionOrdinalObject()).isEqualTo(KnownVersion.GFE_82);
371371
assertThat(newID.getClientVersion()).isEqualTo(KnownVersion.GFE_82);
372372

373373
assertThat(newMemberID.getUuidLeastSignificantBits()).isEqualTo(0);
374374
assertThat(newMemberID.getUuidMostSignificantBits()).isEqualTo(0);
375375

376376
gmsID.setUUID(new UUID(1234L, 5678L));
377-
memberID.setVersionForTest(KnownVersion.CURRENT);
377+
memberID.setVersionObjectForTest(KnownVersion.CURRENT);
378378
clientID = ClientProxyMembershipID.getClientId(memberID);
379379
out = new HeapDataOutputStream(KnownVersion.CURRENT);
380380
DataSerializer.writeObject(clientID, out);
@@ -383,7 +383,7 @@ public void testOldClientIDDeserialization() throws Exception {
383383
KnownVersion.CURRENT);
384384
newID = DataSerializer.readObject(in);
385385
newMemberID = (InternalDistributedMember) newID.getDistributedMember();
386-
assertThat(newMemberID.getVersion()).isEqualTo(KnownVersion.CURRENT);
386+
assertThat(newMemberID.getVersionOrdinalObject()).isEqualTo(KnownVersion.CURRENT);
387387
assertThat(newID.getClientVersion()).isEqualTo(KnownVersion.CURRENT);
388388

389389
assertThat(newMemberID.getUuidLeastSignificantBits())

‎geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ private CacheClientNotifier createCacheClientNotifier() {
509509
private InternalDistributedMember createMember() {
510510
// Create an InternalDistributedMember
511511
InternalDistributedMember member = mock(InternalDistributedMember.class);
512-
when(member.getVersion()).thenReturn(KnownVersion.CURRENT);
512+
when(member.getVersionOrdinalObject()).thenReturn(KnownVersion.CURRENT);
513513
return member;
514514
}
515515

‎geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public static void setVersionForTesting(short ver) {
118118
overrideClientVersion = ver;
119119
} else {
120120
currentClientVersion =
121-
Versioning.getKnownVersionOrDefault(Versioning.getVersion(ver),
121+
Versioning.getKnownVersionOrDefault(Versioning.getVersionOrdinal(ver),
122122
KnownVersion.CURRENT);
123123
overrideClientVersion = -1;
124124
}
@@ -221,7 +221,7 @@ public ServerQueueStatus handshakeWithServer(Connection conn, ServerLocation loc
221221
// establish a versioned stream for the other site, if necessary
222222
if (wanSiteVersion < KnownVersion.CURRENT_ORDINAL) {
223223
dis = new VersionedDataInputStream(dis, Versioning
224-
.getKnownVersionOrDefault(Versioning.getVersion(wanSiteVersion),
224+
.getKnownVersionOrDefault(Versioning.getVersionOrdinal(wanSiteVersion),
225225
KnownVersion.CURRENT));
226226
}
227227
}
@@ -248,7 +248,7 @@ public ServerQueueStatus handshakeWithServer(Connection conn, ServerLocation loc
248248
// validate that the remote side has a different distributed system id.
249249
if (communicationMode.isWAN()
250250
&& KnownVersion.GFE_66
251-
.compareTo(Versioning.getVersion(conn.getWanSiteVersion())) <= 0
251+
.compareTo(Versioning.getVersionOrdinal(conn.getWanSiteVersion())) <= 0
252252
&& currentClientVersion.isNotOlderThan(KnownVersion.GFE_66)) {
253253
int remoteDistributedSystemId = in.read();
254254
int localDistributedSystemId =
@@ -263,7 +263,7 @@ public ServerQueueStatus handshakeWithServer(Connection conn, ServerLocation loc
263263
// Read the PDX registry size from the remote size
264264
if (communicationMode.isWAN()
265265
&& KnownVersion.GFE_80
266-
.compareTo(Versioning.getVersion(conn.getWanSiteVersion())) <= 0
266+
.compareTo(Versioning.getVersionOrdinal(conn.getWanSiteVersion())) <= 0
267267
&& currentClientVersion.isNotOlderThan(KnownVersion.GFE_80)) {
268268
int remotePdxSize = dis.readInt();
269269
serverQStatus.setPdxSize(remotePdxSize);

‎geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,13 +1543,13 @@ public Set<InternalDistributedMember> getAllOtherMembers() {
15431543
@Override
15441544
public void retainMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
15451545
KnownVersion version) {
1546-
members.removeIf(id -> id.getVersion().compareTo(version) < 0);
1546+
members.removeIf(id -> id.getVersionOrdinalObject().compareTo(version) < 0);
15471547
}
15481548

15491549
@Override
15501550
public void removeMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members,
15511551
KnownVersion version) {
1552-
members.removeIf(id -> id.getVersion().compareTo(version) >= 0);
1552+
members.removeIf(id -> id.getVersionOrdinalObject().compareTo(version) >= 0);
15531553
}
15541554

15551555
@Override

‎geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public void retainMembersWithSameOrNewerVersion(Collection<InternalDistributedMe
189189
KnownVersion version) {
190190
for (Iterator<InternalDistributedMember> it = members.iterator(); it.hasNext();) {
191191
InternalDistributedMember id = it.next();
192-
if (id.getVersion().compareTo(version) < 0) {
192+
if (id.getVersionOrdinalObject().compareTo(version) < 0) {
193193
it.remove();
194194
}
195195
}
@@ -200,7 +200,7 @@ public void removeMembersWithSameOrNewerVersion(Collection<InternalDistributedMe
200200
KnownVersion version) {
201201
for (Iterator<InternalDistributedMember> it = members.iterator(); it.hasNext();) {
202202
InternalDistributedMember id = it.next();
203-
if (id.getVersion().compareTo(version) >= 0) {
203+
if (id.getVersionOrdinalObject().compareTo(version) >= 0) {
204204
it.remove();
205205
}
206206
}

‎geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.apache.geode.internal.Assert;
3535
import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
3636
import org.apache.geode.internal.serialization.DSFIDNotFoundException;
37-
import org.apache.geode.internal.serialization.Version;
37+
import org.apache.geode.internal.serialization.VersionOrdinal;
3838
import org.apache.geode.internal.serialization.Versioning;
3939
import org.apache.geode.internal.util.Breadcrumbs;
4040
import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch;
@@ -472,7 +472,7 @@ protected synchronized void processException(ReplyException ex) {
472472
*/
473473
protected synchronized void processException(DistributionMessage msg, DSFIDNotFoundException ex) {
474474
final short versionOrdinal = ex.getProductVersionOrdinal();
475-
final Version anyVersion = Versioning.getVersion(versionOrdinal);
475+
final VersionOrdinal anyVersion = Versioning.getVersionOrdinal(versionOrdinal);
476476
logger.fatal(String.format(
477477
"Exception received due to missing DSFID %s on remote node %s running version %s.",
478478
new Object[] {ex.getUnknownDSFID(), msg.getSender(), anyVersion}), ex);

‎geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import org.apache.geode.internal.serialization.DeserializationContext;
5050
import org.apache.geode.internal.serialization.KnownVersion;
5151
import org.apache.geode.internal.serialization.SerializationContext;
52-
import org.apache.geode.internal.serialization.Version;
52+
import org.apache.geode.internal.serialization.VersionOrdinal;
5353
import org.apache.geode.logging.internal.OSProcess;
5454

5555
/**
@@ -545,13 +545,13 @@ public String getUniqueId() {
545545
return memberIdentifier.getUniqueId();
546546
}
547547

548-
public void setVersionForTest(KnownVersion v) {
549-
memberIdentifier.setVersionForTest(v);
548+
public void setVersionObjectForTest(KnownVersion v) {
549+
memberIdentifier.setVersionObjectForTest(v);
550550
}
551551

552552
@Override
553-
public Version getVersion() {
554-
return memberIdentifier.getVersion();
553+
public VersionOrdinal getVersionOrdinalObject() {
554+
return memberIdentifier.getVersionOrdinalObject();
555555
}
556556

557557
@Override

‎geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ protected void process(final ClusterDistributionManager dm) {
297297
int chunkSize = socketBufferSize - MSG_OVERHEAD;
298298
HeapDataOutputStream outStream =
299299
new HeapDataOutputStream(chunkSize, Versioning
300-
.getKnownVersionOrDefault(getSender().getVersion(),
300+
.getKnownVersionOrDefault(getSender().getVersionOrdinalObject(),
301301
KnownVersion.CURRENT));
302302
boolean sentFinalMessage = false;
303303
boolean receiverCacheClosed = false;

‎geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ protected void checkVersionTag(DistributedRegion rgn, VersionTag tag) {
344344

345345
String msg =
346346
String.format("memberID cannot be null for persistent regions: %s", tag);
347-
RuntimeException ex = (sender.getVersion().isOlderThan(KnownVersion.GFE_80))
347+
RuntimeException ex = (sender.getVersionOrdinalObject().isOlderThan(KnownVersion.GFE_80))
348348
? new InternalGemFireException(msg) : new InvalidVersionException(msg);
349349
throw ex;
350350
}

‎geode-core/src/main/java/org/apache/geode/internal/cache/ExpireDisconnectedClientTransactionsMessage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static void send(DistributionManager dm, Set<InternalDistributedMember> recipien
4747
Set newVersionRecipients = new HashSet();
4848
for (InternalDistributedMember recipient : recipients) {
4949
// to geode 1.7.0 and later version servers
50-
if (recipient.getVersion().isNotOlderThan(KnownVersion.GEODE_1_7_0)) {
50+
if (recipient.getVersionOrdinalObject().isNotOlderThan(KnownVersion.GEODE_1_7_0)) {
5151
newVersionRecipients.add(recipient);
5252
}
5353
}
@@ -78,7 +78,7 @@ protected void process(ClusterDistributionManager dm) {
7878
InternalDistributedMember sender = getSender();
7979
if (cache != null) {
8080
TXManagerImpl mgr = cache.getTXMgr();
81-
if (sender.getVersion().isNotOlderThan(KnownVersion.GEODE_1_7_0)) {
81+
if (sender.getVersionOrdinalObject().isNotOlderThan(KnownVersion.GEODE_1_7_0)) {
8282
// schedule to expire disconnected client transaction.
8383
mgr.expireDisconnectedClientTransactions(this.txIds, false);
8484
} else {

0 commit comments

Comments
 (0)