From b24aef17bc8d92cc5438783fc38bc290c562b3bf Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 10 Nov 2014 16:10:46 +0000
Subject: [PATCH] OPENDJ-1591 (CR-5206) Switch to SDK matching rules
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index 1e8ea08..8ad4c78 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -206,8 +206,8 @@
if (!nameToIndexes.containsKey(indexId))
{
//There is no index available for this index id. Create a new index.
- final Index extIndex = newExtensibleIndex(attrType, name, indexEntryLimit, indexer);
- nameToIndexes.put(indexId, extIndex);
+ final Index index = newAttributeIndex(attrType, name, indexEntryLimit, indexer);
+ nameToIndexes.put(indexId, index);
}
}
}
@@ -236,7 +236,7 @@
for (org.forgerock.opendj.ldap.spi.Indexer indexer : rule.getIndexers())
{
- final Index index = newExtensibleIndex(attrType, name, cfg.getIndexEntryLimit(), indexer);
+ final Index index = newAttributeIndex(attrType, name, cfg.getIndexEntryLimit(), indexer);
nameToIndexes.put(indexID, index);
}
}
@@ -259,12 +259,12 @@
}
}
- private Index newExtensibleIndex(AttributeType attrType, String name, final int indexEntryLimit,
+ private Index newAttributeIndex(AttributeType attrType, String name, final int indexEntryLimit,
org.forgerock.opendj.ldap.spi.Indexer indexer)
{
final String indexName = name + "." + indexer.getIndexID();
- final JEExtensibleIndexer extIndexer = new JEExtensibleIndexer(attrType, indexer);
- return newIndex(indexName, indexEntryLimit, extIndexer);
+ final AttributeIndexer attrIndexer = new AttributeIndexer(attrType, indexer);
+ return newIndex(indexName, indexEntryLimit, attrIndexer);
}
/**
@@ -918,21 +918,21 @@
validIndexIds.add(indexId);
if (!nameToIndexes.containsKey(indexId))
{
- Index extIndex = newExtensibleIndex(attrType, name, indexEntryLimit, indexer);
- openIndex(extIndex, adminActionRequired, messages);
- nameToIndexes.put(indexId, extIndex);
+ Index index = newAttributeIndex(attrType, name, indexEntryLimit, indexer);
+ openIndex(index, adminActionRequired, messages);
+ nameToIndexes.put(indexId, index);
}
else
{
- Index extensibleIndex = nameToIndexes.get(indexId);
- if (extensibleIndex.setIndexEntryLimit(indexEntryLimit))
+ Index index = nameToIndexes.get(indexId);
+ if (index.setIndexEntryLimit(indexEntryLimit))
{
adminActionRequired.set(true);
- messages.add(NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(extensibleIndex.getName()));
+ messages.add(NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(index.getName()));
}
if (indexConfig.getSubstringLength() != cfg.getSubstringLength())
{
- extensibleIndex.setIndexer(new JEExtensibleIndexer(attrType, indexer));
+ index.setIndexer(new AttributeIndexer(attrType, indexer));
}
}
}
@@ -1011,7 +1011,7 @@
final MatchingRule matchingRule = getMatchingRule(indexType, attrType);
for (org.forgerock.opendj.ldap.spi.Indexer indexer : matchingRule.getIndexers())
{
- index = newExtensibleIndex(attrType, name, indexEntryLimit, indexer);
+ index = newAttributeIndex(attrType, name, indexEntryLimit, indexer);
openIndex(index, adminActionRequired, messages);
nameToIndexes.put(indexId, index);
}
--
Gitblit v1.10.0