Author: toad
Date: 2008-02-07 14:17:34 +0000 (Thu, 07 Feb 2008)
New Revision: 17659
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
trunk/freenet/src/freenet/store/FreenetStore.java
Log:
Move TYPE_ constants to FreenetStore, and change pointers to BerkeleyDBFS to FS.
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-02-07 14:12:35 UTC (rev
17658)
+++ trunk/freenet/src/freenet/node/Node.java 2008-02-07 14:17:34 UTC (rev
17659)
@@ -86,6 +86,7 @@
import freenet.pluginmanager.PluginManager;
import freenet.store.BerkeleyDBFreenetStore;
import freenet.store.CHKStore;
+import freenet.store.FreenetStore;
import freenet.store.KeyCollisionException;
import freenet.store.PubkeyStore;
import freenet.store.SSKStore;
@@ -1248,12 +1249,12 @@
boolean[] isStores = new boolean[] { true, false, true,
false, true, false };
final short[] types = new short[] {
- BerkeleyDBFreenetStore.TYPE_CHK,
- BerkeleyDBFreenetStore.TYPE_CHK,
- BerkeleyDBFreenetStore.TYPE_PUBKEY,
- BerkeleyDBFreenetStore.TYPE_PUBKEY,
- BerkeleyDBFreenetStore.TYPE_SSK,
- BerkeleyDBFreenetStore.TYPE_SSK
+ FreenetStore.TYPE_CHK,
+ FreenetStore.TYPE_CHK,
+ FreenetStore.TYPE_PUBKEY,
+ FreenetStore.TYPE_PUBKEY,
+ FreenetStore.TYPE_SSK,
+ FreenetStore.TYPE_SSK
};
final int[] lengths = new int[] {
CHKBlock.TOTAL_HEADERS_LENGTH +
CHKBlock.DATA_LENGTH,
@@ -1402,33 +1403,33 @@
System.out.println("Initializing CHK Datastore
("+maxStoreKeys+" keys)");
chkDatastore = new CHKStore();
BerkeleyDBFreenetStore.construct(lastVersion, storeDir,
true, suffix, maxStoreKeys,
- BerkeleyDBFreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
chkDatastore);
+ FreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
chkDatastore);
Logger.normal(this, "Initializing CHK Datacache");
System.out.println("Initializing CHK Datacache
("+maxCacheKeys+ ':' +maxCacheKeys+" keys)");
chkDatacache = new CHKStore();
BerkeleyDBFreenetStore.construct(lastVersion, storeDir,
false, suffix, maxCacheKeys,
- BerkeleyDBFreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
chkDatacache);
+ FreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
chkDatacache);
Logger.normal(this, "Initializing pubKey Datastore");
System.out.println("Initializing pubKey Datastore");
pubKeyDatastore = new PubkeyStore();
BerkeleyDBFreenetStore.construct(lastVersion, storeDir,
true, suffix, maxStoreKeys,
- BerkeleyDBFreenetStore.TYPE_PUBKEY,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
pubKeyDatastore);
+ FreenetStore.TYPE_PUBKEY,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
pubKeyDatastore);
Logger.normal(this, "Initializing pubKey Datacache");
System.out.println("Initializing pubKey Datacache
("+maxCacheKeys+" keys)");
pubKeyDatacache = new PubkeyStore();
BerkeleyDBFreenetStore.construct(lastVersion, storeDir,
false, suffix, maxCacheKeys,
- BerkeleyDBFreenetStore.TYPE_PUBKEY,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
pubKeyDatacache);
+ FreenetStore.TYPE_PUBKEY,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
pubKeyDatacache);
// FIXME can't auto-fix SSK stores.
Logger.normal(this, "Initializing SSK Datastore");
System.out.println("Initializing SSK Datastore");
sskDatastore = new SSKStore(this);
BerkeleyDBFreenetStore.construct(lastVersion, storeDir,
true, suffix, maxStoreKeys,
- BerkeleyDBFreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
sskDatastore);
+ FreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
sskDatastore);
Logger.normal(this, "Initializing SSK Datacache");
System.out.println("Initializing SSK Datacache
("+maxCacheKeys+" keys)");
sskDatacache = new SSKStore(this);
BerkeleyDBFreenetStore.construct(lastVersion, storeDir,
false, suffix, maxStoreKeys,
- BerkeleyDBFreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
sskDatacache);
+ FreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
sskDatacache);
} catch (FileNotFoundException e1) {
String msg = "Could not open datastore: "+e1;
Logger.error(this, msg, e1);
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-02-07
14:12:35 UTC (rev 17658)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-02-07
14:17:34 UTC (rev 17659)
@@ -99,7 +99,7 @@
return new File(baseStoreDir, newStoreFileName);
}
- public static BerkeleyDBFreenetStore construct(int lastVersion, File
baseStoreDir, boolean isStore,
+ public static FreenetStore construct(int lastVersion, File
baseStoreDir, boolean isStore,
String suffix, long maxStoreKeys,
short type, Environment storeEnvironment, RandomSource
random,
SemiOrderedShutdownHook storeShutdownHook, boolean
tryDbLoad, File reconstructFile, StoreCallback callback) throws
DatabaseException, IOException {
@@ -137,7 +137,7 @@
File newFixSecondaryFile = new File(baseStoreDir,
"recreate_secondary_db-"+newStoreFileName);
- BerkeleyDBFreenetStore tmp;
+ FreenetStore tmp;
if(newStoreFile.exists()) {
@@ -163,7 +163,7 @@
return tmp;
}
- private static BerkeleyDBFreenetStore openStore(Environment
storeEnvironment, File baseDir, String newDBPrefix, File newStoreFile,
+ private static FreenetStore openStore(Environment storeEnvironment,
File baseDir, String newDBPrefix, File newStoreFile,
File lruFile, File keysFile, File newFixSecondaryFile,
long maxStoreKeys,
boolean noCheck, int lastVersion, boolean wipe,
SemiOrderedShutdownHook storeShutdownHook,
boolean tryDbLoad, File reconstructFile, StoreCallback
callback) throws DatabaseException, IOException {
@@ -980,10 +980,6 @@
}
}
- public static final short TYPE_CHK = 0;
- public static final short TYPE_PUBKEY = 1;
- public static final short TYPE_SSK = 2;
-
/**
* Recreate the index from the data file. Call this when the index has
been corrupted.
* @param reconstructFile
Modified: trunk/freenet/src/freenet/store/FreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/FreenetStore.java 2008-02-07 14:12:35 UTC
(rev 17658)
+++ trunk/freenet/src/freenet/store/FreenetStore.java 2008-02-07 14:17:34 UTC
(rev 17659)
@@ -9,6 +9,10 @@
*/
public interface FreenetStore {
+ public static final short TYPE_CHK = 0;
+ public static final short TYPE_PUBKEY = 1;
+ public static final short TYPE_SSK = 2;
+
/**
* Retrieve a block. Use the StoreCallback to convert it to the
appropriate type of block.
* @param routingKey The routing key i.e. the database key under which
the block is stored.
