From 9e996084c857a9d6853dc14b16d1201996ed2ede Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 07 Aug 2013 11:04:11 +0000
Subject: [PATCH] Rename ServerState.getMaxChangeNumber(int) to ServerState.getChangeNumber(int).
---
opends/src/server/org/opends/server/replication/server/MessageHandler.java | 4 +-
opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 4 +-
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java | 8 ++--
opends/src/server/org/opends/server/replication/common/MultiDomainServerState.java | 2
opends/src/server/org/opends/server/replication/service/ReplicationDomain.java | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java | 4 +-
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java | 10 ++--
opends/src/server/org/opends/server/replication/server/ECLServerHandler.java | 4 +-
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java | 16 ++++----
opends/src/server/org/opends/server/replication/server/DraftCNDbHandler.java | 4 +-
opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 2
opends/src/server/org/opends/server/replication/service/ReplicationBroker.java | 4 +-
opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java | 8 ++--
opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 12 +++---
opends/src/server/org/opends/server/replication/common/ServerState.java | 22 +++++++----
opends/src/server/org/opends/server/replication/server/MonitorData.java | 6 +-
16 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java b/opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java
index 70b55bb..a80cda2 100644
--- a/opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java
+++ b/opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java
@@ -66,10 +66,10 @@
this.lastTime = TimeThread.getTime();
for (int stateId : state)
{
- if (this.lastTime < state.getMaxChangeNumber(stateId).getTime())
- this.lastTime = state.getMaxChangeNumber(stateId).getTime();
+ if (this.lastTime < state.getChangeNumber(stateId).getTime())
+ this.lastTime = state.getChangeNumber(stateId).getTime();
if (stateId == id)
- this.seqnum = state.getMaxChangeNumber(id).getSeqnum();
+ this.seqnum = state.getChangeNumber(id).getSeqnum();
}
this.serverId = id;
@@ -157,7 +157,7 @@
{
for (int localServerId : state)
{
- adjust(state.getMaxChangeNumber(localServerId));
+ adjust(state.getChangeNumber(localServerId));
}
}
}
diff --git a/opends/src/server/org/opends/server/replication/common/MultiDomainServerState.java b/opends/src/server/org/opends/server/replication/common/MultiDomainServerState.java
index 74849da..06877fc 100644
--- a/opends/src/server/org/opends/server/replication/common/MultiDomainServerState.java
+++ b/opends/src/server/org/opends/server/replication/common/MultiDomainServerState.java
@@ -108,7 +108,7 @@
if (oldServerState == null)
oldServerState = new ServerState();
- if (changeNumber.newer(oldServerState.getMaxChangeNumber(serverId)))
+ if (changeNumber.newer(oldServerState.getChangeNumber(serverId)))
{
oldServerState.update(changeNumber);
list.put(baseDN, oldServerState);
diff --git a/opends/src/server/org/opends/server/replication/common/ServerState.java b/opends/src/server/org/opends/server/replication/common/ServerState.java
index a3ef21f..5970c1c 100644
--- a/opends/src/server/org/opends/server/replication/common/ServerState.java
+++ b/opends/src/server/org/opends/server/replication/common/ServerState.java
@@ -214,7 +214,7 @@
clear();
for (Integer serverId : serverState)
{
- ChangeNumber maxChangeNumber = serverState.getMaxChangeNumber(serverId);
+ ChangeNumber maxChangeNumber = serverState.getChangeNumber(serverId);
if (update(maxChangeNumber))
{
result = true;
@@ -329,19 +329,25 @@
}
/**
- * Get the largest ChangeNumber seen for a given LDAP server ID.
+ * Returns the {@code ChangeNumber} contained in this server state which
+ * corresponds to the provided server ID.
*
- * @param serverId2 : the server ID
- * @return the largest ChangeNumber seen
+ * @param serverId
+ * The server ID.
+ * @return The {@code ChangeNumber} contained in this server state which
+ * corresponds to the provided server ID.
*/
- public ChangeNumber getMaxChangeNumber(int serverId2)
+ public ChangeNumber getChangeNumber(int serverId)
{
- return serverIdToChangeNumber.get(serverId2);
+ return serverIdToChangeNumber.get(serverId);
}
/**
- * Get the largest ChangeNumber.
- * @return the largest ChangeNumber
+ * Returns the largest (most recent) {@code ChangeNumber} in this server
+ * state.
+ *
+ * @return The largest (most recent) {@code ChangeNumber} in this server
+ * state.
*/
public ChangeNumber getMaxChangeNumber()
{
diff --git a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index fa66545..c28299a 100644
--- a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -4629,7 +4629,7 @@
* changes.
*/
ChangeNumber replServerMaxChangeNumber =
- replicationServerState.getMaxChangeNumber(serverId);
+ replicationServerState.getChangeNumber(serverId);
// we don't want to update from here (a DS) an empty RS because
// normally the RS should have been updated by other RSes except for
diff --git a/opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index 1eb9573..37d392c 100644
--- a/opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java
+++ b/opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -405,7 +405,7 @@
// maxCn stored in the serverState
synchronized (this)
{
- serverStateMaxCn = state.getMaxChangeNumber(serverId);
+ serverStateMaxCn = state.getChangeNumber(serverId);
if (serverStateMaxCn == null)
return;
@@ -472,6 +472,6 @@
*/
public ChangeNumber getMaxChangeNumber(int serverID)
{
- return state.getMaxChangeNumber(serverID);
+ return state.getChangeNumber(serverID);
}
}
diff --git a/opends/src/server/org/opends/server/replication/server/DraftCNDbHandler.java b/opends/src/server/org/opends/server/replication/server/DraftCNDbHandler.java
index 89548b3..b19b5af 100644
--- a/opends/src/server/org/opends/server/replication/server/DraftCNDbHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/DraftCNDbHandler.java
@@ -406,7 +406,7 @@
// reading
domain.getEligibleState(crossDomainEligibleCN);
- ChangeNumber fcn = startState.getMaxChangeNumber(cn
+ ChangeNumber fcn = startState.getChangeNumber(cn
.getServerId());
int currentKey = cursor.currentKey();
@@ -438,7 +438,7 @@
}
if ((cnVector == null)
- || ((cnVector.getMaxChangeNumber(cn.getServerId()) != null)
+ || ((cnVector.getChangeNumber(cn.getServerId()) != null)
&& !cnVector.cover(startState)))
{
cursor.delete();
diff --git a/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
index ccef4fe..1a30bf9 100644
--- a/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -888,8 +888,8 @@
for (int serverId : rsDomain.getStartState())
{
ChangeNumber dbOldestChange =
- rsDomain.getStartState().getMaxChangeNumber(serverId);
- ChangeNumber providedChange = cookie.getMaxChangeNumber(serverId);
+ rsDomain.getStartState().getChangeNumber(serverId);
+ ChangeNumber providedChange = cookie.getChangeNumber(serverId);
if (providedChange != null
&& providedChange.older(dbOldestChange))
{
diff --git a/opends/src/server/org/opends/server/replication/server/MessageHandler.java b/opends/src/server/org/opends/server/replication/server/MessageHandler.java
index 833f3c9..6813d54 100644
--- a/opends/src/server/org/opends/server/replication/server/MessageHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/MessageHandler.java
@@ -292,7 +292,7 @@
for (int serverId : replicationServerDomain.getServers())
{
ChangeNumber lastCsn = serverState
- .getMaxChangeNumber(serverId);
+ .getChangeNumber(serverId);
ReplicationIterator iterator = replicationServerDomain
.getChangelogIterator(serverId, lastCsn);
if (iterator != null)
@@ -475,7 +475,7 @@
for (int serverId : replicationServerDomain.getServers())
{
// get the last already sent CN from that server
- ChangeNumber lastCsn = serverState.getMaxChangeNumber(serverId);
+ ChangeNumber lastCsn = serverState.getChangeNumber(serverId);
// get an iterator in this server db from that last change
ReplicationIterator iterator =
replicationServerDomain.getChangelogIterator(serverId, lastCsn);
diff --git a/opends/src/server/org/opends/server/replication/server/MonitorData.java b/opends/src/server/org/opends/server/replication/server/MonitorData.java
index 4e8e1eb..aef980e 100644
--- a/opends/src/server/org/opends/server/replication/server/MonitorData.java
+++ b/opends/src/server/org/opends/server/replication/server/MonitorData.java
@@ -162,7 +162,7 @@
if (lsiState != null) {
for (Integer lsjSid : this.maxCNs.keySet()) {
ChangeNumber lsjMaxCN = this.maxCNs.get(lsjSid);
- ChangeNumber lsiLastCN = lsiState.getMaxChangeNumber(lsjSid);
+ ChangeNumber lsiLastCN = lsiState.getChangeNumber(lsjSid);
int missingChangesLsiLsj =
ChangeNumber.diffSeqNum(lsjMaxCN, lsiLastCN);
@@ -210,7 +210,7 @@
{
for (Integer lsjSid : this.maxCNs.keySet()) {
ChangeNumber lsjMaxCN = this.maxCNs.get(lsjSid);
- ChangeNumber lsiLastCN = lsiState.getMaxChangeNumber(lsjSid);
+ ChangeNumber lsiLastCN = lsiState.getChangeNumber(lsjSid);
int missingChangesLsiLsj =
ChangeNumber.diffSeqNum(lsjMaxCN, lsiLastCN);
@@ -279,7 +279,7 @@
public void setMaxCNs(ServerState state)
{
for (Integer sid : state) {
- ChangeNumber newCN = state.getMaxChangeNumber(sid);
+ ChangeNumber newCN = state.getChangeNumber(sid);
setMaxCN(sid, newCN);
}
}
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 78e9169..ced140a 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -2633,7 +2633,7 @@
.duplicate();
// the max CN sent by that LS also comes from the SH
- ChangeNumber maxcn = dsState.getMaxChangeNumber(serverID);
+ ChangeNumber maxcn = dsState.getChangeNumber(serverID);
if (maxcn == null)
{
// This directly connected LS has never produced any change
@@ -2652,7 +2652,7 @@
pendingMonitorData.setRSState(replicationServer.getServerId(),
dbServerState);
for (int sid : dbServerState) {
- ChangeNumber storedCN = dbServerState.getMaxChangeNumber(sid);
+ ChangeNumber storedCN = dbServerState.getChangeNumber(sid);
pendingMonitorData.setMaxCN(sid, storedCN);
}
}
@@ -3080,7 +3080,7 @@
{
for (int sid : dbState) {
DbHandler h = sourceDbHandlers.get(sid);
- ChangeNumber mostRecentDbCN = dbState.getMaxChangeNumber(sid);
+ ChangeNumber mostRecentDbCN = dbState.getChangeNumber(sid);
try {
// Is the most recent change in the Db newer than eligible CN ?
// if yes (like cn15 in the example above, then we have to go back
@@ -3158,7 +3158,7 @@
// Should it be considered for eligibility ?
ChangeNumber heartbeatLastDN =
- getChangeTimeHeartbeatState().getMaxChangeNumber(sid);
+ getChangeTimeHeartbeatState().getChangeNumber(sid);
// If the most recent UpdateMsg or CLHeartbeatMsg received is very old
// then the domain is considered down and not considered for eligibility
@@ -3324,8 +3324,8 @@
for (int sid : dbState) {
// process one sid
ChangeNumber startCN = null;
- if (startState.getMaxChangeNumber(sid) != null)
- startCN = startState.getMaxChangeNumber(sid);
+ if (startState.getChangeNumber(sid) != null)
+ startCN = startState.getChangeNumber(sid);
long sidRes = getCount(sid, startCN, endCN);
// The startPoint is excluded when counting the ECL eligible changes
diff --git a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
index caee929..cd695a2 100644
--- a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -1740,7 +1740,7 @@
// Extract the change number of the latest change generated by the local
// server
- ChangeNumber myChangeNumber = localState.getMaxChangeNumber(localServerId);
+ ChangeNumber myChangeNumber = localState.getChangeNumber(localServerId);
if (myChangeNumber == null)
{
myChangeNumber = new ChangeNumber(0, 0, localServerId);
@@ -1758,7 +1758,7 @@
{
ReplicationServerInfo replicationServerInfo = bestServers.get(rsId);
ServerState rsState = replicationServerInfo.getServerState();
- ChangeNumber rsChangeNumber = rsState.getMaxChangeNumber(localServerId);
+ ChangeNumber rsChangeNumber = rsState.getChangeNumber(localServerId);
if (rsChangeNumber == null)
{
rsChangeNumber = new ChangeNumber(0, 0, localServerId);
diff --git a/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
index 79b67d2..0b2cdf1 100644
--- a/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
@@ -3683,6 +3683,6 @@
*/
public ChangeNumber getLastLocalChange()
{
- return state.getMaxChangeNumber(serverID);
+ return state.getChangeNumber(serverID);
}
}
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
index 38387a1..79d6af2 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
@@ -1201,15 +1201,15 @@
ReplicationServerDomain rsd =
replicationServer.getReplicationServerDomain(TEST_ROOT_DN_STRING, false);
ServerState startState = rsd.getStartState();
- assertTrue(startState.getMaxChangeNumber(s1test.getServerId()).getSeqnum()==1);
- assertTrue(startState.getMaxChangeNumber(s2test.getServerId()) != null);
- assertTrue(startState.getMaxChangeNumber(s2test.getServerId()).getSeqnum()==7);
+ assertTrue(startState.getChangeNumber(s1test.getServerId()).getSeqnum()==1);
+ assertTrue(startState.getChangeNumber(s2test.getServerId()) != null);
+ assertTrue(startState.getChangeNumber(s2test.getServerId()).getSeqnum()==7);
rsd =
replicationServer.getReplicationServerDomain(TEST_ROOT_DN_STRING2, false);
startState = rsd.getStartState();
- assertTrue(startState.getMaxChangeNumber(s2test2.getServerId()).getSeqnum()==2);
- assertTrue(startState.getMaxChangeNumber(s1test2.getServerId()).getSeqnum()==6);
+ assertTrue(startState.getChangeNumber(s2test2.getServerId()).getSeqnum()==2);
+ assertTrue(startState.getChangeNumber(s1test2.getServerId()).getSeqnum()==6);
//
// Test lastExternalChangelogCookie attribute of the ECL
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java
index 506ef1a..ad5534c 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java
@@ -88,8 +88,8 @@
// TODO Check the value
// Check getMaxChangeNumber
- assertEquals(cn2.compareTo(serverState.getMaxChangeNumber(cn2.getServerId())),0);
- assertEquals(cn3.compareTo(serverState.getMaxChangeNumber(cn3.getServerId())),0);
+ assertEquals(cn2.compareTo(serverState.getChangeNumber(cn2.getServerId())),0);
+ assertEquals(cn3.compareTo(serverState.getChangeNumber(cn3.getServerId())),0);
// Check the toString
String stringRep = serverState.toString();
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
index 35a9e88..aa340da 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
@@ -154,8 +154,8 @@
assertEquals(msg.getServerURL(), newMsg.getServerURL());
assertEquals(msg.getBaseDn(), newMsg.getBaseDn());
assertEquals(msg.getWindowSize(), newMsg.getWindowSize());
- assertEquals(msg.getServerState().getMaxChangeNumber(1),
- newMsg.getServerState().getMaxChangeNumber(1));
+ assertEquals(msg.getServerState().getChangeNumber(1),
+ newMsg.getServerState().getChangeNumber(1));
assertEquals(msg.getSSLEncryption(), newMsg.getSSLEncryption());
// Check default value for only post V1 fields
@@ -178,8 +178,8 @@
assertEquals(msg.getServerURL(), vlastMsg.getServerURL());
assertEquals(msg.getBaseDn(), vlastMsg.getBaseDn());
assertEquals(msg.getWindowSize(), vlastMsg.getWindowSize());
- assertEquals(msg.getServerState().getMaxChangeNumber(1),
- vlastMsg.getServerState().getMaxChangeNumber(1));
+ assertEquals(msg.getServerState().getChangeNumber(1),
+ vlastMsg.getServerState().getChangeNumber(1));
assertEquals(msg.getSSLEncryption(), vlastMsg.getSSLEncryption());
assertEquals(msg.getGroupId(), vlastMsg.getGroupId());
assertEquals(msg.getDegradedStatusThreshold(), vlastMsg.getDegradedStatusThreshold());
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
index 12ca37e..7d2ec3c 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
@@ -815,8 +815,8 @@
assertEquals(msg.getWindowSize(), newMsg.getWindowSize());
assertEquals(msg.getHeartbeatInterval(), newMsg.getHeartbeatInterval());
assertEquals(msg.getSSLEncryption(), newMsg.getSSLEncryption());
- assertEquals(msg.getServerState().getMaxChangeNumber(1),
- newMsg.getServerState().getMaxChangeNumber(1));
+ assertEquals(msg.getServerState().getChangeNumber(1),
+ newMsg.getServerState().getChangeNumber(1));
assertEquals(newMsg.getVersion(), getCurrentVersion());
assertEquals(msg.getGenerationId(), newMsg.getGenerationId());
assertTrue(msg.getGroupId() == newMsg.getGroupId());
@@ -857,8 +857,8 @@
assertEquals(msg.getServerURL(), newMsg.getServerURL());
assertEquals(msg.getBaseDn(), newMsg.getBaseDn());
assertEquals(msg.getWindowSize(), newMsg.getWindowSize());
- assertEquals(msg.getServerState().getMaxChangeNumber(1),
- newMsg.getServerState().getMaxChangeNumber(1));
+ assertEquals(msg.getServerState().getChangeNumber(1),
+ newMsg.getServerState().getChangeNumber(1));
assertEquals(newMsg.getVersion(), getCurrentVersion());
assertEquals(msg.getGenerationId(), newMsg.getGenerationId());
assertEquals(msg.getSSLEncryption(), newMsg.getSSLEncryption());
@@ -903,8 +903,8 @@
assertEquals(msg.getServerURL(), newMsg.getServerURL());
assertEquals(msg.getBaseDn(), newMsg.getBaseDn());
assertEquals(msg.getWindowSize(), newMsg.getWindowSize());
- assertEquals(msg.getServerState().getMaxChangeNumber(1),
- newMsg.getServerState().getMaxChangeNumber(1));
+ assertEquals(msg.getServerState().getChangeNumber(1),
+ newMsg.getServerState().getChangeNumber(1));
assertEquals(newMsg.getVersion(), getCurrentVersion());
assertEquals(msg.getGenerationId(), newMsg.getGenerationId());
assertEquals(msg.getSSLEncryption(), newMsg.getSSLEncryption());
@@ -1402,8 +1402,8 @@
assertEquals(msg.getWindowSize(), newMsg.getWindowSize());
assertEquals(msg.getHeartbeatInterval(), newMsg.getHeartbeatInterval());
assertEquals(msg.getSSLEncryption(), newMsg.getSSLEncryption());
- assertEquals(msg.getServerState().getMaxChangeNumber(1),
- newMsg.getServerState().getMaxChangeNumber(1));
+ assertEquals(msg.getServerState().getChangeNumber(1),
+ newMsg.getServerState().getChangeNumber(1));
assertEquals(newMsg.getVersion(), getCurrentVersion());
assertEquals(msg.getGenerationId(), newMsg.getGenerationId());
assertTrue(msg.getGroupId() == newMsg.getGroupId());
--
Gitblit v1.10.0