From a4b40df77f7bde226616cd132a4e5a31d8983f82 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Fri, 23 Feb 2007 19:22:39 +0000
Subject: [PATCH] Changed ID2Entry#getRecordCount to use the Database#count method in JE 3.1.0. The JE backend no longer keeps a count of entries in entry ID 0. Modified TestVerifyJob unit test to no longer simulate a incorrect entry count.
---
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java | 58 +++++++++++++++++++++-------------------------------------
1 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
index 6a2ff16..68c53ac 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2006 Sun Microsystems, Inc.
+ * Portions Copyright 2006 - 2007 Sun Microsystems, Inc.
*/
package org.opends.server.backends.jeb;
@@ -434,7 +434,7 @@
DatabaseEntry key = new DatabaseEntry();
DatabaseEntry data = new DatabaseEntry();
- Long storedEntryCount = null;
+ Long storedEntryCount = id2entry.getRecordCount();
OperationStatus status;
for (status = cursor.getFirst(key, data, LockMode.DEFAULT);
@@ -455,48 +455,32 @@
continue;
}
- if (entryID.longValue() == 0)
- {
- // This is the stored entry count.
- storedEntryCount = JebFormat.entryIDFromDatabase(data.getData());
- }
- else
- {
- keyCount++;
+ keyCount++;
- Entry entry;
- try
- {
- entry = JebFormat.entryFromDatabase(data.getData());
- }
- catch (Exception e)
- {
- assert debugException(CLASS_NAME, "iterateID2Entry", e);
- errorCount++;
- System.err.printf("Malformed id2entry record for ID %d:%n%s%n",
- entryID.longValue(),
- StaticUtils.bytesToHex(data.getData()));
- continue;
- }
-
- verifyEntry(entryID, entry);
- }
- }
- if (storedEntryCount != null)
- {
- if (keyCount != storedEntryCount)
+ Entry entry;
+ try
{
+ entry = JebFormat.entryFromDatabase(data.getData());
+ }
+ catch (Exception e)
+ {
+ assert debugException(CLASS_NAME, "iterateID2Entry", e);
errorCount++;
- System.err.printf("The stored entry count in id2entry (%d) does " +
- "not agree with the actual number of entry " +
- "records found (%d).%n",
- storedEntryCount, keyCount);
+ System.err.printf("Malformed id2entry record for ID %d:%n%s%n",
+ entryID.longValue(),
+ StaticUtils.bytesToHex(data.getData()));
+ continue;
}
+
+ verifyEntry(entryID, entry);
}
- else
+ if (keyCount != storedEntryCount)
{
errorCount++;
- System.err.printf("Missing record count in id2entry.%n");
+ System.err.printf("The stored entry count in id2entry (%d) does " +
+ "not agree with the actual number of entry " +
+ "records found (%d).%n",
+ storedEntryCount, keyCount);
}
}
finally
--
Gitblit v1.10.0