From 947ae41c50aeb216d43274502eb5fca152351aa4 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 07 Jun 2010 09:55:29 +0000
Subject: [PATCH] Fix issue #3404. Conflicting entries are now indexed by ds-sync-conflict attribute. This index is only updated when conflicts are detected and searched on for all deletes and modDN operations. Tested successfully against performance regression.

---
 opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java
index 0d269fd..11ef740 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2006-2009 Sun Microsystems, Inc.
+ *      Copyright 2006-2010 Sun Microsystems, Inc.
  */
 package org.opends.server.replication.plugin;
 
@@ -449,6 +449,25 @@
 
 
   /**
+   * Returns the lastChangeNumber when the entry DN was modified.
+   *
+   * @return The lastChangeNumber when the entry DN was modified.
+   */
+  public ChangeNumber getDNDate()
+  {
+    if (ADDDate == null)
+      return MODDNDate;
+
+    if (MODDNDate == null)
+      return ADDDate;
+
+    if (MODDNDate.older(ADDDate))
+      return MODDNDate;
+    else
+      return ADDDate;
+  }
+
+  /**
    * read the historical information from the entry attribute and
    * load it into the Historical object attached to the entry.
    * @param entry The entry which historical information must be loaded

--
Gitblit v1.10.0