From b3c0c61031820a5826baa4f126c4bcae61b5cc8c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 23 Dec 2014 10:40:23 +0000
Subject: [PATCH] Do not specify the comparator and rely on ByteString natural ordering.
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java | 7 +++----
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/IndexBuffer.java | 3 +--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java
index 6c8e09a..38cc78c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java
@@ -26,6 +26,8 @@
*/
package org.opends.server.backends.pluggable;
+import static org.opends.messages.JebMessages.*;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -49,8 +51,6 @@
import org.opends.server.types.Modification;
import org.opends.server.util.StaticUtils;
-import static org.opends.messages.JebMessages.*;
-
/**
* Represents an index implemented by a JE database in which each key maps to
* a set of entry IDs. The key is a byte array, and is constructed from some
@@ -666,8 +666,7 @@
List<Modification> mods, IndexingOptions options)
throws StorageRuntimeException
{
- TreeMap<ByteString, Boolean> modifiedKeys =
- new TreeMap<ByteString, Boolean>(ByteSequence.COMPARATOR);
+ TreeMap<ByteString, Boolean> modifiedKeys = new TreeMap<ByteString, Boolean>();
indexer.modifyEntry(oldEntry, newEntry, mods, modifiedKeys, options);
for (Map.Entry<ByteString, Boolean> modifiedKey : modifiedKeys.entrySet())
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/IndexBuffer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/IndexBuffer.java
index a22425d..8c62f3f 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/IndexBuffer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/IndexBuffer.java
@@ -32,7 +32,6 @@
import java.util.TreeMap;
import java.util.TreeSet;
-import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.backends.pluggable.spi.StorageRuntimeException;
import org.opends.server.backends.pluggable.spi.WriteableStorage;
@@ -209,7 +208,7 @@
TreeMap<ByteString, BufferedIndexValues> bufferedOperations = bufferedIndexes.get(index);
if (bufferedOperations == null)
{
- bufferedOperations = new TreeMap<ByteString, BufferedIndexValues>(ByteSequence.COMPARATOR);
+ bufferedOperations = new TreeMap<ByteString, BufferedIndexValues>();
bufferedIndexes.put(index, bufferedOperations);
}
else
--
Gitblit v1.10.0