From a72ae6523fc66a21ced5b5ab04c23e1629ae4d20 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Thu, 20 Dec 2007 17:45:49 +0000
Subject: [PATCH] Updated indexes to order the keys before inserting them into the database. This assures no deadlocks will occur between multiple adds and mods. Disabled lock timeouts for add and mod operations since deadlocks can not occur. This prevents txn aborts and op retry expiration due to lock timeouts of add and mod operations when the server is under high write load.
---
opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java | 91 +++++++++++++++++++++------------------------
1 files changed, 43 insertions(+), 48 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java b/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
index 4c17058..529db40 100644
--- a/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
+++ b/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
@@ -31,7 +31,6 @@
import org.opends.server.types.DebugLogLevel;
import org.opends.server.api.OrderingMatchingRule;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
@@ -110,7 +109,7 @@
* @param keys The set into which the generated keys will be inserted.
*/
public void indexEntry(Transaction txn, Entry entry,
- Set<ASN1OctetString> keys)
+ Set<byte[]> keys)
{
List<Attribute> attrList =
entry.getAttribute(attributeType);
@@ -133,31 +132,37 @@
*/
public void replaceEntry(Transaction txn,
Entry oldEntry, Entry newEntry,
- Set<ASN1OctetString> addKeys,
- Set<ASN1OctetString> delKeys)
+ Set<byte[]> addKeys,
+ Set<byte[]> delKeys)
{
- List<Attribute> attrList;
+ List<Attribute> newAttributes = newEntry.getAttribute(attributeType, true);
+ List<Attribute> oldAttributes = oldEntry.getAttribute(attributeType, true);
- attrList = oldEntry.getAttribute(attributeType);
- Set<ASN1OctetString> oldSet = new HashSet<ASN1OctetString>();
- indexAttribute(attrList, oldSet);
-
- attrList = newEntry.getAttribute(attributeType);
- Set<ASN1OctetString> newSet = new HashSet<ASN1OctetString>();
- indexAttribute(attrList, newSet);
-
- HashSet<ASN1OctetString> removeSet = new HashSet<ASN1OctetString>(oldSet);
- removeSet.removeAll(newSet);
- for (ASN1OctetString k : removeSet)
+ if(newAttributes == null)
{
- delKeys.add(k);
+ indexAttribute(oldAttributes, delKeys);
}
-
- HashSet<ASN1OctetString> addSet = new HashSet<ASN1OctetString>(newSet);
- addSet.removeAll(oldSet);
- for (ASN1OctetString k : addSet)
+ else
{
- addKeys.add(k);
+ if(oldAttributes == null)
+ {
+ indexAttribute(newAttributes, addKeys);
+ }
+ else
+ {
+ TreeSet<byte[]> newKeys =
+ new TreeSet<byte[]>(orderingRule);
+ TreeSet<byte[]> oldKeys =
+ new TreeSet<byte[]>(orderingRule);
+ indexAttribute(newAttributes, newKeys);
+ indexAttribute(oldAttributes, oldKeys);
+
+ addKeys.addAll(newKeys);
+ addKeys.removeAll(oldKeys);
+
+ delKeys.addAll(oldKeys);
+ delKeys.removeAll(newKeys);
+ }
}
}
@@ -176,14 +181,12 @@
*/
public void modifyEntry(Transaction txn, Entry oldEntry, Entry newEntry,
List<Modification> mods,
- Set<ASN1OctetString> addKeys,
- Set<ASN1OctetString> delKeys)
- throws DatabaseException
+ Set<byte[]> addKeys,
+ Set<byte[]> delKeys)
+ throws DatabaseException
{
List<Attribute> newAttributes = newEntry.getAttribute(attributeType, true);
List<Attribute> oldAttributes = oldEntry.getAttribute(attributeType, true);
- HashSet<AttributeValue> newValues;
- HashSet<AttributeValue> oldValues;
if(newAttributes == null)
{
@@ -197,26 +200,18 @@
}
else
{
- newValues = new HashSet<AttributeValue>();
- oldValues = new HashSet<AttributeValue>();
- for(Attribute a : newAttributes)
- {
- newValues.addAll(a.getValues());
- }
- for(Attribute a : oldAttributes)
- {
- oldValues.addAll(a.getValues());
- }
+ TreeSet<byte[]> newKeys =
+ new TreeSet<byte[]>(orderingRule);
+ TreeSet<byte[]> oldKeys =
+ new TreeSet<byte[]>(orderingRule);
+ indexAttribute(newAttributes, newKeys);
+ indexAttribute(oldAttributes, oldKeys);
- HashSet<AttributeValue> valuesToAdd =
- new HashSet<AttributeValue>(newValues);
- HashSet<AttributeValue> valuesToDel =
- new HashSet<AttributeValue>(oldValues);
- valuesToAdd.removeAll(oldValues);
- valuesToDel.removeAll(newValues);
+ addKeys.addAll(newKeys);
+ addKeys.removeAll(oldKeys);
- indexValues(valuesToDel, delKeys);
- indexValues(valuesToAdd, addKeys);
+ delKeys.addAll(oldKeys);
+ delKeys.removeAll(newKeys);
}
}
}
@@ -228,7 +223,7 @@
* @param keys The set into which the keys will be inserted.
*/
private void indexValues(Set<AttributeValue> values,
- Set<ASN1OctetString> keys)
+ Set<byte[]> keys)
{
if (values == null) return;
@@ -239,7 +234,7 @@
byte[] keyBytes =
orderingRule.normalizeValue(value.getValue()).value();
- keys.add(new ASN1OctetString(keyBytes));
+ keys.add(keyBytes);
}
catch (DirectoryException e)
{
@@ -257,7 +252,7 @@
* @param keys The set into which the keys will be inserted.
*/
private void indexAttribute(List<Attribute> attrList,
- Set<ASN1OctetString> keys)
+ Set<byte[]> keys)
{
if (attrList == null) return;
--
Gitblit v1.10.0