From 377b2709c64b32fe93905b466482216c2cc0581c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 19 Mar 2014 16:30:32 +0000
Subject: [PATCH] OPENDJ-1368 (CR-3232) Remove AttributeValue
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index b8cd0a8..d60a0dc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -803,8 +803,8 @@
// Make a key from the normalized assertion value.
MatchingRule equalityRule = equalityFilter.getAttributeType().
getEqualityMatchingRule();
- byte[] keyBytes = equalityRule.normalizeAssertionValue(equalityFilter.
- getAssertionValue().getValue()).toByteArray();
+ byte[] keyBytes = equalityRule.normalizeAssertionValue(
+ equalityFilter.getAssertionValue()).toByteArray();
DatabaseEntry key = new DatabaseEntry(keyBytes);
if(debugBuffer != null)
@@ -979,7 +979,7 @@
filter.getAttributeType().getOrderingMatchingRule();
// FIXME JNR this looks wrong, it should use normalizeAssertionValue()
byte[] normalizedValue = orderingRule.normalizeAttributeValue(
- filter.getAssertionValue().getValue()).toByteArray();
+ filter.getAssertionValue()).toByteArray();
// Set the lower and upper bounds for a range search.
byte[] lower;
@@ -1233,8 +1233,7 @@
* @param upperValue The upper bound value
* @return The candidate entry IDs.
*/
- public EntryIDSet evaluateBoundedRange(AttributeValue lowerValue,
- AttributeValue upperValue)
+ public EntryIDSet evaluateBoundedRange(ByteString lowerValue, ByteString upperValue)
{
if (orderingIndex == null)
{
@@ -1247,13 +1246,9 @@
OrderingMatchingRule orderingRule =
getAttributeType().getOrderingMatchingRule();
- // Set the lower bound for a range search.
- byte[] lower =
- orderingRule.normalizeAttributeValue(lowerValue.getValue()).toByteArray();
-
- // Set the upper bound for a range search.
- byte[] upper =
- orderingRule.normalizeAttributeValue(upperValue.getValue()).toByteArray();
+ // Set the lower and upper bounds for a range search.
+ byte[] lower = orderingRule.normalizeAttributeValue(lowerValue).toByteArray();
+ byte[] upper = orderingRule.normalizeAttributeValue(upperValue).toByteArray();
// Read the range: lower <= keys <= upper.
return orderingIndex.readRange(lower, upper, true, true);
@@ -1398,9 +1393,8 @@
approximateFilter.getAttributeType().getApproximateMatchingRule();
// Make a key from the normalized assertion value.
// FIXME JNR this looks wrong, it should use normalizeAssertionValue()
- byte[] keyBytes =
- approximateMatchingRule.normalizeAttributeValue(
- approximateFilter.getAssertionValue().getValue()).toByteArray();
+ byte[] keyBytes = approximateMatchingRule.normalizeAttributeValue(
+ approximateFilter.getAssertionValue()).toByteArray();
DatabaseEntry key = new DatabaseEntry(keyBytes);
if(debugBuffer != null)
@@ -2278,7 +2272,7 @@
// Make a key from the normalized assertion value.
MatchingRule rule =
extensibleFilter.getAttributeType().getEqualityMatchingRule();
- ByteString value = extensibleFilter.getAssertionValue().getValue();
+ ByteString value = extensibleFilter.getAssertionValue();
byte[] keyBytes = rule.normalizeAssertionValue(value).toByteArray();
DatabaseEntry key = new DatabaseEntry(keyBytes);
@@ -2357,8 +2351,7 @@
}
debugBuffer.append("]");
}
- ByteString assertionValue =
- extensibleFilter.getAssertionValue().getValue();
+ ByteString assertionValue = extensibleFilter.getAssertionValue();
IndexQuery expression = rule.createIndexQuery(assertionValue, factory);
List<LocalizableMessage> debugMessages =
monitor.isFilterUseEnabled() ? new ArrayList<LocalizableMessage>() : null;
--
Gitblit v1.10.0