From f8ef0eed366445c5a341dbcc7882a7104c1cac1b Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Thu, 26 Jul 2007 16:31:34 +0000
Subject: [PATCH] This fixes issue 1971 and allows partial non-append imports of a backend:
---
opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index 4aa1c95..5cdbe74 100644
--- a/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -139,7 +139,8 @@
this.state = state;
AttributeType attrType = indexConfig.getIndexAttribute();
- String name = attrType.getNameOrOID();
+ String name =
+ entryContainer.getDatabasePrefix() + "_" + attrType.getNameOrOID();
int indexEntryLimit = indexConfig.getIndexEntryLimit();
if (indexConfig.getIndexType().contains(JEIndexCfgDefn.IndexType.EQUALITY))
@@ -1216,7 +1217,8 @@
try
{
AttributeType attrType = cfg.getIndexAttribute();
- String name = attrType.getNameOrOID();
+ String name =
+ entryContainer.getDatabasePrefix() + "_" + attrType.getNameOrOID();
int indexEntryLimit = cfg.getIndexEntryLimit();
if (cfg.getIndexType().contains(JEIndexCfgDefn.IndexType.EQUALITY))
@@ -1260,7 +1262,7 @@
entryContainer.exclusiveLock.lock();
try
{
- entryContainer.removeDatabase(equalityIndex);
+ entryContainer.deleteDatabase(equalityIndex);
equalityIndex = null;
}
catch(DatabaseException de)
@@ -1314,7 +1316,7 @@
entryContainer.exclusiveLock.lock();
try
{
- entryContainer.removeDatabase(presenceIndex);
+ entryContainer.deleteDatabase(presenceIndex);
presenceIndex = null;
}
catch(DatabaseException de)
@@ -1377,7 +1379,7 @@
entryContainer.exclusiveLock.lock();
try
{
- entryContainer.removeDatabase(substringIndex);
+ entryContainer.deleteDatabase(substringIndex);
substringIndex = null;
}
catch(DatabaseException de)
@@ -1431,7 +1433,7 @@
entryContainer.exclusiveLock.lock();
try
{
- entryContainer.removeDatabase(orderingIndex);
+ entryContainer.deleteDatabase(orderingIndex);
orderingIndex = null;
}
catch(DatabaseException de)
@@ -1485,7 +1487,7 @@
entryContainer.exclusiveLock.lock();
try
{
- entryContainer.removeDatabase(approximateIndex);
+ entryContainer.deleteDatabase(approximateIndex);
approximateIndex = null;
}
catch(DatabaseException de)
@@ -1595,7 +1597,7 @@
public String getName()
{
StringBuilder builder = new StringBuilder();
- builder.append(entryContainer.getContainerName());
+ builder.append(entryContainer.getDatabasePrefix());
builder.append("_");
builder.append(indexConfig.getIndexAttribute().getNameOrOID());
return builder.toString();
--
Gitblit v1.10.0