OPENDJ-1866: Make EntryIDSet more maintainable.

Yannick Lecaillez

16.36.2015 42fbf08eb02ea8464a6b03fc47b75ad400bed44f

 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java

@@ -28,6 +28,7 @@

import static org.opends.messages.JebMessages.*;
import static org.opends.server.backends.pluggable.JebFormat.*;
import static org.opends.server.backends.pluggable.EntryIDSet.newSetFromBytes;

import java.util.AbstractSet;
import java.util.ArrayList;
@@ -597,11 +598,11 @@
          continue;
        }

        EntryIDSet entryIDList;
        EntryIDSet entryIDSet;

        try
        {
          entryIDList = new EntryIDSet(key, value);
          entryIDSet = newSetFromBytes(key, value);
        }
        catch (Exception e)
        {
@@ -616,9 +617,9 @@
          continue;
        }

        updateIndexStats(entryIDList);
        updateIndexStats(entryIDSet);

        if (entryIDList.isDefined())
        if (entryIDSet.isDefined())
        {
          Entry entry;
          try
@@ -642,7 +643,7 @@
            continue;
          }

          for (EntryID id : entryIDList)
          for (EntryID id : entryIDSet)
          {
            Entry childEntry;
            try
@@ -723,10 +724,10 @@
          continue;
        }

        EntryIDSet entryIDList;
        EntryIDSet entryIDSet;
        try
        {
          entryIDList = new EntryIDSet(key, value);
          entryIDSet = newSetFromBytes(key, value);
        }
        catch (Exception e)
        {
@@ -741,9 +742,9 @@
          continue;
        }

        updateIndexStats(entryIDList);
        updateIndexStats(entryIDSet);

        if (entryIDList.isDefined())
        if (entryIDSet.isDefined())
        {
          Entry entry;
          try
@@ -767,7 +768,7 @@
            continue;
          }

          for (EntryID id : entryIDList)
          for (EntryID id : entryIDSet)
          {
            Entry subordEntry;
            try
@@ -994,10 +995,10 @@
        final ByteString key = cursor.getKey();
        ByteString value = cursor.getValue();

        EntryIDSet entryIDList;
        EntryIDSet entryIDSet;
        try
        {
          entryIDList = new EntryIDSet(key, value);
          entryIDSet = newSetFromBytes(key, value);
        }
        catch (Exception e)
        {
@@ -1012,13 +1013,13 @@
          continue;
        }

        updateIndexStats(entryIDList);
        updateIndexStats(entryIDSet);

        if (entryIDList.isDefined())
        if (entryIDSet.isDefined())
        {
          EntryID prevID = null;

          for (EntryID id : entryIDList)
          for (EntryID id : entryIDSet)
          {
            if (prevID != null && id.equals(prevID) && logger.isTraceEnabled())
            {