From c430f8b3da724d0a117eadd172b92179b9a0b5a9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 21 Mar 2014 11:59:48 +0000
Subject: [PATCH] OPENDJ-1368 (CR-3232) Remove AttributeValue
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java | 35 ++++++++---------------------------
1 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java
index c3a61db..6fd1ec4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java
@@ -34,7 +34,6 @@
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.api.MatchingRule;
-import org.opends.server.types.AttributeType;
import org.opends.server.types.DirectoryException;
import com.sleepycat.je.DatabaseException;
@@ -66,8 +65,7 @@
* @param ascending The array of booleans indicating the ordering for
* each value.
*/
- public VLVKeyComparator(MatchingRule[] orderingRules,
- boolean[] ascending)
+ public VLVKeyComparator(MatchingRule[] orderingRules, boolean[] ascending)
{
this.orderingRules = orderingRules;
this.ascending = ascending;
@@ -205,19 +203,8 @@
if(b1Pos + 8 <= b1.length && b2Pos + 8 <= b2.length)
{
- long b1ID = 0;
- for (int i = b1Pos; i < b1Pos + 8; i++)
- {
- b1ID <<= 8;
- b1ID |= (b1[i] & 0xFF);
- }
-
- long b2ID = 0;
- for (int i = b2Pos; i < b2Pos + 8; i++)
- {
- b2ID <<= 8;
- b2ID |= (b2[i] & 0xFF);
- }
+ long b1ID = JebFormat.toLong(b1, b1Pos, b1Pos + 8);
+ long b2ID = JebFormat.toLong(b2, b2Pos, b2Pos + 8);
long idDifference = (b1ID - b2ID);
if (idDifference < 0)
@@ -235,10 +222,8 @@
}
// If we've gotten here, then we can't tell the difference between the sets
- // of available values and entry IDs are not all available, so just return
- // 0
+ // of available values and entry IDs are not all available, so just return 0
return 0;
-
}
/**
@@ -256,10 +241,8 @@
*
* @param set The sort values set to containing the values.
* @param index The index of the values in the set.
- * @param entryID The entry ID to use in the comparasion.
- * @param values The values to use in the comparasion.
- * @param types The types of the values to use in the comparasion.
- *
+ * @param entryID The entry ID to use in the comparison.
+ * @param values The values to use in the comparison.
* @return A negative integer if the values in the set should come before
* the given values in ascending order, a positive integer if
* the values in the set should come after the given values in
@@ -273,8 +256,7 @@
* associated equality matching rule).
*/
public int compare(SortValuesSet set, int index, long entryID,
- ByteString[] values, AttributeType[] types) throws DatabaseException,
- DirectoryException
+ ByteString[] values) throws DatabaseException, DirectoryException
{
for (int j=0; j < orderingRules.length; j++)
{
@@ -290,8 +272,7 @@
{
try
{
- final MatchingRule eqRule = types[j].getEqualityMatchingRule();
- b2Bytes = eqRule.normalizeAttributeValue(values[j]);
+ b2Bytes = orderingRules[j].normalizeAttributeValue(values[j]);
}
catch (DecodeException e)
{
--
Gitblit v1.10.0