From 3f27a7ede5ca9df06137254aa32d41d023ac105d Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 16 Sep 2014 15:05:25 +0000
Subject: [PATCH] OPENDJ-1444 CR-4537 Remove previous cookie from storage of ChangeNumberIndexDB
---
opends/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java b/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
index 8f4f7f0..190a903 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
@@ -133,7 +133,7 @@
{
final long changeNumber = nextChangeNumber();
final ChangeNumberIndexRecord newRecord =
- new ChangeNumberIndexRecord(changeNumber, record.getPreviousCookie(), record.getBaseDN(), record.getCSN());
+ new ChangeNumberIndexRecord(changeNumber, record.getBaseDN(), record.getCSN());
log.append(Record.from(newRecord.getChangeNumber(), newRecord));
newestChangeNumber = changeNumber;
@@ -331,8 +331,6 @@
final ChangeNumberIndexRecord cnIndexRecord = record.getValue();
return new ByteStringBuilder()
.append(record.getKey())
- .append(cnIndexRecord.getPreviousCookie())
- .append(STRING_SEPARATOR)
.append(cnIndexRecord.getBaseDN().toString())
.append(STRING_SEPARATOR)
.append(cnIndexRecord.getCSN().toByteString()).toByteString();
@@ -345,14 +343,11 @@
{
ByteSequenceReader reader = data.asReader();
final long changeNumber = reader.getLong();
- String previousCookie = reader.getString(getNextStringLength(reader));
- reader.skip(1);
- final DN baseDN = DN.decode(
- reader.getString(getNextStringLength(reader)));
+ final DN baseDN = DN.decode(reader.getString(getNextStringLength(reader)));
reader.skip(1);
final CSN csn = CSN.valueOf(reader.getByteString(reader.remaining()));
- return Record.from(changeNumber, new ChangeNumberIndexRecord(changeNumber, previousCookie, baseDN, csn));
+ return Record.from(changeNumber, new ChangeNumberIndexRecord(changeNumber, baseDN, csn));
}
catch (Exception e)
{
--
Gitblit v1.10.0