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

[toad at freenetproject.org]

Author: toad
Date: 2008-01-04 15:24:40 +0000 (Fri, 04 Jan 2008)
New Revision: 16881

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Create LRU and keys file for each store.

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java	2008-01-04 15:14:22 UTC (rev 16880)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java	2008-01-04 15:24:40 UTC (rev 16881)
@@ -83,6 +83,8 @@
 	private final SecondaryDatabase accessTimeDB;
 	private final SecondaryDatabase blockNumDB;
 	private final RandomAccessFile storeRAF;
+	private final RandomAccessFile keysRAF;
+	private final RandomAccessFile lruRAF;
 	private final SortedLongSet freeBlocks;
 	private final String name;
 	
@@ -128,6 +130,8 @@
 		// Location of new store file
 		String newStoreFileName = typeName(type) + suffix + '.' + (isStore ? "store" : "cache");
 		File newStoreFile = new File(baseStoreDir, newStoreFileName);
+		File lruFile = new File(baseStoreDir, newStoreFileName+".lru");
+		File keysFile = new File(baseStoreDir, newStoreFileName+".keys");
 
 		String newDBPrefix = typeName(type)+ '-' +(isStore ? "store" : "cache")+ '-';
 		
@@ -142,7 +146,7 @@
 			// Try to load new database, reconstruct it if necessary.
 			// Don't need to create a new Environment, since we can use the old one.
 			
