Author: j16sdiz
Date: 2008-04-10 14:52:25 +0000 (Thu, 10 Apr 2008)
New Revision: 19143
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
tryDbLoad is always false, remove it.
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-04-10 14:51:58 UTC (rev
19142)
+++ trunk/freenet/src/freenet/node/Node.java 2008-04-10 14:52:25 UTC (rev
19143)
@@ -1322,8 +1322,6 @@
Environment env = null;
EnvironmentMutableConfig mutableConfig;
- boolean tryDbLoad = false;
-
// This can take some time
System.out.println("Starting database...");
try {
@@ -1460,33 +1458,33 @@
System.out.println("Initializing CHK Datastore
("+maxStoreKeys+" keys)");
chkDatastore = new CHKStore();
BerkeleyDBFreenetStore.construct(lastVersion, storeDir,
true, suffix, maxStoreKeys,
- FreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
chkDatastore);
+ FreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, 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,
- FreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
chkDatacache);
+ FreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook, reconstructFile, chkDatacache);
Logger.normal(this, "Initializing pubKey Datastore");
System.out.println("Initializing pubKey Datastore");
pubKeyDatastore = new PubkeyStore();
BerkeleyDBFreenetStore.construct(lastVersion, storeDir,
true, suffix, maxStoreKeys,
- FreenetStore.TYPE_PUBKEY,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
pubKeyDatastore);
+ FreenetStore.TYPE_PUBKEY,
storeEnvironment, random, storeShutdownHook, 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,
- FreenetStore.TYPE_PUBKEY,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
pubKeyDatacache);
+ FreenetStore.TYPE_PUBKEY,
storeEnvironment, random, storeShutdownHook, 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,
- FreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
sskDatastore);
+ FreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, 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,
- FreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, tryDbLoad, reconstructFile,
sskDatacache);
+ FreenetStore.TYPE_SSK,
storeEnvironment, random, storeShutdownHook, 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-04-10
14:51:58 UTC (rev 19142)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-04-10
14:52:25 UTC (rev 19143)
@@ -104,7 +104,7 @@
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 {
+ SemiOrderedShutdownHook storeShutdownHook, File
reconstructFile, StoreCallback callback) throws DatabaseException, IOException {
// Location of new store file
String newStoreFileName = typeName(type) + suffix + '.' +
(isStore ? "store" : "cache");
File newStoreFile = new File(baseStoreDir, newStoreFileName);
@@ -122,39 +122,13 @@
System.err.println("Opening database using "+newStoreFile);
return openStore(storeEnvironment, baseStoreDir, newDBPrefix,
newStoreFile, lruFile, keysFile, newFixSecondaryFile, maxStoreKeys,
- false, lastVersion, false, storeShutdownHook,
tryDbLoad, reconstructFile, callback);
+ false, lastVersion, false, storeShutdownHook,
reconstructFile, callback);
}
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 {
-
- if(tryDbLoad) {
- String dbName = newDBPrefix+"CHK";
- File dumpFilename = new File(baseDir, dbName+".dump");
- System.err.println("Trying to restore from
"+dumpFilename);
- try {
- FileInputStream fis = new
FileInputStream(dumpFilename);
- // DbDump used the default charset, so will
this.
- BufferedReader br = new BufferedReader(new
InputStreamReader(fis));
- DbLoad loader = new DbLoad();
- loader.setEnv(storeEnvironment);
- loader.setDbName(dbName);
- loader.setInputReader(br);
- loader.setNoOverwrite(false);
- loader.setTextFileMode(false);
- loader.load();
- fis.close();
- newFixSecondaryFile.createNewFile(); // force
reconstruct of secondary indexes
- } catch (IOException e) {
- System.err.println("Failed to reload database
"+dbName+": "+e);
- e.printStackTrace();
- }
-
- // Should just open now, although it will need to
reconstruct the secondary indexes.
- }
-
+ File reconstructFile, StoreCallback callback) throws
DatabaseException, IOException {
try {
// First try just opening it.
return new BerkeleyDBFreenetStore(storeEnvironment,
newDBPrefix, newStoreFile, lruFile, keysFile, newFixSecondaryFile,
