From eaa95348ed85ad3d9909e8e703bdeae31a48e0ab Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 17 Dec 2014 15:47:14 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend
---
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java
index b3eece7..fc25a93 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java
@@ -70,8 +70,6 @@
import org.opends.server.types.SortOrder;
import org.opends.server.util.StaticUtils;
-import com.sleepycat.je.LockMode;
-
import static org.opends.messages.JebMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -721,7 +719,7 @@
{
debugBuilder.append("vlv=");
debugBuilder.append("[INDEX:");
- debugBuilder.append(treeName.replace(entryContainer.getDatabasePrefix() + "_", ""));
+ debugBuilder.append(treeName.getIndex());
debugBuilder.append("]");
}
@@ -837,7 +835,6 @@
Cursor cursor = openCursor(txn);
try
{
- LockMode lockMode = LockMode.DEFAULT;
ByteSequence vBytes = vlvRequest.getGreaterThanOrEqualAssertion();
ByteStringBuilder keyBytes = new ByteStringBuilder(vBytes.length() + 4);
keyBytes.appendBERLength(vBytes.length());
@@ -850,8 +847,7 @@
{
logSearchKeyResult(cursor.getKey());
}
- SortValuesSet sortValuesSet =
- new SortValuesSet(cursor.getKey(), cursor.getValue(), this);
+ SortValuesSet sortValuesSet = new SortValuesSet(cursor.getKey(), cursor.getValue(), this);
int adjustedTargetOffset = sortValuesSet.binarySearch(
-1, vlvRequest.getGreaterThanOrEqualAssertion());
@@ -1406,7 +1402,7 @@
ccr.addMessage(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(treeName));
try
{
- state.putIndexTrustState(null, this, false);
+ state.putIndexTrustState(txn, this, false);
}
catch(StorageRuntimeException de)
{
--
Gitblit v1.10.0