Fix bug where ECL Draft Compat / lastChangeNumber is erroneous when changes...

matthew_swift

18.18.2010 9bc69c684cb74f017d672cabcc8f159b7a7bed43

Fix bug where ECL Draft Compat / lastChangeNumber is erroneous when changes have the same time (in the same ms)

 opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java

@@ -2039,7 +2039,9 @@

          // And count changes of this domain from the date of the
          // lastseqnum record (that does not refer to this domain)
          ec = rsd.getEligibleCount(newestDate, crossDomainEligibleCN);
          ChangeNumber cnx = new ChangeNumber(newestDate,
              changeNumberForLastSeqnum.getSeqnum(), 0);
          ec = rsd.getEligibleCount(cnx, crossDomainEligibleCN);

          if (domainForLastSeqnum.equalsIgnoreCase(rsd.getBaseDn()))
            ec--;

 opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java

@@ -3453,13 +3453,13 @@

  /**
   * This methods count the changes, server by server :
   * - from a start time
   * - from a start CN
   * - to (inclusive) an end point (the provided endCN).
   * @param startTime The provided start time.
   * @param startCN The provided start changeNumber.
   * @param endCN The provided end change number.
   * @return The number of changes between startTime and endCN.
   */
  public long getEligibleCount(long startTime, ChangeNumber endCN)
  public long getEligibleCount(ChangeNumber startCN, ChangeNumber endCN)
  {
    long sidRes = 0;
    long res = 0;
@@ -3471,8 +3471,9 @@
    {
      // process one sid
      int sid = serverIDIterator.next();
      ChangeNumber startCN = new ChangeNumber(startTime, 0, sid);
      sidRes += getCount(sid, startCN, endCN);
      ChangeNumber lStartCN =
        new ChangeNumber(startCN.getTime(), startCN.getSeqnum(), sid);
      sidRes += getCount(sid, lStartCN, endCN);
      res+=sidRes;
    }
    return res;