From 9f0904fda87bfcf921deeccdbaeafe834fbad696 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Fri, 24 Apr 2015 14:30:47 +0000
Subject: [PATCH] OPENDJ-1725: Persistit: very long recovery and many discarded txns after addrate test

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java |   19 +------------------
 1 files changed, 1 insertions(+), 18 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java
index ab05cb5..38442a4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java
@@ -63,9 +63,7 @@
 
   /**
    * A simple class representing a pair of added and deleted indexed IDs. Initially both addedIDs
-   * and deletedIDs are {@code null} indicating that that the whole record should be deleted. This
-   * state is only ever used when updating the id2children and id2subtree indexes when deleting an
-   * entry.
+   * and deletedIDs are {@code null} indicating that that the whole record should be deleted.
    */
   private static class BufferedIndexValues
   {
@@ -214,21 +212,6 @@
         vlvIndex.updateIndex(txn, bufferedVLVValues.addedSortKeys, bufferedVLVValues.deletedSortKeys);
       }
     }
-
-    final Index id2children = entryContainer.getID2Children();
-    flushIndex(id2children, txn, bufferedIndexes.remove(id2children));
-
-    final Index id2subtree = entryContainer.getID2Subtree();
-    final TreeMap<ByteString, BufferedIndexValues> bufferedValues = bufferedIndexes.remove(id2subtree);
-    if (bufferedValues != null)
-    {
-      /*
-       * OPENDJ-1375: add keys in reverse order to be consistent with single
-       * entry processing in add/delete processing. This is necessary in order
-       * to avoid deadlocks.
-       */
-      flushIndex(id2subtree, txn, bufferedValues.descendingMap());
-    }
   }
 
   void put(Index index, ByteString key, EntryID entryID)

--
Gitblit v1.10.0