From 20fdcbef0d17440c367d2943f9c5799bddfe661f Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 07 Apr 2015 10:45:33 +0000
Subject: [PATCH] OPENDJ-1628 - Simplify Index hierarchy and remove Indexer classes

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
index b8f037c..7014e6e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
@@ -87,7 +87,7 @@
  * "tie-breaker" and ensures that keys correspond to one and only one entry. This ensures that all
  * database updates can be performed using lock-free operations.
  */
-class VLVIndex extends DatabaseContainer implements ConfigurationChangeListener<BackendVLVIndexCfg>, Closeable
+class VLVIndex extends AbstractDatabaseContainer implements ConfigurationChangeListener<BackendVLVIndexCfg>, Closeable
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
@@ -166,9 +166,8 @@
   }
 
   @Override
-  void open(final WriteableTransaction txn) throws StorageRuntimeException
+  void doOpen(final WriteableTransaction txn) throws StorageRuntimeException
   {
-    super.open(txn);
     count.set((int) txn.getRecordCount(getName()));
   }
 
@@ -352,7 +351,7 @@
   {
     if (shouldInclude(entry))
     {
-      buffer.getBufferedVLVIndexValues(this).addValues(encodeVLVKey(entry, entryID.longValue()));
+      buffer.put(this, encodeVLVKey(entry, entryID.longValue()));
     }
   }
 
@@ -418,7 +417,7 @@
   {
     if (shouldInclude(entry))
     {
-      buffer.getBufferedVLVIndexValues(this).deleteValues(encodeVLVKey(entry, entryID.longValue()));
+      buffer.remove(this, encodeVLVKey(entry, entryID.longValue()));
     }
   }
 
@@ -862,4 +861,11 @@
     }
     builder.append(separator);
   }
+
+  void closeAndDelete(WriteableTransaction txn)
+  {
+    close();
+    delete(txn);
+    state.deleteRecord(txn, getName());
+  }
 }

--
Gitblit v1.10.0