From 78e976de8a533942ebc55bf5808c4e5e1de7469c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 04 Apr 2014 10:26:17 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 42 ++++++------------------------------------
1 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 6deb4fe..0890092 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -3271,52 +3271,22 @@
/**
* Removes a attribute index from disk.
*
- * @param index The attribute index to remove.
+ * @param attributeIndex The attribute index to remove.
* @throws DatabaseException If an JE database error occurs while attempting
* to delete the index.
*/
- public void deleteAttributeIndex(AttributeIndex index)
+ public void deleteAttributeIndex(AttributeIndex attributeIndex)
throws DatabaseException
{
- index.close();
+ attributeIndex.close();
Transaction txn = env.getConfig().getTransactional()
? beginTransaction() : null;
try
{
- if(index.equalityIndex != null)
+ for (Index index : attributeIndex.getAllIndexes())
{
- env.removeDatabase(txn, index.equalityIndex.getName());
- state.removeIndexTrustState(txn, index.equalityIndex);
- }
- if(index.presenceIndex != null)
- {
- env.removeDatabase(txn, index.presenceIndex.getName());
- state.removeIndexTrustState(txn, index.presenceIndex);
- }
- if(index.substringIndex != null)
- {
- env.removeDatabase(txn, index.substringIndex.getName());
- state.removeIndexTrustState(txn, index.substringIndex);
- }
- if(index.orderingIndex != null)
- {
- env.removeDatabase(txn, index.orderingIndex.getName());
- state.removeIndexTrustState(txn, index.orderingIndex);
- }
- if(index.approximateIndex != null)
- {
- env.removeDatabase(txn, index.approximateIndex.getName());
- state.removeIndexTrustState(txn, index.approximateIndex);
- }
- Map <String,Collection<Index>> extensibleIndexes =
- index.getExtensibleIndexes();
- for (String name : extensibleIndexes.keySet())
- {
- for (Index extensibleIndex : extensibleIndexes.get(name))
- {
- env.removeDatabase(txn, extensibleIndex.getName());
- state.removeIndexTrustState(txn, extensibleIndex);
- }
+ env.removeDatabase(txn, index.getName());
+ state.removeIndexTrustState(txn, index);
}
if (txn != null)
{
--
Gitblit v1.10.0