Author: toad
Date: 2008-08-15 14:06:51 +0000 (Fri, 15 Aug 2008)
New Revision: 21905
Modified:
branches/db4o/freenet/.classpath
branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
branches/db4o/freenet/src/freenet/client/FECQueue.java
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
branches/db4o/freenet/src/freenet/client/async/USKManagerPersistent.java
branches/db4o/freenet/src/freenet/node/NodeCrypto.java
branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
branches/db4o/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
Log:
Use the 1.5 version of the db4o api.
Modified: branches/db4o/freenet/.classpath
===================================================================
--- branches/db4o/freenet/.classpath 2008-08-15 14:05:33 UTC (rev 21904)
+++ branches/db4o/freenet/.classpath 2008-08-15 14:06:51 UTC (rev 21905)
@@ -5,6 +5,6 @@
<classpathentry exported="true" kind="lib" path="lib/freenet-ext.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/usr/share/java/junit.jar"/>
- <classpathentry kind="lib" path="lib/db4o-6.4.48.10991-java1.2.jar"/>
+ <classpathentry kind="lib" path="lib/db4o-6.4.48.10991-java5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
2008-08-15 14:05:33 UTC (rev 21904)
+++ branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
2008-08-15 14:06:51 UTC (rev 21905)
@@ -177,13 +177,13 @@
/** Called from ArchiveManager.init() */
static void init(ObjectContainer container, ClientContext context,
final long nodeDBHandle) {
- ObjectSet set = container.query(new Predicate() {
+ ObjectSet<ArchiveExtractTag> set = container.query(new
Predicate<ArchiveExtractTag>() {
public boolean match(ArchiveExtractTag tag) {
return tag.nodeDBHandle == nodeDBHandle;
}
});
while(set.hasNext()) {
- ArchiveExtractTag tag = (ArchiveExtractTag) set.next();
+ ArchiveExtractTag tag = set.next();
tag.activateForExecution(container);
runPersistentOffThread(tag, context,
context.archiveManager, context.persistentBucketFactory);
}
Modified: branches/db4o/freenet/src/freenet/client/FECQueue.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/FECQueue.java 2008-08-15
14:05:33 UTC (rev 21904)
+++ branches/db4o/freenet/src/freenet/client/FECQueue.java 2008-08-15
14:06:51 UTC (rev 21905)
@@ -48,14 +48,14 @@
private final long nodeDBHandle;
public static FECQueue create(final long nodeDBHandle, ObjectContainer
container) {
- ObjectSet result = container.query(new Predicate() {
+ ObjectSet<FECQueue> result = container.query(new
Predicate<FECQueue>() {
public boolean match(FECQueue queue) {
if(queue.nodeDBHandle == nodeDBHandle) return
true;
return false;
}
});
if(result.hasNext()) {
- FECQueue queue = (FECQueue) result.next();
+ FECQueue queue = result.next();
container.activate(queue, 1);
return queue;
} else {
Modified:
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2008-08-15 14:05:33 UTC (rev 21904)
+++ branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2008-08-15 14:06:51 UTC (rev 21905)
@@ -100,8 +100,12 @@
if(cooldownWakeupTime > now)
Logger.error(this, "Already on the
cooldown queue for "+this, new Exception("error"));
else {
+ if(persistent)
+ container.activate(key, 5);
RequestScheduler sched =
context.getFetchScheduler(key instanceof ClientSSK);
cooldownWakeupTime =
sched.queueCooldown(key, this);
+ if(persistent)
+ container.deactivate(key, 5);
}
return true; // We will retry, just not yet.
See requeueAfterCooldown(Key).
} else {
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-08-15 14:05:33 UTC (rev 21904)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-08-15 14:06:51 UTC (rev 21905)
@@ -72,7 +72,7 @@
*/
public static ClientRequestSchedulerCore create(Node node, final
boolean forInserts, final boolean forSSKs, ObjectContainer selectorContainer,
long cooldownTime, PrioritizedSerialExecutor databaseExecutor,
ClientRequestScheduler sched, ClientContext context) {
final long nodeDBHandle = node.nodeDBHandle;
- ObjectSet results = selectorContainer.query(new Predicate() {
+ ObjectSet<ClientRequestSchedulerCore> results =
selectorContainer.query(new Predicate<ClientRequestSchedulerCore>() {
public boolean match(ClientRequestSchedulerCore core) {
if(core.nodeDBHandle != nodeDBHandle) return
false;
if(core.isInsertScheduler != forInserts) return
false;
@@ -82,7 +82,7 @@
});
ClientRequestSchedulerCore core;
if(results.hasNext()) {
- core = (ClientRequestSchedulerCore) (results.next());
+ core = results.next();
selectorContainer.activate(core, 2);
System.err.println("Loaded core...");
if(core.nodeDBHandle != nodeDBHandle) throw new
IllegalStateException("Wrong nodeDBHandle");
Modified: branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
2008-08-15 14:05:33 UTC (rev 21904)
+++ branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
2008-08-15 14:06:51 UTC (rev 21905)
@@ -229,14 +229,14 @@
public static void load(ObjectContainer container, ClientContext
context) {
final long handle = context.nodeDBHandle;
- ObjectSet results = container.query(new Predicate() {
+ ObjectSet<InsertCompressor> results = container.query(new
Predicate<InsertCompressor>() {
public boolean match(InsertCompressor comp) {
if(comp.nodeDBHandle == handle) return true;
return false;
}
});
while(results.hasNext()) {
- InsertCompressor comp = (InsertCompressor)
results.next();
+ InsertCompressor comp = results.next();
if(!container.ext().isActive(comp)) {
Logger.error(InsertCompressor.class,
"InsertCompressor not activated by query?!?!");
container.activate(comp, 1);
Modified:
branches/db4o/freenet/src/freenet/client/async/USKManagerPersistent.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/USKManagerPersistent.java
2008-08-15 14:05:33 UTC (rev 21904)
+++ branches/db4o/freenet/src/freenet/client/async/USKManagerPersistent.java
2008-08-15 14:06:51 UTC (rev 21905)
@@ -12,17 +12,15 @@
public class USKManagerPersistent {
static void init(USKManager manager, ObjectContainer container, final
ClientContext context) {
- ObjectSet set = container.query(new Predicate() {
+ ObjectSet<USKFetcherTag> set = container.query(new
Predicate<USKFetcherTag>() {
public boolean match(USKFetcherTag tag) {
if(tag.nodeDBHandle != context.nodeDBHandle)
return false;
if(tag.isFinished()) return false;
return true;
}
});
- while(set.hasNext()) {
- USKFetcherTag tag = (USKFetcherTag) set.next();
- tag.start(manager, context);
- }
+ while(set.hasNext())
+ set.next().start(manager, context);
}
}
Modified: branches/db4o/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeCrypto.java 2008-08-15
14:05:33 UTC (rev 21904)
+++ branches/db4o/freenet/src/freenet/node/NodeCrypto.java 2008-08-15
14:06:51 UTC (rev 21905)
@@ -538,14 +538,14 @@
public long getNodeHandle(ObjectContainer setupContainer) {
// Ignore warnings, this is db4o magic.
- ObjectSet result = setupContainer.query(new Predicate() {
+ ObjectSet<HandlePortTuple> result = setupContainer.query(new
Predicate<HandlePortTuple>() {
public boolean match(HandlePortTuple tuple) {
return tuple.portNumber == portNumber;
}
});
long handle;
if(result.hasNext()) {
- handle = ((HandlePortTuple)result.next()).handle;
+ handle = result.next().handle;
System.err.println("Retrieved database handle for node
on port "+portNumber+": "+handle);
return handle;
} else {
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
2008-08-15 14:05:33 UTC (rev 21904)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
2008-08-15 14:06:51 UTC (rev 21905)
@@ -27,7 +27,7 @@
}
public static FCPPersistentRoot create(final long nodeDBHandle,
ObjectContainer container) {
- ObjectSet set = container.query(new Predicate() {
+ ObjectSet<FCPPersistentRoot> set = container.query(new
Predicate<FCPPersistentRoot>() {
public boolean match(FCPPersistentRoot root) {
return root.nodeDBHandle == nodeDBHandle;
}
@@ -35,7 +35,7 @@
System.err.println("Count of roots: "+set.size());
if(set.hasNext()) {
System.err.println("Loaded FCP persistent root.");
- FCPPersistentRoot root = (FCPPersistentRoot) set.next();
+ FCPPersistentRoot root = set.next();
container.activate(root, 2);
root.globalForeverClient.init(container);
return root;
Modified:
branches/db4o/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
===================================================================
---
branches/db4o/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
2008-08-15 14:05:33 UTC (rev 21904)
+++
branches/db4o/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
2008-08-15 14:06:51 UTC (rev 21905)
@@ -164,14 +164,14 @@
}
public static PersistentTempBucketFactory load(File dir, String prefix,
RandomSource random, Random fastWeakRandom, ObjectContainer container, final
long nodeDBHandle) throws IOException {
- ObjectSet results = container.query(new Predicate() {
+ ObjectSet<PersistentTempBucketFactory> results =
container.query(new Predicate<PersistentTempBucketFactory>() {
public boolean match(PersistentTempBucketFactory
factory) {
if(factory.nodeDBHandle == nodeDBHandle) return
true;
return false;
}
});
if(results.hasNext()) {
- PersistentTempBucketFactory factory =
(PersistentTempBucketFactory) results.next();
+ PersistentTempBucketFactory factory = results.next();
container.activate(factory, 5);
factory.init(dir, prefix, random, fastWeakRandom);
return factory;
