Author: toad
Date: 2008-01-05 19:46:08 +0000 (Sat, 05 Jan 2008)
New Revision: 16913
Modified:
trunk/freenet/src/freenet/keys/PubkeyVerifyException.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Drop unnecessary parameter
Modified: trunk/freenet/src/freenet/keys/PubkeyVerifyException.java
===================================================================
--- trunk/freenet/src/freenet/keys/PubkeyVerifyException.java 2008-01-05
19:42:37 UTC (rev 16912)
+++ trunk/freenet/src/freenet/keys/PubkeyVerifyException.java 2008-01-05
19:46:08 UTC (rev 16913)
@@ -8,4 +8,8 @@
super(e);
}
+ public PubkeyVerifyException(String msg) {
+ super(msg);
+ }
+
}
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-01-05 19:42:37 UTC (rev
16912)
+++ trunk/freenet/src/freenet/node/Node.java 2008-01-05 19:46:08 UTC (rev
16913)
@@ -1318,28 +1318,28 @@
Logger.normal(this, "Initializing CHK Datastore");
System.out.println("Initializing CHK Datastore
("+maxStoreKeys+" keys)");
chkDatastore =
BerkeleyDBFreenetStore.construct(lastVersion, storeDir, true, suffix,
maxStoreKeys,
- true, BerkeleyDBFreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile, this,
new CHKStore());
+ true, BerkeleyDBFreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile, new
CHKStore());
Logger.normal(this, "Initializing CHK Datacache");
System.out.println("Initializing CHK Datacache
("+maxCacheKeys+ ':' +maxCacheKeys+" keys)");
chkDatacache =
BerkeleyDBFreenetStore.construct(lastVersion, storeDir, false, suffix,
maxCacheKeys,
- true, BerkeleyDBFreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile, this,
new CHKStore());
+ true, BerkeleyDBFreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile, new
CHKStore());
Logger.normal(this, "Initializing pubKey Datastore");
System.out.println("Initializing pubKey Datastore");
pubKeyDatastore =
BerkeleyDBFreenetStore.construct(lastVersion, storeDir, true, suffix,
maxStoreKeys,
- true,
BerkeleyDBFreenetStore.TYPE_PUBKEY, storeEnvironment, random,
storeShutdownHook, tryDbLoad, reconstructFile, this, new PubkeyStore());
+ true,
BerkeleyDBFreenetStore.TYPE_PUBKEY, storeEnvironment, random,
storeShutdownHook, tryDbLoad, reconstructFile, new PubkeyStore());
Logger.normal(this, "Initializing pubKey Datacache");
System.out.println("Initializing pubKey Datacache
("+maxCacheKeys+" keys)");
pubKeyDatacache =
BerkeleyDBFreenetStore.construct(lastVersion, storeDir, false, suffix,
maxCacheKeys,
- true,
BerkeleyDBFreenetStore.TYPE_PUBKEY, storeEnvironment, random,
storeShutdownHook, tryDbLoad, reconstructFile, this, new PubkeyStore());
+ true,
BerkeleyDBFreenetStore.TYPE_PUBKEY, storeEnvironment, random,
storeShutdownHook, tryDbLoad, reconstructFile, new PubkeyStore());
// FIXME can't auto-fix SSK stores.
Logger.normal(this, "Initializing SSK Datastore");
System.out.println("Initializing SSK Datastore");
sskDatastore =
BerkeleyDBFreenetStore.construct(lastVersion, storeDir, true, suffix,
maxStoreKeys,
- false, BerkeleyDBFreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile, this,
new SSKStore(this));
+ false, BerkeleyDBFreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile, new
SSKStore(this));
Logger.normal(this, "Initializing SSK Datacache");
System.out.println("Initializing SSK Datacache
("+maxCacheKeys+" keys)");
sskDatacache =
BerkeleyDBFreenetStore.construct(lastVersion, storeDir, false, suffix,
maxStoreKeys,
- false, BerkeleyDBFreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile, this,
new SSKStore(this));
+ false, BerkeleyDBFreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile, new
SSKStore(this));
} 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-01-05
19:42:37 UTC (rev 16912)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-05
19:46:08 UTC (rev 16913)
@@ -114,7 +114,7 @@
public static BerkeleyDBFreenetStore construct(int lastVersion, File
baseStoreDir, boolean isStore,
String suffix, long maxStoreKeys, boolean
throwOnTooFewKeys,
short type, Environment storeEnvironment, RandomSource
random,
- SemiOrderedShutdownHook storeShutdownHook, boolean
tryDbLoad, File reconstructFile, GetPubkey pubkeyCache, StoreCallback callback)
throws DatabaseException, IOException {
+ SemiOrderedShutdownHook storeShutdownHook, boolean
tryDbLoad, File reconstructFile, StoreCallback callback) throws
DatabaseException, IOException {
/**
* Migration strategy:
@@ -159,7 +159,7 @@
// Don't need to create a new Environment, since we can
use the old one.
tmp = openStore(storeEnvironment, baseStoreDir,
newDBPrefix, newStoreFile, lruFile, keysFile, newFixSecondaryFile, maxStoreKeys,
- throwOnTooFewKeys, false, lastVersion,
type, false, storeShutdownHook, tryDbLoad, reconstructFile, pubkeyCache,
callback);
+ throwOnTooFewKeys, false, lastVersion,
type, false, storeShutdownHook, tryDbLoad, reconstructFile, callback);
} else {
@@ -168,7 +168,7 @@
tmp = openStore(storeEnvironment, baseStoreDir,
newDBPrefix, newStoreFile, lruFile, keysFile, newFixSecondaryFile,
maxStoreKeys, throwOnTooFewKeys, false,
lastVersion, type,
- false, storeShutdownHook, tryDbLoad,
reconstructFile, pubkeyCache, callback);
+ false, storeShutdownHook, tryDbLoad,
reconstructFile, callback);
}
@@ -178,7 +178,7 @@
private static BerkeleyDBFreenetStore openStore(Environment
storeEnvironment, File baseDir, String newDBPrefix, File newStoreFile,
File lruFile, File keysFile, File newFixSecondaryFile,
long maxStoreKeys, boolean throwOnTooFewKeys,
boolean noCheck, int lastVersion, short type, boolean
wipe, SemiOrderedShutdownHook storeShutdownHook,
- boolean tryDbLoad, File reconstructFile, GetPubkey
pubkeyCache, StoreCallback callback) throws DatabaseException, IOException {
+ boolean tryDbLoad, File reconstructFile, StoreCallback
callback) throws DatabaseException, IOException {
if(tryDbLoad) {
String dbName = newDBPrefix+"CHK";
@@ -232,7 +232,7 @@
// Reconstruct
return new BerkeleyDBFreenetStore(storeEnvironment,
newDBPrefix, newStoreFile, lruFile, keysFile, newFixSecondaryFile,
- maxStoreKeys, type, noCheck,
storeShutdownHook, reconstructFile, pubkeyCache, callback);
+ maxStoreKeys, type, noCheck,
storeShutdownHook, reconstructFile, callback);
}
}
@@ -1026,7 +1026,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 lruFile, File keysFile, File fixSecondaryFile, long
maxChkBlocks, short type, boolean noCheck, SemiOrderedShutdownHook
storeShutdownHook, File reconstructFile, GetPubkey pubkeyCache, StoreCallback
callback) throws DatabaseException, IOException {
+ private BerkeleyDBFreenetStore(Environment env, String prefix, File
storeFile, File lruFile, File keysFile, File fixSecondaryFile, long
maxChkBlocks, short type, boolean noCheck, SemiOrderedShutdownHook
storeShutdownHook, File reconstructFile, StoreCallback callback) throws
DatabaseException, IOException {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
this.storeType = type;
this.callback = callback;
@@ -1108,7 +1108,7 @@
lastRecentlyUsed = 0;
- reconstruct(type, pubkeyCache);
+ reconstruct(type);
blocksInStore = countCHKBlocksFromFile();
lastRecentlyUsed = getMaxRecentlyUsed();
@@ -1142,7 +1142,7 @@
}
}
- private void reconstruct(short type, GetPubkey pubkeyCache) throws
DatabaseException, IOException {
+ private void reconstruct(short type) throws DatabaseException,
IOException {
if(keysDB.count() != 0)
throw new IllegalStateException("Store must be empty
before reconstruction!");
if(type == TYPE_SSK) {
