From 83325bf8cc3b480c00a01ee4c43391cd0238e041 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 12 Mar 2015 16:32:12 +0000
Subject: [PATCH] Simplified loops in import/rebuild-index code.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexInputBuffer.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexInputBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexInputBuffer.java
index 542abc1..8bcce88 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexInputBuffer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexInputBuffer.java
@@ -289,22 +289,17 @@
/**
* Compares this buffer with the provided key and index ID.
*
- * @param cKey
+ * @param key
* The key.
- * @param cIndexID
+ * @param indexID
* The index ID.
- * @return A negative number if this buffer is less than the provided key and
- * index ID, a positive number if this buffer is greater, or zero if
- * it is the same.
+ * @return true if this buffer represent the same key and indexID, false otherwise.
*/
- int compare(ByteStringBuilder cKey, Integer cIndexID)
+ boolean sameKeyAndIndexID(final ByteStringBuilder key, Integer indexID)
{
ensureRecordFetched();
- if (Importer.indexComparator.compare(keyBuffer, cKey) == 0)
- {
- return (indexID.intValue() == cIndexID.intValue()) ? 0 : 1;
- }
- return 1;
+ return Importer.indexComparator.compare(keyBuffer, key) == 0
+ && this.indexID.equals(indexID);
}
/** {@inheritDoc} */
--
Gitblit v1.10.0