From 21223912856469a2eac9be72e23bcac4cc07c71a Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 24 Jul 2007 18:41:36 +0000
Subject: [PATCH] Fix for issue 1794: - Attribute index no longer need the backend index entry limit parameter on construction. This is now handled by the admin framework. - Updated test cases to reflect the change
---
opends/src/server/org/opends/server/backends/jeb/EntryContainer.java | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 47a80a4..207e6b7 100644
--- a/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -273,9 +273,7 @@
//TODO: When issue 1793 is fixed, use inherited default values in
//admin framework instead for the entry limit.
AttributeIndex index =
- new AttributeIndex(indexCfg, state,
- indexEntryLimit,
- env, this);
+ new AttributeIndex(indexCfg, state, env, this);
index.open();
attrIndexMap.put(indexCfg.getIndexAttribute(), index);
}
@@ -3782,19 +3780,6 @@
if(config.getBackendIndexEntryLimit() != cfg.getBackendIndexEntryLimit())
{
- for(AttributeIndex index : attrIndexMap.values())
- {
- if(index.setBackendIndexEntryLimit(cfg.getBackendIndexEntryLimit()))
- {
- adminActionRequired = true;
- int msgID = MSGID_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD;
- String message = getMessage(msgID,
- index.getAttributeType().getNameOrOID());
- messages.add(message);
- }
- index.setBackendIndexEntryLimit(cfg.getBackendIndexEntryLimit());
- }
-
if(id2children.setIndexEntryLimit(cfg.getBackendIndexEntryLimit()))
{
adminActionRequired = true;
@@ -3847,9 +3832,7 @@
try
{
AttributeIndex index =
- new AttributeIndex(cfg, state,
- indexEntryLimit,
- env, this);
+ new AttributeIndex(cfg, state, env, this);
index.open();
attrIndexMap.put(cfg.getIndexAttribute(), index);
}
--
Gitblit v1.10.0