From 17e216ed32e21eddece22d782f8a256711ab3ad8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Dec 2014 15:08:07 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java | 82 ----------------------------------------
1 files changed, 1 insertions(+), 81 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
index b8a8114..7a33220 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
@@ -320,26 +320,6 @@
return false;
}
-
- /**
- * Update the vlvIndex for a deleted entry.
- *
- * @param txn The database transaction to be used for the deletions
- * @param entryID The entry ID
- * @param entry The contents of the deleted entry.
- * @return True if the entry was successfully removed from this VLV index
- * or False otherwise.
- * @throws DatabaseException If an error occurs in the JE database.
- * @throws DirectoryException If a Directory Server error occurs.
- * @throws JebException If an error occurs in the JE backend.
- */
- public boolean removeEntry(Transaction txn, EntryID entryID, Entry entry)
- throws DatabaseException, DirectoryException, JebException
- {
- return shouldInclude(entry)
- && removeValues(txn, entryID.longValue(), entry);
- }
-
/**
* Update the vlvIndex for a deleted entry.
*
@@ -377,66 +357,6 @@
* Update the vlvIndex to reflect a sequence of modifications in a Modify
* operation.
*
- * @param txn The JE transaction to use for database updates.
- * @param entryID The ID of the entry that was modified.
- * @param oldEntry The entry before the modifications were applied.
- * @param newEntry The entry after the modifications were applied.
- * @param mods The sequence of modifications in the Modify operation.
- * @return True if the modification was successfully processed or False
- * otherwise.
- * @throws JebException If an error occurs during an operation on a
- * JE database.
- * @throws DatabaseException If an error occurs during an operation on a
- * JE database.
- * @throws DirectoryException If a Directory Server error occurs.
- */
- public boolean modifyEntry(Transaction txn,
- EntryID entryID,
- Entry oldEntry,
- Entry newEntry,
- List<Modification> mods)
- throws DatabaseException, DirectoryException, JebException
- {
- if (shouldInclude(oldEntry))
- {
- if (shouldInclude(newEntry))
- {
- // The entry should still be indexed. See if any sorted attributes are
- // changed.
- if (isSortAttributeModified(mods))
- {
- boolean success;
- // Sorted attributes have changed. Reindex the entry;
- success = removeValues(txn, entryID.longValue(), oldEntry);
- success &= insertValues(txn, entryID.longValue(), newEntry);
- return success;
- }
- }
- else
- {
- // The modifications caused the new entry to be unindexed. Remove from
- // vlvIndex.
- return removeValues(txn, entryID.longValue(), oldEntry);
- }
- }
- else
- {
- if (shouldInclude(newEntry))
- {
- // The modifications caused the new entry to be indexed. Add to
- // vlvIndex.
- return insertValues(txn, entryID.longValue(), newEntry);
- }
- }
-
- // The modifications does not affect this vlvIndex
- return true;
- }
-
- /**
- * Update the vlvIndex to reflect a sequence of modifications in a Modify
- * operation.
- *
* @param buffer The database transaction to be used for the deletions
* @param entryID The ID of the entry that was modified.
* @param oldEntry The entry before the modifications were applied.
@@ -812,7 +732,7 @@
break;
}
- final SortValuesSet sortValuesSet = getSortValuesSet(txn, data, data, LockMode.RMW);
+ final SortValuesSet sortValuesSet = getSortValuesSet(txn, key, data, LockMode.RMW);
int oldSize = sortValuesSet.size();
if(key.getData().length == 0)
{
--
Gitblit v1.10.0