From 2f13f91c158747ca997a44d8e61830f46b77dd82 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Mar 2014 11:31:24 +0000
Subject: [PATCH] OPENDJ-1308 (CR-3156) Migrate schema support - ByteString - Indexer
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/PresenceIndexer.java | 58 ++++++++++++++++++++++++----------------------------------
1 files changed, 24 insertions(+), 34 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/PresenceIndexer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/PresenceIndexer.java
index 58fac44..ab510e5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/PresenceIndexer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/PresenceIndexer.java
@@ -22,18 +22,19 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeType;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
-import org.opends.server.types.AttributeType;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-import java.util.Map;
/**
* An implementation of an Indexer for attribute presence.
@@ -41,13 +42,6 @@
public class PresenceIndexer extends Indexer
{
-
- /**
- * The comparator for index keys generated by this class.
- */
- private static final Comparator<byte[]> comparator =
- new AttributeIndex.KeyComparator();
-
/**
* The attribute type for which this instance will
* generate index keys.
@@ -68,31 +62,20 @@
* Get a string representation of this object.
* @return A string representation of this object.
*/
+ @Override
public String toString()
{
return attributeType.getNameOrOID() + ".presence";
}
/**
- * Get the comparator that must be used to compare index keys
- * generated by this class.
- *
- * @return A byte array comparator.
- */
- public Comparator<byte[]> getComparator()
- {
- return comparator;
- }
-
-
-
- /**
* Generate the set of index keys for an entry.
*
* @param entry The entry.
* @param keys The set into which the generated keys will be inserted.
*/
- public void indexEntry(Entry entry, Set<byte[]> keys)
+ @Override
+ public void indexEntry(Entry entry, Set<ByteString> keys)
{
List<Attribute> attrList =
entry.getAttribute(attributeType);
@@ -100,7 +83,7 @@
{
if (!attrList.isEmpty())
{
- keys.add(AttributeIndex.presenceKey.getData());
+ keys.add(getPresenceKeyData());
}
}
}
@@ -115,8 +98,9 @@
* @param newEntry The new entry contents.
* @param modifiedKeys The map into which the modified keys will be inserted.
*/
+ @Override
public void replaceEntry(Entry oldEntry, Entry newEntry,
- Map<byte[], Boolean> modifiedKeys)
+ Map<ByteString, Boolean> modifiedKeys)
{
List<Attribute> newAttributes = newEntry.getAttribute(attributeType, true);
List<Attribute> oldAttributes = oldEntry.getAttribute(attributeType, true);
@@ -124,14 +108,14 @@
{
if(newAttributes != null)
{
- modifiedKeys.put(AttributeIndex.presenceKey.getData(), true);
+ modifiedKeys.put(getPresenceKeyData(), true);
}
}
else
{
if(newAttributes == null)
{
- modifiedKeys.put(AttributeIndex.presenceKey.getData(), false);
+ modifiedKeys.put(getPresenceKeyData(), false);
}
}
}
@@ -147,9 +131,10 @@
* @param mods The set of modifications that were applied to the entry.
* @param modifiedKeys The map into which the modified keys will be inserted.
*/
+ @Override
public void modifyEntry(Entry oldEntry, Entry newEntry,
List<Modification> mods,
- Map<byte[], Boolean> modifiedKeys)
+ Map<ByteString, Boolean> modifiedKeys)
{
List<Attribute> newAttributes = newEntry.getAttribute(attributeType, true);
List<Attribute> oldAttributes = oldEntry.getAttribute(attributeType, true);
@@ -157,15 +142,20 @@
{
if(newAttributes != null)
{
- modifiedKeys.put(AttributeIndex.presenceKey.getData(), true);
+ modifiedKeys.put(getPresenceKeyData(), true);
}
}
else
{
if(newAttributes == null)
{
- modifiedKeys.put(AttributeIndex.presenceKey.getData(), false);
+ modifiedKeys.put(getPresenceKeyData(), false);
}
}
}
+
+ private ByteString getPresenceKeyData()
+ {
+ return ByteString.wrap(AttributeIndex.presenceKey.getData());
+ }
}
--
Gitblit v1.10.0