From e26e133e8e2c76ba8973c59f0a34e6e591c1ab54 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 12 Mar 2015 13:09:08 +0000
Subject: [PATCH] IndexOutputBuffer.java: further code simplifications
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexOutputBuffer.java | 62 +++++++++++++------------------
1 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexOutputBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexOutputBuffer.java
index 0cec27d..7842d73 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexOutputBuffer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexOutputBuffer.java
@@ -193,7 +193,7 @@
}
/**
- * Determines if buffer should be re-cycled by calling {@link IndexOutputBuffer#reset()}.
+ * Determines if buffer should be re-cycled by calling {@link #reset()}.
*
* @return {@code true} if buffer should be recycled, or {@code false} if it should not.
*/
@@ -486,29 +486,20 @@
int keyLen = readInt(buffer, offset);
int key = INT_SIZE + offset;
- final int cmp = indexComparator.compare(buffer, key, keyLen, keyBuf.array(), keyBuf.limit());
- if (cmp != 0)
+ int cmp = indexComparator.compare(buffer, key, keyLen, keyBuf.array(), keyBuf.limit());
+ if (cmp == 0)
{
- return cmp;
+ cmp = compareInts(indexID, b.getIndexID());
+ if (cmp == 0)
+ {
+ // This is tested in a tree set remove when a buffer is removed from the tree set.
+ return compareLongs(bufferID, b.getBufferID());
+ }
}
-
- final int bIndexID = b.getIndexID();
- if (indexID == bIndexID)
- {
- // This is tested in a tree set remove when a buffer is removed from the tree set.
- return compare(this.bufferID, b.getBufferID());
- }
- else if (indexID < bIndexID)
- {
- return -1;
- }
- else
- {
- return 1;
- }
+ return cmp;
}
- private int compare(long l1, long l2)
+ private static int compareLongs(long l1, long l2)
{
if (l1 == l2)
{
@@ -800,24 +791,23 @@
}
return 0;
}
-
- private int compareInts(int i1, int i2)
- {
- if (i1 == i2)
- {
- return 0;
- }
- else if (i1 > i2)
- {
- return 1;
- }
- else
- {
- return -1;
- }
- }
}
+ private static int compareInts(int i1, int i2)
+ {
+ if (i1 == i2)
+ {
+ return 0;
+ }
+ else if (i1 > i2)
+ {
+ return 1;
+ }
+ else
+ {
+ return -1;
+ }
+ }
/**
* Set the index key associated with an index buffer.
--
Gitblit v1.10.0