From ea9e25490664445215eff3c88189d32d748ee2b6 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Fri, 18 Aug 2006 17:26:43 +0000
Subject: [PATCH] Removed the unnessary first byte in index keys. Updated all methods to remove the use of these prefix keys to iterate over a range of index keys. Index.readRange is modified to allow for unspecified lower and upper bounds so the search starts and ends at the smallest and/or biggest key respectively.
---
opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java | 24 +-----------------------
1 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java b/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
index 3eb3f65..6b73dbd 100644
--- a/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
+++ b/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
@@ -263,10 +263,9 @@
{
try
{
- byte[] normalizedBytes =
+ byte[] keyBytes =
orderingRule.normalizeValue(value.getValue()).value();
- byte[] keyBytes = makeOrderingKey(normalizedBytes);
keys.add(new ASN1OctetString(keyBytes));
}
catch (DirectoryException e)
@@ -292,25 +291,4 @@
}
}
- /**
- * Makes a byte array representing an ordering index key from
- * a byte array containing the normalized value.
- * The key is '=' followed by the normalized value
- * FIXME: The '=' prefix is no longer necessary since different index
- * FIXME: types are no longer stored in the same database, but uses of
- * FIXME: the Index.readRange method would have to be revisited if the
- * FIXME: prefix is removed.
- *
- * @param normalizedBytes The normalized value.
- * @return A byte array containing the ordering key.
- */
- byte[] makeOrderingKey(byte[] normalizedBytes)
- {
- byte[] keyBytes = new byte[1 + normalizedBytes.length];
- keyBytes[0] = '=';
- System.arraycopy(normalizedBytes, 0, keyBytes, 1,
- normalizedBytes.length);
- return keyBytes;
- }
-
}
--
Gitblit v1.10.0