From eeed545264e26d4f8d417047adc77432a30e968a Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Tue, 11 Oct 2016 13:27:25 +0000
Subject: [PATCH] OPENDJ-3230-3223: upgrade to 3.5.0 should rebuild indexes using DN syntax
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
index 0c809d0..25b8767 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -37,6 +37,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -87,7 +88,7 @@
static int countErrors;
/** Contains all the indexes to rebuild. */
- private static final Set<String> indexesToRebuild = new HashSet<>();
+ private static final Set<String> indexesToRebuild = new LinkedHashSet<>();
/** A flag to avoid rebuild single indexes if 'rebuild all' is selected. */
private static boolean isRebuildAllIndexesIsPresent;
@@ -729,21 +730,20 @@
for (final Map.Entry<String, Set<String>> backendEntry : baseDNsForBackends.entrySet())
{
final String backend = backendEntry.getKey();
- final List<String> filteredIndexes = filterExistingIndexes(indexesToRebuild, backend);
- if (filteredIndexes.isEmpty())
+ if (indexesToRebuild.isEmpty())
{
logger.debug(INFO_UPGRADE_NO_INDEX_TO_REBUILD_FOR_BACKEND.get(backend));
continue;
}
final List<String> args = new ArrayList<>();
- for (final String indexToRebuild : filteredIndexes)
+ for (final String indexToRebuild : indexesToRebuild)
{
args.add("--index");
args.add(indexToRebuild);
}
final Set<String> baseDNs = backendEntry.getValue();
- rebuildIndex(INFO_UPGRADE_REBUILD_INDEX_STARTS.get(filteredIndexes, baseDNs), context, baseDNs, args);
+ rebuildIndex(INFO_UPGRADE_REBUILD_INDEX_STARTS.get(indexesToRebuild, baseDNs), context, baseDNs, args);
}
}
}
--
Gitblit v1.10.0