From cd12a61e138344e079c94337f75d32664ea4486c Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Thu, 09 Jul 2015 16:24:39 +0000
Subject: [PATCH] Apply code simplifications related to DN2ID and DN2URI from r12247, see CR-7414
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
index 429c384..5d65d8b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
@@ -2884,11 +2884,6 @@
/** List of VLV indexes. */
private final List<VLVIndex> vlvIndexes = new LinkedList<>();
- /** The DN2ID index. */
- private DN2ID dn2id;
- /** The DN2URI index. */
- private DN2URI dn2uri;
-
/** Total entries to be processed. */
private long totalEntries;
@@ -2901,6 +2896,10 @@
/** The entry container. */
private EntryContainer entryContainer;
+ private boolean reBuildDN2ID;
+ private boolean reBuildDN2URI;
+
+
/**
* Create an instance of the rebuild index manager using the specified
* parameters.
@@ -3045,7 +3044,7 @@
// If not in a 'clear degraded state' operation,
// need to rebuild the indexes.
setRebuildListIndexesTrusted(false);
- clearIndexes(true);
+ clearIndexes();
phaseOne();
if (isCanceled)
{
@@ -3076,11 +3075,11 @@
|| !entryContainer.getID2Children().isTrusted()
|| !entryContainer.getID2Subtree().isTrusted())
{
- dn2id = entryContainer.getDN2ID();
+ reBuildDN2ID = true;
}
if (mode == RebuildMode.ALL || entryContainer.getDN2URI() == null)
{
- dn2uri = entryContainer.getDN2URI();
+ reBuildDN2URI = true;
}
if (mode == RebuildMode.DEGRADED
|| entryContainer.getAttributeIndexes().isEmpty())
@@ -3151,18 +3150,13 @@
}
}
- private void clearIndexes(boolean onlyDegraded) throws DatabaseException
+ private void clearIndexes() throws DatabaseException
{
- // Clears all the entry's container databases which are containing the indexes
- if (!onlyDegraded)
+ if (reBuildDN2URI)
{
- // dn2uri does not have a trusted status.
entryContainer.clearDatabase(entryContainer.getDN2URI());
}
-
- if (!onlyDegraded
- || !entryContainer.getID2Children().isTrusted()
- || !entryContainer.getID2Subtree().isTrusted())
+ if (reBuildDN2ID)
{
entryContainer.clearDatabase(entryContainer.getDN2ID());
entryContainer.clearDatabase(entryContainer.getID2Children());
@@ -3173,7 +3167,7 @@
{
for (final Map.Entry<IndexKey, Index> mapEntry : indexMap.entrySet())
{
- if (!onlyDegraded || !mapEntry.getValue().isTrusted())
+ if (!mapEntry.getValue().isTrusted())
{
entryContainer.clearDatabase(mapEntry.getValue());
}
@@ -3196,7 +3190,7 @@
for (final VLVIndex vlvIndex : entryContainer.getVLVIndexes())
{
- if (!onlyDegraded || !vlvIndex.isTrusted())
+ if (!vlvIndex.isTrusted())
{
entryContainer.clearDatabase(vlvIndex);
}
@@ -3208,7 +3202,7 @@
{
try
{
- if (dn2id != null)
+ if (reBuildDN2ID)
{
EntryContainer ec = suffix.getEntryContainer();
ec.getID2Children().setTrusted(null, trusted);
@@ -3470,11 +3464,11 @@
throws DatabaseException, DirectoryException, JebException,
InterruptedException
{
- if (dn2id != null)
+ if (reBuildDN2ID)
{
processDN2ID(suffix, entry.getName(), entryID);
}
- if (dn2uri != null)
+ if (reBuildDN2URI)
{
processDN2URI(suffix, null, entry);
}
--
Gitblit v1.10.0