From 8ac57ee1cd50fcc3d02b36bea4ab1335924f1d7a Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Mon, 18 May 2015 13:52:40 +0000
Subject: [PATCH] OPENDJ-1864: Ordering matching rules should reuse equality indexes where possible

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Indexer.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Indexer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Indexer.java
index aff72aa..d2a39ed 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Indexer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Indexer.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions copyright 2012-2014 ForgeRock AS.
+ *      Portions copyright 2012-2015 ForgeRock AS.
  */
 package org.opends.server.backends.jeb;
 
@@ -33,7 +33,6 @@
 
 import org.forgerock.opendj.ldap.ByteSequence;
 import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.opendj.ldap.spi.IndexingOptions;
 import org.opends.server.backends.jeb.AttributeIndex.KeyComparator;
 import org.opends.server.types.Entry;
 import org.opends.server.types.Modification;
@@ -71,9 +70,8 @@
    *
    * @param entry The entry.
    * @param keys The set into which the generated keys will be inserted.
-   * @param options The indexing options to use
    */
-  public abstract void indexEntry(Entry entry, Set<ByteString> keys, IndexingOptions options);
+  public abstract void indexEntry(Entry entry, Set<ByteString> keys);
 
   /**
    * Generate the set of index keys to be added and the set of index keys
@@ -83,11 +81,9 @@
    * @param newEntry The new entry contents.
    * @param mods The set of modifications that were applied to the entry.
    * @param modifiedKeys The map into which the modified keys will be inserted.
-   * @param options The indexing options to use
    */
   public abstract void modifyEntry(Entry oldEntry, Entry newEntry,
-      List<Modification> mods, Map<ByteString, Boolean> modifiedKeys,
-      IndexingOptions options);
+      List<Modification> mods, Map<ByteString, Boolean> modifiedKeys);
 
   /**
    * Get a string representation of this object.  The returned value is

--
Gitblit v1.10.0