From 87b6a9294f437fd6312c2fbe2292ee64babd8d7e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 10 Oct 2013 14:45:51 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
index 6fb9407..241a084 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
@@ -123,8 +123,8 @@
// DB initialization
db = new DraftCNDB(dbenv);
- final CNIndexRecord oldestRecord = db.readFirstRecord();
- final CNIndexRecord newestRecord = db.readLastRecord();
+ final ChangeNumberIndexRecord oldestRecord = db.readFirstRecord();
+ final ChangeNumberIndexRecord newestRecord = db.readLastRecord();
oldestChangeNumber = getChangeNumber(oldestRecord);
newestChangeNumber = getChangeNumber(newestRecord);
// initialization of the lastGeneratedChangeNumber from the DB content
@@ -147,7 +147,8 @@
trimmingThread.start();
}
- private long getChangeNumber(CNIndexRecord record) throws ChangelogException
+ private long getChangeNumber(ChangeNumberIndexRecord record)
+ throws ChangelogException
{
if (record != null)
{
@@ -158,12 +159,13 @@
/** {@inheritDoc} */
@Override
- public long addRecord(CNIndexRecord record) throws ChangelogException
+ public long addRecord(ChangeNumberIndexRecord record)
+ throws ChangelogException
{
long changeNumber = nextChangeNumber();
- final CNIndexRecord newRecord =
- new CNIndexRecord(changeNumber, record.getPreviousCookie(), record
- .getBaseDN(), record.getCSN());
+ final ChangeNumberIndexRecord newRecord =
+ new ChangeNumberIndexRecord(changeNumber, record.getPreviousCookie(),
+ record.getBaseDN(), record.getCSN());
db.addRecord(newRecord);
if (debugEnabled())
@@ -173,14 +175,14 @@
/** {@inheritDoc} */
@Override
- public CNIndexRecord getOldestRecord() throws ChangelogException
+ public ChangeNumberIndexRecord getOldestRecord() throws ChangelogException
{
return db.readFirstRecord();
}
/** {@inheritDoc} */
@Override
- public CNIndexRecord getNewestRecord() throws ChangelogException
+ public ChangeNumberIndexRecord getNewestRecord() throws ChangelogException
{
return db.readLastRecord();
}
@@ -221,7 +223,7 @@
/** {@inheritDoc} */
@Override
- public DBCursor<CNIndexRecord> getCursorFrom(long startChangeNumber)
+ public DBCursor<ChangeNumberIndexRecord> getCursorFrom(long startChangeNumber)
throws ChangelogException
{
return new JEChangeNumberIndexDBCursor(db, startChangeNumber);
@@ -355,7 +357,7 @@
return;
}
- final CNIndexRecord record = cursor.currentRecord();
+ final ChangeNumberIndexRecord record = cursor.currentRecord();
if (baseDNToClear != null && baseDNToClear.equals(record.getBaseDN()))
{
cursor.delete();
@@ -478,7 +480,7 @@
{
try
{
- CNIndexRecord record =
+ final ChangeNumberIndexRecord record =
isFirst ? db.readFirstRecord() : db.readLastRecord();
if (record != null)
{
--
Gitblit v1.10.0