From 042cb4492e64fed84141f94b0c969234465fc74d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 14 Aug 2013 11:14:13 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMsg.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMsg.java
index 1b59b70..be77330 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMsg.java
@@ -32,6 +32,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.zip.DataFormatException;
import org.opends.server.protocols.asn1.ASN1;
@@ -60,7 +61,7 @@
static class ServerData
{
private ServerState state;
- private Long approxFirstMissingDate;
+ private long approxFirstMissingDate;
}
/**
@@ -128,7 +129,7 @@
* @param isLDAP Specifies whether the server is a LS or a RS
*/
public void setServerState(int serverId, ServerState state,
- Long approxFirstMissingDate, boolean isLDAP)
+ long approxFirstMissingDate, boolean isLDAP)
{
ServerData sd = new ServerData();
sd.state = state;
@@ -166,7 +167,7 @@
* @param serverId The provided serverId.
* @return The approximated state.
*/
- public Long getLDAPApproxFirstMissingDate(int serverId)
+ public long getLDAPApproxFirstMissingDate(int serverId)
{
return data.ldapStates.get(serverId).approxFirstMissingDate;
}
@@ -177,7 +178,7 @@
* @param serverId The provided serverId.
* @return The approximated state.
*/
- public Long getRSApproxFirstMissingDate(int serverId)
+ public long getRSApproxFirstMissingDate(int serverId)
{
return data.rsStates.get(serverId).approxFirstMissingDate;
}
@@ -261,7 +262,7 @@
{
ServerState newState = new ServerState();
int serverId = 0;
- Long outime = (long)0;
+ long outime = 0;
boolean isLDAPServer = false;
asn1Reader.readStartSequence();
@@ -402,8 +403,9 @@
private void writeServerStates(short protocolVersion, ASN1Writer writer,
boolean writeRSStates) throws IOException
{
- Map<Integer, ServerData> servers = writeRSStates ? data.rsStates
- : data.ldapStates;
+ final Map<Integer, ServerData> servers =
+ writeRSStates ? data.rsStates : data.ldapStates;
+ final int seqNum = writeRSStates ? 0 : 1;
for (Map.Entry<Integer, ServerData> server : servers.entrySet())
{
writer.writeStartSequence();
@@ -414,7 +416,7 @@
* RS (0).
*/
ChangeNumber cn = new ChangeNumber(
- server.getValue().approxFirstMissingDate, writeRSStates ? 0 : 1,
+ server.getValue().approxFirstMissingDate, seqNum,
server.getKey());
if (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V7)
{
@@ -465,24 +467,26 @@
@Override
public String toString()
{
- String stateS = "\nRState:[";
- stateS += data.replServerDbState.toString();
- stateS += "]";
+ StringBuilder stateS = new StringBuilder("\nRState:[");
+ stateS.append(data.replServerDbState);
+ stateS.append("]");
- stateS += "\nLDAPStates:[";
- for (Integer sid : data.ldapStates.keySet())
+ stateS.append("\nLDAPStates:[");
+ for (Entry<Integer, ServerData> entry : data.ldapStates.entrySet())
{
- ServerData sd = data.ldapStates.get(sid);
- stateS += "\n[LSstate("+ sid + ")=" + sd.state + "]" +
- " afmd=" + sd.approxFirstMissingDate + "]";
+ ServerData sd = entry.getValue();
+ stateS.append("\n[LSstate(").append(entry.getKey()).append(")=")
+ .append(sd.state).append("]").append(" afmd=")
+ .append(sd.approxFirstMissingDate).append("]");
}
- stateS += "\nRSStates:[";
- for (Integer sid : data.rsStates.keySet())
+ stateS.append("\nRSStates:[");
+ for (Entry<Integer, ServerData> entry : data.rsStates.entrySet())
{
- ServerData sd = data.rsStates.get(sid);
- stateS += "\n[RSState("+ sid + ")=" + sd.state + "]" +
- " afmd=" + sd.approxFirstMissingDate + "]";
+ ServerData sd = entry.getValue();
+ stateS.append("\n[RSState(").append(entry.getKey()).append(")=")
+ .append(sd.state).append("]").append(" afmd=")
+ .append(sd.approxFirstMissingDate + "]");
}
return getClass().getCanonicalName() +
"[ sender=" + this.senderID +
--
Gitblit v1.10.0