From 157717b205d4c1f957cf810e04e06f11530c619c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 02 Sep 2013 08:57:43 +0000
Subject: [PATCH] Renamed: - ChangeNumber to CSN - ChangeNumberGenerator to CSNGenerator - ChangeNumberTest to CSNTest - ChangeNumberGeneratorTest to CSNGeneratorTest
---
opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandler.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandler.java b/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandler.java
index ff91e18..caf232f 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandler.java
@@ -39,7 +39,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.CSN;
import org.opends.server.replication.common.MultiDomainServerState;
import org.opends.server.replication.common.ServerState;
import org.opends.server.replication.server.ReplicationServer;
@@ -62,8 +62,8 @@
* server in the topology.
* It is responsible for efficiently saving the updates that is received from
* each master server into stable storage.
- * This class is also able to generate a ChangelogDBIterator that can be
- * used to read all changes from a given ChangeNumber.
+ * This class is also able to generate a {@link ChangelogDBIterator} that can be
+ * used to read all changes from a given draft ChangeNumber.
* <p>
* This class publishes some monitoring information below <code>
* cn=monitor</code>.
@@ -140,9 +140,9 @@
/** {@inheritDoc} */
@Override
public synchronized void add(int draftCN, String value, String baseDN,
- ChangeNumber cn)
+ CSN csn)
{
- db.addEntry(draftCN, value, baseDN, cn);
+ db.addEntry(draftCN, value, baseDN, csn);
if (debugEnabled())
TRACER.debugInfo(
@@ -150,7 +150,7 @@
+ " key=" + draftCN
+ " value=" + value
+ " baseDN=" + baseDN
- + " cn=" + cn);
+ + " csn=" + csn);
}
/** {@inheritDoc} */
@@ -331,8 +331,8 @@
return;
}
- // From the draftCNDb change record, get the domain and changeNumber
- final ChangeNumber cn = cursor.currentChangeNumber();
+ // From the draftCNDb change record, get the domain and CSN
+ final CSN csn = cursor.currentCSN();
final String baseDN = cursor.currentBaseDN();
if (baseDNToClear != null && baseDNToClear.equalsIgnoreCase(baseDN))
{
@@ -352,27 +352,27 @@
}
final ServerState startState = domain.getStartState();
- final ChangeNumber fcn = startState.getChangeNumber(cn.getServerId());
+ final CSN fcsn = startState.getCSN(csn.getServerId());
final int currentDraftCN = cursor.currentKey();
- if (cn.older(fcn))
+ if (csn.older(fcsn))
{
cursor.delete();
continue;
}
- ServerState cnVector;
+ ServerState csnVector;
try
{
- Map<String,ServerState> cnStartStates =
+ Map<String, ServerState> csnStartStates =
MultiDomainServerState.splitGenStateToServerStates(
cursor.currentValue());
- cnVector = cnStartStates.get(baseDN);
+ csnVector = csnStartStates.get(baseDN);
if (debugEnabled())
- TRACER.debugInfo("DraftCNDBHandler:clear() - ChangeVector:" +
- cnVector + " -- StartState:" + startState);
+ TRACER.debugInfo("DraftCNDBHandler:clear() - ChangeVector:"
+ + csnVector + " -- StartState:" + startState);
}
catch(Exception e)
{
@@ -381,14 +381,14 @@
continue;
}
- if ((cnVector == null)
- || (cnVector.getChangeNumber(cn.getServerId()) != null
- && !cnVector.cover(startState)))
+ if ((csnVector == null)
+ || (csnVector.getCSN(csn.getServerId()) != null && !csnVector
+ .cover(startState)))
{
cursor.delete();
if (debugEnabled())
- TRACER.debugInfo("DraftCNDBHandler:clear() - deleted " +
- cn + "Not covering startState");
+ TRACER.debugInfo("DraftCNDBHandler:clear() - deleted " + csn
+ + "Not covering startState");
continue;
}
@@ -538,13 +538,13 @@
/** {@inheritDoc} */
@Override
- public ChangeNumber getChangeNumber(int draftCN)
+ public CSN getCSN(int draftCN)
{
DraftCNDBCursor draftCNDBCursor = null;
try
{
draftCNDBCursor = db.openReadCursor(draftCN);
- return draftCNDBCursor.currentChangeNumber();
+ return draftCNDBCursor.currentCSN();
}
catch(Exception e)
{
--
Gitblit v1.10.0