lee/heritrix3
1
0 Fork 0
mirror of https://github.com/internetarchive/heritrix3.git synced 2026-11-15 10:20:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

BDBJE updates, refactoring

Browse Source 
* BdbModule.java
    (openDatabase) all databases now 'managed'
    (getStoredMap) all reuse of prior data as for checkpoints
* (others)
    match above changes
This commit is contained in:
gojomo committed 2009-11-23 08:18:41 +00:00
1 parent 4127286a1c
commit 5b6b2fe954
6 files changed
+16 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

commons/src/main/java/org/archive/bdb/BdbModule.java
+6 -6
View File
@@ -321,7 +321,7 @@ public class BdbModule implements Lifecycle, Checkpointable, Closeable {
* @return
* @throws DatabaseException
*/
public Database openManagedDatabase(String name, BdbConfig config, boolean usePriorData)
public Database openDatabase(String name, BdbConfig config, boolean usePriorData)
throws DatabaseException {
if(!isRunning()) {
// proper initialization hasn't occurred
@@ -360,7 +360,7 @@ public class BdbModule implements Lifecycle, Checkpointable, Closeable {
public <K extends Serializable> StoredQueue<K> getStoredQueue(String dbname, Class<K> clazz, boolean b) {
try {
Database queueDb;
queueDb = openManagedDatabase(dbname,
queueDb = openDatabase(dbname,
StoredQueue.databaseConfig(), false);
return new StoredQueue<K>(queueDb, clazz, getClassCatalog());
} catch (DatabaseException e) {
@@ -637,10 +637,10 @@ public class BdbModule implements Lifecycle, Checkpointable, Closeable {
* @param allowDuplicates whether duplicate keys allowed
* @return
*/
public <K,V> DisposableStoredSortedMap<K, V> getStoredMap(String dbName, Class<K> keyClass, Class<V> valueClass, boolean allowDuplicates) {
public <K,V> DisposableStoredSortedMap<K, V> getStoredMap(String dbName, Class<K> keyClass, Class<V> valueClass, boolean allowDuplicates, boolean usePriorData) {
BdbConfig config = new BdbConfig();
config.setSortedDuplicates(true);
config.setAllowCreate(true);
config.setSortedDuplicates(allowDuplicates);
config.setAllowCreate(!usePriorData);
Database mapDb;
if(dbName==null) {
dbName = "tempMap-"+System.identityHashCode(this)+"-"+sn;
@@ -648,7 +648,7 @@ public class BdbModule implements Lifecycle, Checkpointable, Closeable {
}
final String openName = dbName;
try {
mapDb = openManagedDatabase(openName,config,false);
mapDb = openDatabase(openName,config,usePriorData);
} catch (DatabaseException e) {
throw new RuntimeException(e);
}