From a465378dd21226dd26665300c5aadb1eedef5caa Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 11 Mar 2015 13:37:19 +0000
Subject: [PATCH] OPENDJ-1708 Persistit: no rebuild-index support

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexOutputBuffer.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 0f3bace..c1a7c0a 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
@@ -339,7 +339,7 @@
    * @param stream The stream to write the record at the index to.
    * @param position The position of the record to write.
    */
-  public void writeID(ByteArrayOutputStream stream, int position)
+  public void writeEntryID(ByteArrayOutputStream stream, int position)
   {
     int offSet = getOffset(position);
     int len = PackedInteger.getReadLongLength(buffer, offSet + REC_OVERHEAD);
@@ -369,7 +369,7 @@
   public int getKeySize()
   {
     int offSet = getOffset(position) + REC_OVERHEAD;
-    offSet += PackedInteger.getReadIntLength(buffer, offSet);
+    offSet += PackedInteger.getReadLongLength(buffer, offSet);
     return PackedInteger.readInt(buffer, offSet);
   }
 
@@ -389,7 +389,7 @@
   {
     keyBuffer.clear();
     int offSet = getOffset(position) + REC_OVERHEAD;
-    offSet += PackedInteger.getReadIntLength(buffer, offSet);
+    offSet += PackedInteger.getReadLongLength(buffer, offSet);
     int keyLen = PackedInteger.readInt(buffer, offSet);
     offSet += PackedInteger.getReadIntLength(buffer, offSet);
     //Re-allocate if the key is bigger than the capacity.
@@ -412,7 +412,7 @@
   private byte[] getKey(int position)
   {
     int offSet = getOffset(position) + REC_OVERHEAD;
-    offSet += PackedInteger.getReadIntLength(buffer, offSet);
+    offSet += PackedInteger.getReadLongLength(buffer, offSet);
     int keyLen = PackedInteger.readInt(buffer, offSet);
     offSet += PackedInteger.getReadIntLength(buffer, offSet);
     byte[] key = new byte[keyLen];
@@ -450,14 +450,14 @@
     int xoffSet = getOffset(xPosition);
     int xIndexID = getIndexIDFromOffset(xoffSet);
     xoffSet += REC_OVERHEAD;
-    xoffSet += PackedInteger.getReadIntLength(buffer, xoffSet);
+    xoffSet += PackedInteger.getReadLongLength(buffer, xoffSet);
     int xKeyLen = PackedInteger.readInt(buffer, xoffSet);
     int xKey = PackedInteger.getReadIntLength(buffer, xoffSet) + xoffSet;
 
     int yoffSet = getOffset(yPosition);
     int yIndexID = getIndexIDFromOffset(yoffSet);
     yoffSet += REC_OVERHEAD;
-    yoffSet += PackedInteger.getReadIntLength(buffer, yoffSet);
+    yoffSet += PackedInteger.getReadLongLength(buffer, yoffSet);
     int yKeyLen = PackedInteger.readInt(buffer, yoffSet);
     int yKey = PackedInteger.getReadIntLength(buffer, yoffSet) + yoffSet;
 
@@ -470,7 +470,7 @@
     int xoffSet = getOffset(xPosition);
     int xIndexID = getIndexIDFromOffset(xoffSet);
     xoffSet += REC_OVERHEAD;
-    xoffSet += PackedInteger.getReadIntLength(buffer, xoffSet);
+    xoffSet += PackedInteger.getReadLongLength(buffer, xoffSet);
     int xKeyLen = PackedInteger.readInt(buffer, xoffSet);
     int xKey = PackedInteger.getReadIntLength(buffer, xoffSet) + xoffSet;
 
@@ -494,7 +494,7 @@
     int offset = getOffset(position);
     int indexID = getIndexIDFromOffset(offset);
     offset += REC_OVERHEAD;
-    offset += PackedInteger.getReadIntLength(buffer, offset);
+    offset += PackedInteger.getReadLongLength(buffer, offset);
     int keyLen = PackedInteger.readInt(buffer, offset);
     int key = PackedInteger.getReadIntLength(buffer, offset) + offset;
     return comparator.compare(buffer, key, keyLen, b, b.length) == 0
@@ -519,7 +519,7 @@
     int offset = getOffset(position);
     int indexID = getIndexIDFromOffset(offset);
     offset += REC_OVERHEAD;
-    offset += PackedInteger.getReadIntLength(buffer, offset);
+    offset += PackedInteger.getReadLongLength(buffer, offset);
     int keyLen = PackedInteger.readInt(buffer, offset);
     int key = PackedInteger.getReadIntLength(buffer, offset) + offset;
 
@@ -573,7 +573,7 @@
   public void writeKey(DataOutputStream dataStream) throws IOException
   {
     int offSet = getOffset(position) + REC_OVERHEAD;
-    offSet += PackedInteger.getReadIntLength(buffer, offSet);
+    offSet += PackedInteger.getReadLongLength(buffer, offSet);
     int keyLen = PackedInteger.readInt(buffer, offSet);
     offSet += PackedInteger.getReadIntLength(buffer, offSet);
     dataStream.write(buffer, offSet, keyLen);

--
Gitblit v1.10.0