From 7c6b1f8176561447f0cdb0de118f1bd27a767b09 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Fri, 20 Mar 2015 14:27:32 +0000
Subject: [PATCH] OPENDJ-1867: Consider removing ImportIDSet and using EntryIDSet instead
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
index 74853eb..e53003b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
@@ -97,8 +97,6 @@
*/
private boolean trusted;
- private final ImportIDSet newImportIDSet;
-
/**
* Create a new index object.
* @param name The name of the index database within the entryContainer.
@@ -122,7 +120,6 @@
this.indexEntryLimit = indexEntryLimit;
this.cursorEntryLimit = cursorEntryLimit;
this.maintainCount = maintainCount;
- this.newImportIDSet = new ImportIDSet(null, indexEntryLimit, indexEntryLimit, maintainCount);
this.state = state;
this.trusted = state.getIndexTrustState(txn, this);
@@ -156,15 +153,15 @@
ByteSequence key = importIdSet.getKey();
ByteString value = txn.read(getName(), key);
if (value != null) {
- newImportIDSet.clear();
- newImportIDSet.remove(value, importIdSet);
- if (newImportIDSet.isDefined() && newImportIDSet.size() == 0)
+ final ImportIDSet importIDSet = new ImportIDSet(key, newSetFromBytes(key, value), indexEntryLimit, maintainCount);
+ importIDSet.remove(importIdSet);
+ if (importIDSet.isDefined() && importIDSet.size() == 0)
{
txn.delete(getName(), key);
}
else
{
- value = newImportIDSet.valueToByteString();
+ value = importIDSet.valueToByteString();
txn.create(getName(), key, value);
}
} else {
@@ -185,11 +182,11 @@
ByteSequence key = importIdSet.getKey();
ByteString value = txn.read(getName(), key);
if(value != null) {
- newImportIDSet.clear();
- if (newImportIDSet.merge(value, importIdSet)) {
+ final ImportIDSet importIDSet = new ImportIDSet(key, newSetFromBytes(key, value), indexEntryLimit, maintainCount);
+ if (importIDSet.merge(importIdSet)) {
entryLimitExceededCount++;
}
- value = newImportIDSet.valueToByteString();
+ value = importIDSet.valueToByteString();
} else {
if(!importIdSet.isDefined()) {
entryLimitExceededCount++;
--
Gitblit v1.10.0