Merge lp:~pbeaman/akiban-persistit/improve-icheck into lp:akiban-persistit

[Peter Beaman]

Tiny changes to add important information to couple of Faults. No test because there is almost no logic to test.

New format:
  Tree persistit:shared Invalid right sibling address in page 81,326 after walking right 719 (path 9,835->110,879->75,079) depth=3

Old format:

 Tree persistit:shared Invalid right sibling address (path 9,835->110,879->81,326) depth=3

The old format is useless because the problem starts in page 75,079, not page 81,326 which is 719 jumps away.

[Nathan Williams (nwilliams)]

Looks good.

review: Approve

=== modified file 'src/main/java/com/persistit/IntegrityCheck.java'
--- src/main/java/com/persistit/IntegrityCheck.java	2012-06-08 00:06:12 +0000
+++ src/main/java/com/persistit/IntegrityCheck.java	2012-06-26 19:52:20 +0000
@@ -87,7 +87,6 @@
     private Value _value = new Value((Persistit) null);
     private MVVVisitor _versionVisitor = new MVVVisitor();
 
-
     private static class Counters {
 
         private long _indexPageCount = 0;
@@ -777,9 +776,12 @@
         counters.difference(_counters);
         faults = _faults.size() - faults;
         if (_csv) {
-            postMessage(String.format("\"%s\",\"%s\",%d,%s", resourceName(volume), "*", faults, counters.toCSV()), LOG_NORMAL);
+            postMessage(String.format("\"%s\",\"%s\",%d,%s", resourceName(volume), "*", faults, counters.toCSV()),
+                    LOG_NORMAL);
         } else {
-            postMessage("Volume " + resourceName(volume) + String.format(" Faults:%,3d ", faults) + counters.toString(), LOG_VERBOSE);
+            postMessage(
+                    "Volume " + resourceName(volume) + String.format(" Faults:%,3d ", faults) + counters.toString(),
+                    LOG_VERBOSE);
         }
 
         return faults == 0;
@@ -1078,13 +1080,15 @@
                 }
 
                 if (page <= 0 || page > Buffer.MAX_VALID_PAGE_ADDR) {
-                    addFault("Invalid right sibling address", buffer.getPageAddress(), level, 0);
+                    addFault(String.format("Invalid right sibling address in page %,d after walking right %,d", buffer
+                            .getPageAddress(), walkCount), startingBuffer.getPageAddress(), level, 0);
                     key.clear();
                     oldBuffer = buffer;
                     return startingBuffer;
                 }
                 if (walkCount-- <= 0) {
-                    addFault("More than " + Exchange.MAX_WALK_RIGHT + " unindexed siblings", page, level, 0);
+                    addFault("More than " + Exchange.MAX_WALK_RIGHT + " unindexed siblings", startingBuffer
+                            .getPageAddress(), level, 0);
                     key.clear();
                     oldBuffer = buffer;
                     return startingBuffer;