From 9b2b87fe22decc996721c6da323f181186557219 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 11 Dec 2014 10:18:21 +0000
Subject: [PATCH] VLVIndex.java: Since putSortValuesSet() only exists for TestVerifyJob, then moved it there. Removed removeValues() (never used)
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java | 69 +---------------------------------
1 files changed, 3 insertions(+), 66 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 1d9cf7a..c851ebb 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
@@ -347,12 +347,11 @@
{
if (shouldInclude(newEntry))
{
- // The entry should still be indexed. See if any sorted attributes are
- // changed.
+ // 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;
+ boolean success;
success = removeEntry(buffer, entryID, oldEntry);
success &= addEntry(buffer, entryID, newEntry);
return success;
@@ -360,8 +359,7 @@
}
else
{
- // The modifications caused the new entry to be unindexed. Remove from
- // vlvIndex.
+ // The modifications caused the new entry to be unindexed.
return removeEntry(buffer, entryID, oldEntry);
}
}
@@ -404,28 +402,6 @@
}
/**
- * Put a sort values set in this VLV index.
- *
- * @param txn The transaction to use when retrieving the set or NULL if it is
- * not required.
- * @param sortValuesSet The SortValuesSet to put.
- * @return True if the sortValuesSet was put successfully 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 putSortValuesSet(Transaction txn, SortValuesSet sortValuesSet)
- throws JebException, DatabaseException, DirectoryException
- {
- DatabaseEntry key = new DatabaseEntry(sortValuesSet.getKeyBytes());
- DatabaseEntry data = new DatabaseEntry(sortValuesSet.toDatabase());
-
- return put(txn, key, data) == OperationStatus.SUCCESS;
- }
-
- /**
* Get a sorted values set that should contain the entry with the given
* information.
*
@@ -576,45 +552,6 @@
return types;
}
- private boolean removeValues(Transaction txn, long entryID, Entry entry)
- throws JebException, DatabaseException, DirectoryException
- {
- ByteString[] values = getSortValues(entry);
- AttributeType[] types = getSortTypes();
- DatabaseEntry key = new DatabaseEntry(encodeKey(entryID, values, types));
- DatabaseEntry data = new DatabaseEntry();
-
- OperationStatus status = getSearchKeyRange(txn, key, data, LockMode.RMW);
- if(status == OperationStatus.SUCCESS)
- {
- if(logger.isTraceEnabled())
- {
- logSearchKeyResult(key);
- }
- SortValuesSet sortValuesSet = new SortValuesSet(key.getData(), data.getData(), this);
- boolean success = sortValuesSet.remove(entryID, values);
- byte[] after = sortValuesSet.toDatabase();
-
- if(after == null)
- {
- delete(txn, key);
- }
- else
- {
- data.setData(after);
- put(txn, key, data);
- }
-
- if(success)
- {
- count.getAndDecrement();
- }
-
- return success;
- }
- return false;
- }
-
private OperationStatus getSearchKeyRange(Transaction txn, DatabaseEntry key,
DatabaseEntry data, LockMode lockMode)
{
--
Gitblit v1.10.0