From bfe3a38b79cfb8d3b536ed03f7d2b9db918e98d6 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 06 Sep 2013 09:08:26 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB

---
 opends/src/server/org/opends/server/replication/server/ECLServerHandler.java |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

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 e3cdc07..8621480 100644
--- a/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -571,15 +571,15 @@
     {
       // Request filter DOES NOT contain any first change number
       // So we'll generate from the first change number in the DraftCNdb
-      final CNIndexData firstCNData = cnIndexDB.getFirstCNIndexData();
-      if (firstCNData == null)
+      final CNIndexRecord firstCNRecord = cnIndexDB.getFirstRecord();
+      if (firstCNRecord == null)
       { // DB is empty or closed
         isEndOfCNIndexDBReached = true;
         return null;
       }
 
-      final long firstChangeNumber = firstCNData.getChangeNumber();
-      final String crossDomainStartState = firstCNData.getPreviousCookie();
+      final long firstChangeNumber = firstCNRecord.getChangeNumber();
+      final String crossDomainStartState = firstCNRecord.getPreviousCookie();
       cnIndexDBCursor = cnIndexDB.getCursorFrom(firstChangeNumber);
       return crossDomainStartState;
     }
@@ -587,11 +587,11 @@
     // Request filter DOES contain a startChangeNumber
 
     // Read the draftCNDb to see whether it contains startChangeNumber
-    CNIndexData startCNData = cnIndexDB.getCNIndexData(startChangeNumber);
-    if (startCNData != null)
+    CNIndexRecord startCNRecord = cnIndexDB.getRecord(startChangeNumber);
+    if (startCNRecord != null)
     {
       // found the provided startChangeNumber, let's return it
-      final String crossDomainStartState = startCNData.getPreviousCookie();
+      final String crossDomainStartState = startCNRecord.getPreviousCookie();
       cnIndexDBCursor = cnIndexDB.getCursorFrom(startChangeNumber);
       return crossDomainStartState;
     }
@@ -611,10 +611,10 @@
     // the DB, let's use the lower limit.
     if (startChangeNumber < firstChangeNumber)
     {
-      CNIndexData firstCNData = cnIndexDB.getCNIndexData(firstChangeNumber);
-      if (firstCNData != null)
+      CNIndexRecord firstCNRecord = cnIndexDB.getRecord(firstChangeNumber);
+      if (firstCNRecord != null)
       {
-        final String crossDomainStartState = firstCNData.getPreviousCookie();
+        final String crossDomainStartState = firstCNRecord.getPreviousCookie();
         cnIndexDBCursor = cnIndexDB.getCursorFrom(firstChangeNumber);
         return crossDomainStartState;
       }
@@ -627,15 +627,15 @@
     {
       // startChangeNumber is between first and potential last and has never
       // been returned yet
-      final CNIndexData lastCNData = cnIndexDB.getLastCNIndexData();
-      if (lastCNData == null)
+      final CNIndexRecord lastCNRecord = cnIndexDB.getLastRecord();
+      if (lastCNRecord == null)
       {
         isEndOfCNIndexDBReached = true;
         return null;
       }
 
-      final long lastKey = lastCNData.getChangeNumber();
-      final String crossDomainStartState = lastCNData.getPreviousCookie();
+      final long lastKey = lastCNRecord.getChangeNumber();
+      final String crossDomainStartState = lastCNRecord.getPreviousCookie();
       cnIndexDBCursor = cnIndexDB.getCursorFrom(lastKey);
       return crossDomainStartState;
 
@@ -1370,9 +1370,9 @@
 
 
       // the next change from the CNIndexDB
-      final CNIndexData cnIndexData = cnIndexDBCursor.getCNIndexData();
-      final CSN csnFromDraftCNDb = cnIndexData.getCSN();
-      final String dnFromDraftCNDb = cnIndexData.getBaseDN();
+      final CNIndexRecord currentRecord = cnIndexDBCursor.getRecord();
+      final CSN csnFromDraftCNDb = currentRecord.getCSN();
+      final String dnFromDraftCNDb = currentRecord.getBaseDN();
 
       if (debugEnabled())
         TRACER.debugInfo("assignChangeNumber() generating change number "
@@ -1387,10 +1387,10 @@
       {
         if (debugEnabled())
           TRACER.debugInfo("assignChangeNumber() generating change number "
-              + " assigning changeNumber=" + cnIndexData.getChangeNumber()
+              + " assigning changeNumber=" + currentRecord.getChangeNumber()
               + " to change=" + oldestChange);
 
-        oldestChange.setChangeNumber(cnIndexData.getChangeNumber());
+        oldestChange.setChangeNumber(currentRecord.getChangeNumber());
         return true;
       }
 
@@ -1424,8 +1424,8 @@
 
         if (debugEnabled())
           TRACER.debugInfo("assignChangeNumber() generating change number has"
-              + "skipped to  changeNumber=" + cnIndexData.getChangeNumber()
-              + " csn=" + cnIndexData.getCSN() + " End of CNIndexDB ?"
+              + "skipped to  changeNumber=" + currentRecord.getChangeNumber()
+              + " csn=" + currentRecord.getCSN() + " End of CNIndexDB ?"
               + isEndOfCNIndexDBReached);
       }
       catch (ChangelogException e)
@@ -1455,7 +1455,7 @@
 
     // store in CNIndexDB the pair
     // (change number of the current change, state before this change)
-    replicationServer.getChangeNumberIndexDB().add(new CNIndexData(
+    replicationServer.getChangeNumberIndexDB().addRecord(new CNIndexRecord(
         change.getChangeNumber(),
         previousCookie.toString(),
         change.getBaseDN(),

--
Gitblit v1.10.0