From 8ae079e04b6596f6b393840df19dce2627d5bfaf Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 04 Oct 2013 12:50:44 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java | 4 ++--
opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 2 +-
opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java | 19 ++++++++-----------
3 files changed, 11 insertions(+), 14 deletions(-)
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 ae79eba..b286550 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -1313,7 +1313,7 @@
*/
public long getCount(CSN from, CSN to)
{
- return domainDB.getCount(baseDN, from.getServerId(), from, to);
+ return domainDB.getCount(baseDN, from, to);
}
/**
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java b/opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
index d64a8a5..e5c2285 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
@@ -136,8 +136,7 @@
* </ol>
* <h6>Example</h6>
* <p>
- * Given the following replica database for baseDN "dc=example,dc=com" and
- * serverId 1:
+ * Given the following replica database for baseDN "dc=example,dc=com":
*
* <pre>
* CSN1 <= Oldest
@@ -150,25 +149,23 @@
* Then:
*
* <pre>
- * assertEquals(getCount("dc=example,dc=com", 1, CSN1, CSN1), 1);
- * assertEquals(getCount("dc=example,dc=com", 1, CSN1, CSN2), 2);
- * assertEquals(getCount("dc=example,dc=com", 1, CSN1, CSN5), 5);
- * assertEquals(getCount("dc=example,dc=com", 1, null, CSN5), 5);
- * assertEquals(getCount("dc=example,dc=com", 1, CSN1, null), 0);
- * assertEquals(getCount("dc=example,dc=com", 1, null, null), 5);
+ * assertEquals(getCount("dc=example,dc=com", CSN1, CSN1), 1);
+ * assertEquals(getCount("dc=example,dc=com", CSN1, CSN2), 2);
+ * assertEquals(getCount("dc=example,dc=com", CSN1, CSN5), 5);
+ * assertEquals(getCount("dc=example,dc=com", null, CSN5), 5);
+ * assertEquals(getCount("dc=example,dc=com", CSN1, null), 0);
+ * assertEquals(getCount("dc=example,dc=com", null, null), 5);
* </pre>
*
* @param baseDN
* the replication domain baseDN
- * @param serverId
- * the serverId on which to act
* @param from
* The older CSN where to start the count
* @param to
* The newer CSN where to end the count
* @return The computed number of changes
*/
- long getCount(DN baseDN, int serverId, CSN from, CSN to);
+ long getCount(DN baseDN, CSN from, CSN to);
/**
* Returns the {@link CSN} situated immediately after the specified
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index 4f42777..a6c5de4 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -375,9 +375,9 @@
/** {@inheritDoc} */
@Override
- public long getCount(DN baseDN, int serverId, CSN from, CSN to)
+ public long getCount(DN baseDN, CSN from, CSN to)
{
- DbHandler dbHandler = getDbHandler(baseDN, serverId);
+ DbHandler dbHandler = getDbHandler(baseDN, from.getServerId());
if (dbHandler != null)
{
return dbHandler.getCount(from, to);
--
Gitblit v1.10.0