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

[t...@freenetproject.org]

Author: toad
Date: 2006-08-08 20:42:26 +0000 (Tue, 08 Aug 2006)
New Revision: 9973

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
don't use a transaction while shrinking

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-08-08 
20:02:29 UTC (rev 9972)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-08-08 
20:42:26 UTC (rev 9973)
@@ -271,7 +271,7 @@

        try {
                        t = environment.beginTransaction(null,null);
-                       c = chkDB_accessTime.openCursor(t,null);
+                       c = chkDB_accessTime.openCursor(null,null);

                        DatabaseEntry keyDBE = new DatabaseEntry();
                        DatabaseEntry blockDBE = new DatabaseEntry();
@@ -296,8 +296,6 @@
                                if(storeBlock.offset > Integer.MAX_VALUE) {
                                        // 2^31 * blockSize; ~ 70TB for CHKs, 
2TB for the others
                                        System.err.println("Store too big, 
doing quick shrink");
-                                       t.abort();
-                                       t = null;
                                        c.close();
                                        c = null;
                                        maybeQuickShrink(false);