From e28ddc3ed27d4352ddc7c476f4e5208b2eb27251 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 06 Mar 2014 23:25:34 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support

---
 opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java |   59 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
index 282a097..ffcdca7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
@@ -24,28 +24,21 @@
  *      Copyright 2009-2010 Sun Microsystems, Inc.
  *      Portions Copyright 2014 ForgeRock AS
  */
-
 package org.opends.server.backends.jeb;
 
-
-
-import com.sleepycat.je.DatabaseEntry;
-import com.sleepycat.je.LockMode;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
 import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.IndexQueryFactory;
 import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.spi.IndexQueryFactory;
+import org.forgerock.opendj.ldap.spi.IndexingOptions;
 
-import static org.opends.messages.JebMessages.
-    INFO_JEB_INDEX_FILTER_INDEX_LIMIT_EXCEEDED;
-import static org.opends.messages.JebMessages.
-    INFO_JEB_INDEX_FILTER_INDEX_NOT_TRUSTED;
-import static org.opends.messages.JebMessages.
-    INFO_JEB_INDEX_FILTER_INDEX_REBUILD_IN_PROGRESS;
+import com.sleepycat.je.DatabaseEntry;
+import com.sleepycat.je.LockMode;
 
+import static org.opends.messages.JebMessages.*;
 
 /**
  * This class is an implementation of IndexQueryFactory which creates
@@ -54,30 +47,31 @@
 public final class IndexQueryFactoryImpl implements
     IndexQueryFactory<IndexQuery>
 {
+
   /**
-   * The Map containing the string type identifier and the corresponding
-   * index.
+   * The Map containing the string type identifier and the corresponding index.
    */
-  private Map<String, Index> indexMap;
-
-
+  private final Map<String, Index> indexMap;
+  private final IndexingOptions indexingOptions;
 
   /**
    * Creates a new IndexQueryFactoryImpl object.
    *
    * @param indexMap
    *          A map containing the index id and the corresponding index.
+   * @param indexingOptions
+   *          The options to use for indexing
    */
-  public IndexQueryFactoryImpl(Map<String, Index> indexMap)
+  public IndexQueryFactoryImpl(Map<String, Index> indexMap, IndexingOptions indexingOptions)
   {
     this.indexMap = indexMap;
+    this.indexingOptions = indexingOptions;
   }
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public IndexQuery createExactMatchQuery(final String indexID,
       final ByteSequence value)
   {
@@ -122,9 +116,8 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public IndexQuery createRangeMatchQuery(final String indexID,
       final ByteSequence lowerBound, final ByteSequence upperBound,
       final boolean includeLowerBound, final boolean includeUpperBound)
@@ -168,9 +161,8 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public IndexQuery createIntersectionQuery(
       Collection<IndexQuery> subqueries)
   {
@@ -179,9 +171,8 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public IndexQuery createUnionQuery(Collection<IndexQuery> subqueries)
   {
     return IndexQuery.createUnionIndexQuery(subqueries);
@@ -195,6 +186,7 @@
    * It returns an empty EntryIDSet object when either all or no record
    * sets are requested.
    */
+  @Override
   public IndexQuery createMatchAllQuery()
   {
     return new IndexQuery()
@@ -207,4 +199,11 @@
         }
       };
   }
+
+  /** {@inheritDoc} */
+  @Override
+  public IndexingOptions getIndexingOptions()
+  {
+    return indexingOptions;
+  }
 }

--
Gitblit v1.10.0