-			tmp = openStore(storeEnvironment, baseStoreDir, newDBPrefix, newStoreFile, newFixSecondaryFile, maxStoreKeys,
+			tmp = openStore(storeEnvironment, baseStoreDir, newDBPrefix, newStoreFile, lruFile, keysFile, newFixSecondaryFile, maxStoreKeys,
 					blockSize, headerSize, throwOnTooFewKeys, false, lastVersion, type, false, storeShutdownHook, tryDbLoad, reconstructFile);
 			
 		} else {
@@ -150,7 +154,7 @@
 			// No new store file, no new database.
 			// Start from scratch, with new store.
 			
-			tmp = openStore(storeEnvironment, baseStoreDir, newDBPrefix, newStoreFile, newFixSecondaryFile, 
+			tmp = openStore(storeEnvironment, baseStoreDir, newDBPrefix, newStoreFile, lruFile, keysFile, newFixSecondaryFile, 
 					maxStoreKeys, blockSize, headerSize, throwOnTooFewKeys, false, lastVersion, type, 
 					false, storeShutdownHook, tryDbLoad, reconstructFile);
 			
@@ -160,7 +164,7 @@
 	}
 
 	private static BerkeleyDBFreenetStore openStore(Environment storeEnvironment, File baseDir, String newDBPrefix, File newStoreFile,
-			File newFixSecondaryFile, long maxStoreKeys, int blockSize, int headerSize, boolean throwOnTooFewKeys,
+			File lruFile, File keysFile, File newFixSecondaryFile, long maxStoreKeys, int blockSize, int headerSize, boolean throwOnTooFewKeys,
 			boolean noCheck, int lastVersion, short type, boolean wipe, SemiOrderedShutdownHook storeShutdownHook, 
 			boolean tryDbLoad, File reconstructFile) throws DatabaseException, IOException {
 		
@@ -191,7 +195,7 @@
 		
 		try {
 			// First try just opening it.
-			return new BerkeleyDBFreenetStore(type, storeEnvironment, newDBPrefix, newStoreFile, newFixSecondaryFile,
+			return new BerkeleyDBFreenetStore(type, storeEnvironment, newDBPrefix, newStoreFile, lruFile, keysFile, newFixSecondaryFile,
 					maxStoreKeys, blockSize, headerSize, throwOnTooFewKeys, noCheck, wipe, storeShutdownHook, 
 					reconstructFile);
 		} catch (DatabaseException e) {
@@ -205,7 +209,7 @@
 				System.err.println("Cannot reconstruct SSK store/cache! Sorry, your SSK store will now be deleted...");
 				BerkeleyDBFreenetStore.wipeOldDatabases(storeEnvironment, newDBPrefix);
 				newStoreFile.delete();
-				return new BerkeleyDBFreenetStore(type, storeEnvironment, newDBPrefix, newStoreFile, newFixSecondaryFile,
+				return new BerkeleyDBFreenetStore(type, storeEnvironment, newDBPrefix, newStoreFile, lruFile, keysFile, newFixSecondaryFile,
 						maxStoreKeys, blockSize, headerSize, throwOnTooFewKeys, noCheck, wipe, storeShutdownHook, 
 						reconstructFile);
 			}
@@ -215,7 +219,7 @@
 			
 			// Reconstruct
 			
-			return new BerkeleyDBFreenetStore(storeEnvironment, newDBPrefix, newStoreFile, newFixSecondaryFile, 
+			return new BerkeleyDBFreenetStore(storeEnvironment, newDBPrefix, newStoreFile, lruFile, keysFile, newFixSecondaryFile, 
 					maxStoreKeys, blockSize, headerSize, type, noCheck, storeShutdownHook, reconstructFile);
 		}
 	}
@@ -240,7 +244,7 @@
 	* @throws DatabaseException
 	* @throws FileNotFoundException if the dir does not exist and could not be created
 	*/
-	private BerkeleyDBFreenetStore(short type, Environment env, String prefix, File storeFile, File fixSecondaryFile, long maxChkBlocks, int blockSize, int headerSize, boolean throwOnTooFewKeys, boolean noCheck, boolean wipe, SemiOrderedShutdownHook storeShutdownHook, File reconstructFile) throws IOException, DatabaseException {
+	private BerkeleyDBFreenetStore(short type, Environment env, String prefix, File storeFile, File lruFile, File keysFile, File fixSecondaryFile, long maxChkBlocks, int blockSize, int headerSize, boolean throwOnTooFewKeys, boolean noCheck, boolean wipe, SemiOrderedShutdownHook storeShutdownHook, File reconstructFile) throws IOException, DatabaseException {
 		logMINOR = Logger.shouldLog(Logger.MINOR, this);
 		this.storeType = type;
 		this.dataBlockSize = blockSize;
@@ -419,9 +423,19 @@
 		try {
 			if(!storeFile.exists())
 				if(!storeFile.createNewFile())
-					throw new DatabaseException("can't create a new file !");
+					throw new DatabaseException("can't create a new file "+storeFile+" !");
 			storeRAF = new RandomAccessFile(storeFile,"rw");
 			
+			if(!lruFile.exists())
+				if(!lruFile.createNewFile())
+					throw new DatabaseException("can't create a new file "+lruFile+" !");
+			lruRAF = new RandomAccessFile(lruFile,"rw");
+			
+			if(!keysFile.exists())
+				if(!keysFile.createNewFile())
+					throw new DatabaseException("can't create a new file "+keysFile+" !");
+			keysRAF = new RandomAccessFile(lruFile,"rw");
+			
 			boolean dontCheckForHolesShrinking = false;
 			
 			long chkBlocksInDatabase = highestBlockNumberInDatabase();
@@ -959,7 +973,7 @@
 	* @throws IOException If the store cannot be opened because of a filesystem problem.
 	* @throws FileNotFoundException if the dir does not exist and could not be created
 	*/
-	private BerkeleyDBFreenetStore(Environment env, String prefix, File storeFile, File fixSecondaryFile, long maxChkBlocks, int blockSize, int headerSize, short type, boolean noCheck, SemiOrderedShutdownHook storeShutdownHook, File reconstructFile) throws DatabaseException, IOException {
+	private BerkeleyDBFreenetStore(Environment env, String prefix, File storeFile, File lruFile, File keysFile, File fixSecondaryFile, long maxChkBlocks, int blockSize, int headerSize, short type, boolean noCheck, SemiOrderedShutdownHook storeShutdownHook, File reconstructFile) throws DatabaseException, IOException {
 		logMINOR = Logger.shouldLog(Logger.MINOR, this);
 		this.storeType = type;
 		this.dataBlockSize = blockSize;
@@ -1017,9 +1031,19 @@
 		// Initialize the store file
 		if(!storeFile.exists())
 			if(!storeFile.createNewFile())
-				throw new DatabaseException("can't create a new file !");
+				throw new DatabaseException("can't create a new file "+storeFile+" !");
 		storeRAF = new RandomAccessFile(storeFile,"rw");
 		
+		if(!lruFile.exists())
+			if(!lruFile.createNewFile())
+				throw new DatabaseException("can't create a new file "+lruFile+" !");
+		lruRAF = new RandomAccessFile(lruFile,"rw");
+		
+		if(!keysFile.exists())
+			if(!keysFile.createNewFile())
+				throw new DatabaseException("can't create a new file "+keysFile+" !");
+		keysRAF = new RandomAccessFile(lruFile,"rw");
+		
 		blocksInStore = 0;
 		
 		lastRecentlyUsed = 0;