From c987a1e93ff6a39cff242041d182f184bc05ad60 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 27 Feb 2015 14:44:20 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexOutputBuffer.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexOutputBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexOutputBuffer.java
index 96b82cc..0f3bace 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexOutputBuffer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexOutputBuffer.java
@@ -291,9 +291,9 @@
/**
* Writes the full record minus the record size itself.
*/
- private int addRecord(byte[]key, long id, int indexID, boolean insert)
+ private int addRecord(byte[] key, long entryID, int indexID, boolean insert)
{
- int retOffset = recordOffset - getRecordSize(key.length, id);
+ int retOffset = recordOffset - getRecordSize(key.length, entryID);
int offSet = retOffset;
// write the INS/DEL bit
@@ -301,7 +301,7 @@
// write the indexID
offSet += writeIntBytes(buffer, offSet, indexID);
// write the entryID
- offSet = PackedInteger.writeLong(buffer, offSet, id);
+ offSet = PackedInteger.writeLong(buffer, offSet, entryID);
// write the key length
offSet = PackedInteger.writeInt(buffer, offSet, key.length);
// write the key bytes
@@ -333,32 +333,31 @@
}
/**
- * Write record at specified index to the specified output stream. Used when
- * when writing the index scratch files.
+ * Write record at specified position to the specified output stream.
+ * Used when when writing the index scratch files.
*
* @param stream The stream to write the record at the index to.
- * @param index The index of the record to write.
+ * @param position The position of the record to write.
*/
- public void writeID(ByteArrayOutputStream stream, int index)
+ public void writeID(ByteArrayOutputStream stream, int position)
{
- int offSet = getOffset(index);
+ int offSet = getOffset(position);
int len = PackedInteger.getReadLongLength(buffer, offSet + REC_OVERHEAD);
stream.write(buffer, offSet + REC_OVERHEAD, len);
}
/**
- * Return {@code true} if the record specified by the index is an insert
+ * Return {@code true} if the record specified by the position is an insert
* record, or {@code false} if it a delete record.
*
- * @param index The index of the record.
- *
+ * @param position The position of the record.
* @return {@code true} if the record is an insert record, or {@code false}
* if it is a delete record.
*/
- public boolean isInsertRecord(int index)
+ public boolean isInsertRecord(int position)
{
- int recOffset = getOffset(index);
+ int recOffset = getOffset(position);
return buffer[recOffset] == INS;
}
@@ -386,10 +385,10 @@
}
/** Used to minimized memory usage when comparing keys. */
- private ByteBuffer getKeyBuf(int x)
+ private ByteBuffer getKeyBuf(int position)
{
keyBuffer.clear();
- int offSet = getOffset(x) + REC_OVERHEAD;
+ int offSet = getOffset(position) + REC_OVERHEAD;
offSet += PackedInteger.getReadIntLength(buffer, offSet);
int keyLen = PackedInteger.readInt(buffer, offSet);
offSet += PackedInteger.getReadIntLength(buffer, offSet);
@@ -407,12 +406,12 @@
/**
* Return the key value part of a record specified by the index.
*
- * @param x index to return.
+ * @param position position to return.
* @return byte array containing the key value.
*/
- private byte[] getKey(int x)
+ private byte[] getKey(int position)
{
- int offSet = getOffset(x) + REC_OVERHEAD;
+ int offSet = getOffset(position) + REC_OVERHEAD;
offSet += PackedInteger.getReadIntLength(buffer, offSet);
int keyLen = PackedInteger.readInt(buffer, offSet);
offSet += PackedInteger.getReadIntLength(buffer, offSet);
@@ -446,32 +445,35 @@
return getIntegerValue(offset + 1);
}
- private boolean is(CompareOp op, int x, int y)
+ private boolean is(CompareOp op, int xPosition, int yPosition)
{
- int xoffSet = getOffset(x);
+ int xoffSet = getOffset(xPosition);
int xIndexID = getIndexIDFromOffset(xoffSet);
xoffSet += REC_OVERHEAD;
xoffSet += PackedInteger.getReadIntLength(buffer, xoffSet);
int xKeyLen = PackedInteger.readInt(buffer, xoffSet);
int xKey = PackedInteger.getReadIntLength(buffer, xoffSet) + xoffSet;
- int yoffSet = getOffset(y);
+
+ int yoffSet = getOffset(yPosition);
int yIndexID = getIndexIDFromOffset(yoffSet);
yoffSet += REC_OVERHEAD;
yoffSet += PackedInteger.getReadIntLength(buffer, yoffSet);
int yKeyLen = PackedInteger.readInt(buffer, yoffSet);
int yKey = PackedInteger.getReadIntLength(buffer, yoffSet) + yoffSet;
+
int cmp = comparator.compare(buffer, xKey, xKeyLen, xIndexID, yKey, yKeyLen, yIndexID);
return evaluateReturnCode(cmp, op);
}
- private boolean is(CompareOp op, int x, byte[] yKey, int yIndexID)
+ private boolean is(CompareOp op, int xPosition, byte[] yKey, int yIndexID)
{
- int xoffSet = getOffset(x);
+ int xoffSet = getOffset(xPosition);
int xIndexID = getIndexIDFromOffset(xoffSet);
xoffSet += REC_OVERHEAD;
xoffSet += PackedInteger.getReadIntLength(buffer, xoffSet);
int xKeyLen = PackedInteger.readInt(buffer, xoffSet);
int xKey = PackedInteger.getReadIntLength(buffer, xoffSet) + xoffSet;
+
int cmp = comparator.compare(buffer, xKey, xKeyLen, xIndexID, yKey, yKey.length, yIndexID);
return evaluateReturnCode(cmp, op);
}
--
Gitblit v1.10.0