From ffa2b6d64ffa66e288e462c7714f01f1c5d8c6b5 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 07 Oct 2013 08:32:39 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java | 8 ++++----
opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java | 4 +---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 10 ++++------
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 8ac9d55..4f3be6f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -205,9 +205,6 @@
public void put(UpdateMsg update, ServerHandler sourceHandler)
throws IOException
{
- CSN csn = update.getCSN();
- int serverId = csn.getServerId();
-
sourceHandler.updateServerState(update);
sourceHandler.incrementInCount();
setGenerationIdIfUnset(sourceHandler.getGenerationId());
@@ -264,7 +261,7 @@
}
}
- if (!publishUpdateMsg(update, serverId))
+ if (!publishUpdateMsg(update))
{
return;
}
@@ -284,6 +281,7 @@
// The following timer will time out and send an timeout ack to the
// requester if the acks are not received in time. The timer will also
// remove the object from this map.
+ CSN csn = update.getCSN();
waitingAcks.put(csn, preparedAssuredInfo.expectedAcksInfo);
// Arm timer for this assured update message (wait for acks until it
@@ -402,11 +400,11 @@
}
}
- private boolean publishUpdateMsg(UpdateMsg updateMsg, int serverId)
+ private boolean publishUpdateMsg(UpdateMsg updateMsg)
{
try
{
- if (this.domainDB.publishUpdateMsg(baseDN, serverId, updateMsg))
+ if (this.domainDB.publishUpdateMsg(baseDN, updateMsg))
{
/*
* JNR: Matt and I had a hard time figuring out where to put this
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
index d64a8a5..71bfbb4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
@@ -213,15 +213,13 @@
*
* @param baseDN
* the replication domain baseDN
- * @param serverId
- * the serverId on which to act
* @param updateMsg
* the update message to publish to the replicaDB
* @return true if a db had to be created to publish this message
* @throws ChangelogException
* If a database problem happened
*/
- boolean publishUpdateMsg(DN baseDN, int serverId, UpdateMsg updateMsg)
+ boolean publishUpdateMsg(DN baseDN, UpdateMsg updateMsg)
throws ChangelogException;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index cd0c63b..3d42f3e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -614,11 +614,11 @@
/** {@inheritDoc} */
@Override
- public boolean publishUpdateMsg(DN baseDN, int serverId,
- UpdateMsg updateMsg) throws ChangelogException
+ public boolean publishUpdateMsg(DN baseDN, UpdateMsg updateMsg)
+ throws ChangelogException
{
- final Pair<JEReplicaDB, Boolean> pair =
- getOrCreateReplicaDB(baseDN, serverId, replicationServer);
+ final Pair<JEReplicaDB, Boolean> pair = getOrCreateReplicaDB(baseDN,
+ updateMsg.getCSN().getServerId(), replicationServer);
final JEReplicaDB replicaDB = pair.getFirst();
final boolean wasCreated = pair.getSecond();
--
Gitblit v1.10.0