From 77131174b396433451592ca82362a3534ce74c80 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 16 Dec 2014 14:49:33 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend
---
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java
index 18c9221..257ff78 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java
@@ -37,13 +37,13 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
-import org.opends.server.backends.pluggable.IndexBuffer.BufferedIndexValues;
import org.opends.server.backends.pluggable.BackendImpl.Cursor;
import org.opends.server.backends.pluggable.BackendImpl.ReadableStorage;
import org.opends.server.backends.pluggable.BackendImpl.Storage;
import org.opends.server.backends.pluggable.BackendImpl.StorageRuntimeException;
import org.opends.server.backends.pluggable.BackendImpl.TreeName;
import org.opends.server.backends.pluggable.BackendImpl.WriteableStorage;
+import org.opends.server.backends.pluggable.IndexBuffer.BufferedIndexValues;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
@@ -77,9 +77,6 @@
*/
private int entryLimitExceededCount;
- /** The max number of tries to rewrite phantom records. */
- private final int phantomWriteRetries = 3;
-
/**
* Whether to maintain a count of IDs for a key once the entry limit
* has exceeded.
@@ -129,7 +126,7 @@
*/
public Index(TreeName name, Indexer indexer, State state,
int indexEntryLimit, int cursorEntryLimit, boolean maintainCount,
- Storage storage, EntryContainer entryContainer)
+ Storage storage, WriteableStorage txn, EntryContainer entryContainer)
throws StorageRuntimeException
{
super(name, storage, entryContainer);
@@ -140,11 +137,11 @@
this.state = state;
this.trusted = state.getIndexTrustState(null, this);
- if (!trusted && entryContainer.getHighestEntryID().longValue() == 0)
+ if (!trusted && entryContainer.getHighestEntryID(txn).longValue() == 0)
{
// If there are no entries in the entry container then there
// is no reason why this index can't be upgraded to trusted.
- setTrusted(null, true);
+ setTrusted(txn, true);
}
}
--
Gitblit v1.10.0