From 074e59bf108b9c195e27159bfa4d42e4869bd016 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 16 Dec 2014 10:35:48 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Indexer.java | 12 ------
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java | 12 ------
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndexer.java | 12 ------
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2CIndexer.java | 8 ----
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2SIndexer.java | 8 ----
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/PresenceIndexer.java | 9 ----
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/PresenceIndexer.java | 9 ----
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ID2CIndexer.java | 8 ----
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ID2SIndexer.java | 10 -----
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/AttributeIndexer.java | 12 ------
10 files changed, 0 insertions(+), 100 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndexer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndexer.java
index 66e16d3..b64030a 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndexer.java
+++ b/opendj-sdk/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)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2CIndexer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2CIndexer.java
index 11b4295..dcdef39 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2CIndexer.java
+++ b/opendj-sdk/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)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2SIndexer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2SIndexer.java
index 50de810..80cce87 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2SIndexer.java
+++ b/opendj-sdk/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)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java
index 33753ff..aff72aa 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java
+++ b/opendj-sdk/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.
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/PresenceIndexer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/PresenceIndexer.java
index be30cca..fca1892 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/PresenceIndexer.java
+++ b/opendj-sdk/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)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/AttributeIndexer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/AttributeIndexer.java
index 76cae7a..222530d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/AttributeIndexer.java
+++ b/opendj-sdk/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)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ID2CIndexer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ID2CIndexer.java
index 7618085..fc056b4 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ID2CIndexer.java
+++ b/opendj-sdk/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)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ID2SIndexer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ID2SIndexer.java
index d4e8da9..b3ff3e0 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ID2SIndexer.java
+++ b/opendj-sdk/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)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Indexer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Indexer.java
index c7f339b..35200a5 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Indexer.java
+++ b/opendj-sdk/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.
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/PresenceIndexer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/PresenceIndexer.java
index 88e372e..0784518 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/PresenceIndexer.java
+++ b/opendj-sdk/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)
--
Gitblit v1.10.0