From 9bac7b4f5bd4c3fa6abd420e17b90418663faec6 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.
---
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/AttributeIndexBuilder.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/AttributeIndexBuilder.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/AttributeIndexBuilder.java
index cc0f0e2..82188e9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/AttributeIndexBuilder.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/AttributeIndexBuilder.java
@@ -26,18 +26,13 @@
*/
package org.opends.server.backends.jeb;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Entry;
import static org.opends.server.util.StaticUtils.getFileForPath;
import com.sleepycat.je.DatabaseException;
import com.sleepycat.je.Transaction;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
import java.io.ByteArrayOutputStream;
import java.io.BufferedOutputStream;
import java.io.DataOutputStream;
@@ -180,29 +175,29 @@
if (oldEntry != null)
{
// This is an entry being replaced.
- Set<ASN1OctetString> addKeys = new HashSet<ASN1OctetString>();
- Set<ASN1OctetString> delKeys = new HashSet<ASN1OctetString>();
+ TreeSet<byte[]> addKeys = new TreeSet<byte[]>(indexer.getComparator());
+ TreeSet<byte[]> delKeys = new TreeSet<byte[]>(indexer.getComparator());
indexer.replaceEntry(txn, oldEntry, newEntry, addKeys, delKeys);
- for (ASN1OctetString k : delKeys)
+ for (byte[] k : delKeys)
{
- removeID(k.value(), entryID);
+ removeID(k, entryID);
}
- for (ASN1OctetString k : addKeys)
+ for (byte[] k : addKeys)
{
- insertID(k.value(), entryID);
+ insertID(k, entryID);
}
}
else
{
// This is a new entry.
- Set<ASN1OctetString> addKeys = new HashSet<ASN1OctetString>();
+ TreeSet<byte[]> addKeys = new TreeSet<byte[]>(indexer.getComparator());
indexer.indexEntry(txn, newEntry, addKeys);
- for (ASN1OctetString k : addKeys)
+ for (byte[] k : addKeys)
{
- insertID(k.value(), entryID);
+ insertID(k, entryID);
}
}
--
Gitblit v1.10.0