OPENDJ-1602 (CR-5566) New pluggable storage based backend

Jean-Noel Rouvignac

16.35.2014 66f20de399b32a77f00360ed80d9d1f0573295e0

OPENDJ-1602 (CR-5566) New pluggable storage based backend

Trimming the fat: Removed unused Indexer.replaceEntry() method + overriding methods.

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndexer.java

@@ -90,18 +90,6 @@

  /** {@inheritDoc} */
  @Override
  public void replaceEntry(Entry oldEntry, Entry newEntry,
      Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)
  {
    List<Attribute> newAttributes = newEntry.getAttribute(attributeType, true);
    List<Attribute> oldAttributes = oldEntry.getAttribute(attributeType, true);

    indexAttribute(oldAttributes, modifiedKeys, false, options);
    indexAttribute(newAttributes, modifiedKeys, true, options);
  }

  /** {@inheritDoc} */
  @Override
  public void modifyEntry(Entry oldEntry, Entry newEntry,
      List<Modification> mods, Map<ByteString, Boolean> modifiedKeys,
      IndexingOptions options)

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2CIndexer.java

@@ -76,14 +76,6 @@

  /** {@inheritDoc} */
  @Override
  public void replaceEntry(Entry oldEntry, Entry newEntry,
                           Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)
  {
    // Nothing to do.
  }

  /** {@inheritDoc} */
  @Override
  public void modifyEntry(Entry oldEntry, Entry newEntry,
                          List<Modification> mods,
                          Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2SIndexer.java

@@ -75,14 +75,6 @@

  /** {@inheritDoc} */
  @Override
  public void replaceEntry(Entry oldEntry, Entry newEntry,
                           Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)
  {
    // Nothing to do.
  }

  /** {@inheritDoc} */
  @Override
  public void modifyEntry(Entry oldEntry, Entry newEntry,
                          List<Modification> mods,
                          Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java

@@ -77,18 +77,6 @@

  /**
   * Generate the set of index keys to be added and the set of index keys
   * to be deleted for an entry that has been replaced.
   *
   * @param oldEntry The original entry contents.
   * @param newEntry The new entry contents.
   * @param modifiedKeys The map into which the modified keys will be inserted.
   * @param options The indexing options to use
   */
  public abstract void replaceEntry(Entry oldEntry, Entry newEntry,
      Map<ByteString, Boolean> modifiedKeys, IndexingOptions options);

  /**
   * Generate the set of index keys to be added and the set of index keys
   * to be deleted for an entry that was modified.
   *
   * @param oldEntry The original entry contents.

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/PresenceIndexer.java

@@ -26,7 +26,6 @@
 */
package org.opends.server.backends.jeb;

import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -85,14 +84,6 @@

  /** {@inheritDoc} */
  @Override
  public void replaceEntry(Entry oldEntry, Entry newEntry,
                           Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)
  {
    modifyEntry(oldEntry, newEntry, Collections.<Modification>emptyList(), modifiedKeys, options);
  }

  /** {@inheritDoc} */
  @Override
  public void modifyEntry(Entry oldEntry, Entry newEntry,
                          List<Modification> mods,
                          Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)

 opendj3-server-dev/src/server/org/opends/server/backends/pluggable/AttributeIndexer.java

@@ -90,18 +90,6 @@

  /** {@inheritDoc} */
  @Override
  public void replaceEntry(Entry oldEntry, Entry newEntry,
      Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)
  {
    List<Attribute> newAttributes = newEntry.getAttribute(attributeType, true);
    List<Attribute> oldAttributes = oldEntry.getAttribute(attributeType, true);

    indexAttribute(oldAttributes, modifiedKeys, false, options);
    indexAttribute(newAttributes, modifiedKeys, true, options);
  }

  /** {@inheritDoc} */
  @Override
  public void modifyEntry(Entry oldEntry, Entry newEntry,
      List<Modification> mods, Map<ByteString, Boolean> modifiedKeys,
      IndexingOptions options)

 opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ID2CIndexer.java

@@ -77,14 +77,6 @@

  /** {@inheritDoc} */
  @Override
  public void replaceEntry(Entry oldEntry, Entry newEntry,
                           Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)
  {
    // Nothing to do.
  }

  /** {@inheritDoc} */
  @Override
  public void modifyEntry(Entry oldEntry, Entry newEntry,
                          List<Modification> mods,
                          Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)

 opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ID2SIndexer.java

@@ -33,8 +33,6 @@
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;



/**
 * Implementation of an Indexer for the subtree index.
 */
@@ -75,14 +73,6 @@

  /** {@inheritDoc} */
  @Override
  public void replaceEntry(Entry oldEntry, Entry newEntry,
                           Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)
  {
    // Nothing to do.
  }

  /** {@inheritDoc} */
  @Override
  public void modifyEntry(Entry oldEntry, Entry newEntry,
                          List<Modification> mods,
                          Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)

 opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Indexer.java

@@ -52,18 +52,6 @@

  /**
   * Generate the set of index keys to be added and the set of index keys
   * to be deleted for an entry that has been replaced.
   *
   * @param oldEntry The original entry contents.
   * @param newEntry The new entry contents.
   * @param modifiedKeys The map into which the modified keys will be inserted.
   * @param options The indexing options to use
   */
  public abstract void replaceEntry(Entry oldEntry, Entry newEntry,
      Map<ByteString, Boolean> modifiedKeys, IndexingOptions options);

  /**
   * Generate the set of index keys to be added and the set of index keys
   * to be deleted for an entry that was modified.
   *
   * @param oldEntry The original entry contents.

 opendj3-server-dev/src/server/org/opends/server/backends/pluggable/PresenceIndexer.java

@@ -26,7 +26,6 @@
 */
package org.opends.server.backends.pluggable;

import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -85,14 +84,6 @@

  /** {@inheritDoc} */
  @Override
  public void replaceEntry(Entry oldEntry, Entry newEntry,
                           Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)
  {
    modifyEntry(oldEntry, newEntry, Collections.<Modification>emptyList(), modifiedKeys, options);
  }

  /** {@inheritDoc} */
  @Override
  public void modifyEntry(Entry oldEntry, Entry newEntry,
                          List<Modification> mods,
                          Map<ByteString, Boolean> modifiedKeys, IndexingOptions options)