[freenet-cvs] r12066 - trunk/freenet/src/freenet/store

[t...@freenetproject.org]

Author: toad
Date: 2007-03-09 17:59:07 +0000 (Fri, 09 Mar 2007)
New Revision: 12066

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Trivial refactoring

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-03-09 
17:57:49 UTC (rev 12065)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-03-09 
17:59:07 UTC (rev 12066)
@@ -875,10 +875,11 @@
        }
        System.out.println("Completing shrink"); // FIXME remove

-       WrapperManager.signalStarting(5*60*1000 + 
(unwantedMoveNums.length+freeEarlySlots.length-wantedMoveNums.length) * 100);
+       int totalUnwantedBlocks = unwantedMoveNums.length+freeEarlySlots.length;
+       WrapperManager.signalStarting(5*60*1000 + 
(totalUnwantedBlocks-wantedMoveNums.length) * 100);
        // If there are any slots left over, they must be free.
        freeBlocks.clear();
-       for(int 
i=wantedMoveNums.length;i<unwantedMoveNums.length+freeEarlySlots.length;i++) {
+       for(int i=wantedMoveNums.length;i<totalUnwantedBlocks;i++) {
                long blockNo;
                String reason;
                if(i < freeEarlySlots.length) {
@@ -892,7 +893,7 @@
                        LongBinding.longToEntry(blockNo, unwantedBlockEntry);
                        chkDB_blockNum.delete(t, unwantedBlockEntry);
                        if(i % 1024 == 0) {
-                               System.out.println("Trimmed surplus keys in 
database: 
"+(i-wantedMoveNums.length)+"/"+(unwantedMoveNums.length+freeEarlySlots.length-wantedMoveNums.length));
+                               System.out.println("Trimmed surplus keys in 
database: 
"+(i-wantedMoveNums.length)+"/"+(totalUnwantedBlocks-wantedMoveNums.length));
                                t.commit();
                                if(i == 
unwantedMoveNums.length+freeEarlySlots.length-1)
                                        t = null;