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/EntryIDSet.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java
index b9eff78..c9d8a2a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java
@@ -22,12 +22,15 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
-import java.util.Iterator;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Iterator;
+
+import org.forgerock.opendj.ldap.ByteString;
/**
* Represents a set of Entry IDs. It can represent a set where the IDs are
@@ -53,7 +56,7 @@
* The database key containing this set, if the set was constructed
* directly from the database.
*/
- private byte[] keyBytes = null;
+ private ByteString keyBytes;
/**
* Create a new undefined set.
@@ -83,6 +86,19 @@
*/
public EntryIDSet(byte[] keyBytes, byte[] bytes)
{
+ this(keyBytes != null ? ByteString.wrap(keyBytes) : null, bytes);
+ }
+
+ /**
+ * Create a new entry ID set from the raw database value.
+ *
+ * @param keyBytes
+ * The database key that contains this value.
+ * @param bytes
+ * The database value, or null if there are no entry IDs.
+ */
+ public EntryIDSet(ByteString keyBytes, byte[] bytes)
+ {
this.keyBytes = keyBytes;
if (bytes == null)
@@ -189,11 +205,11 @@
long[] n1 = new long[n.length];
long last = -1;
int j = 0;
- for (int i = 0; i < n.length; i++)
+ for (long l : n)
{
- if (n[i] != last)
+ if (l != last)
{
- last = n1[j++] = n[i];
+ last = n1[j++] = l;
}
}
if (j == n1.length)
@@ -229,6 +245,7 @@
* Get a string representation of this object.
* @return A string representation of this object.
*/
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder(16);
@@ -679,6 +696,7 @@
*
* @return An EntryID iterator.
*/
+ @Override
public Iterator<EntryID> iterator()
{
if (values == null)
--
Gitblit v1.10.0