|
From: <car...@us...> - 2008-11-21 12:30:35
|
Revision: 82
http://polepos.svn.sourceforge.net/polepos/?rev=82&view=rev
Author: carlrosenberger
Date: 2008-11-21 12:30:30 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
cr + acv: Db4oDriver now uses non-static configuration fully, indexes work again.
Modified Paths:
--------------
trunk/polepos/settings/Circuits.properties
trunk/polepos/settings/DebugCircuits.properties
trunk/polepos/src/org/polepos/teams/db4o/BahrainDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/BarcelonaDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/Db4oCar.java
trunk/polepos/src/org/polepos/teams/db4o/Db4oDriver.java
trunk/polepos/src/org/polepos/teams/db4o/ImolaDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/MelbourneDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/MonacoDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/MontrealDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/NurburgringDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/SepangDb4o.java
Modified: trunk/polepos/settings/Circuits.properties
===================================================================
--- trunk/polepos/settings/Circuits.properties 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/settings/Circuits.properties 2008-11-21 12:30:30 UTC (rev 82)
@@ -75,3 +75,13 @@
montreal.size=10,30,100,300
+# istanbul
+#
+# [objects]: number of objects to store
+# [selects]: number of query runs, executing the same query
+
+istanbul.objects=3000,10000,30000,100000
+istanbul.selects=1000,1000,1000,1000
+
+
+
Modified: trunk/polepos/settings/DebugCircuits.properties
===================================================================
--- trunk/polepos/settings/DebugCircuits.properties 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/settings/DebugCircuits.properties 2008-11-21 12:30:30 UTC (rev 82)
@@ -81,3 +81,10 @@
montreal.size=5,10,20
+# istanbul
+#
+# [objects]: number of objects to store
+# [selects]: number of query runs, executing the same query
+
+istanbul.objects=1000,3000,10000
+istanbul.selects=10,10,10,10
Modified: trunk/polepos/src/org/polepos/teams/db4o/BahrainDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/BahrainDb4o.java 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/src/org/polepos/teams/db4o/BahrainDb4o.java 2008-11-21 12:30:30 UTC (rev 82)
@@ -21,9 +21,9 @@
import org.polepos.circuits.bahrain.*;
import org.polepos.data.*;
-import org.polepos.framework.*;
import com.db4o.*;
+import com.db4o.config.*;
import com.db4o.query.*;
@@ -33,13 +33,10 @@
*/
public class BahrainDb4o extends Db4oDriver implements BahrainDriver{
-
- public void takeSeatIn(Car car, TurnSetup setup) throws CarMotorFailureException{
-
- Db4o.configure().objectClass( Pilot.class ).objectField( "mName" ).indexed( true );
- Db4o.configure().objectClass( Pilot.class ).objectField( "mLicenseID" ).indexed( true );
-
- super.takeSeatIn(car, setup);
+ @Override
+ public void configure(Configuration config) {
+ indexField(config, Pilot.class , "mName");
+ indexField(config, Pilot.class , "mLicenseID");
}
public void write(){
Modified: trunk/polepos/src/org/polepos/teams/db4o/BarcelonaDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/BarcelonaDb4o.java 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/src/org/polepos/teams/db4o/BarcelonaDb4o.java 2008-11-21 12:30:30 UTC (rev 82)
@@ -20,19 +20,19 @@
package org.polepos.teams.db4o;
import org.polepos.circuits.barcelona.*;
-import org.polepos.framework.*;
import com.db4o.*;
+import com.db4o.config.*;
import com.db4o.query.*;
public class BarcelonaDb4o extends Db4oDriver implements BarcelonaDriver{
-
- public void takeSeatIn(Car car, TurnSetup setup) throws CarMotorFailureException{
- Db4o.configure().objectClass( B2.class ).objectField( "b2" ).indexed( true );
- super.takeSeatIn(car, setup);
- }
-
+
+ @Override
+ public void configure(Configuration config) {
+ indexField(config, B2.class, "b2");
+ }
+
public void write(){
int count = setup().getObjectCount();
begin();
Modified: trunk/polepos/src/org/polepos/teams/db4o/Db4oCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/Db4oCar.java 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/src/org/polepos/teams/db4o/Db4oCar.java 2008-11-21 12:30:30 UTC (rev 82)
@@ -52,9 +52,8 @@
/**
* Open database in the configured mode.
*/
- public ExtObjectContainer createObjectContainer()
+ public ExtObjectContainer createObjectContainer(Configuration config)
{
- final Configuration config = Db4o.newConfiguration();
configure(config);
if (!isClientServer()) {
return Db4o.openFile(config, Db4oTeam.PATH).ext();
Modified: trunk/polepos/src/org/polepos/teams/db4o/Db4oDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/Db4oDriver.java 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/src/org/polepos/teams/db4o/Db4oDriver.java 2008-11-21 12:30:30 UTC (rev 82)
@@ -23,24 +23,29 @@
import org.polepos.util.*;
import com.db4o.*;
+import com.db4o.config.*;
import com.db4o.ext.*;
import com.db4o.query.*;
/**
* @author Herkules, Andrew Zhang
*/
-public class Db4oDriver extends Driver {
+public abstract class Db4oDriver extends Driver {
private ExtObjectContainer _container;
- public void takeSeatIn(Car car, TurnSetup setup)
- throws CarMotorFailureException {
- super.takeSeatIn(car, setup);
- }
-
public void prepare() {
- _container = ((Db4oCar) car()).createObjectContainer();
+ Configuration config = Db4o.newConfiguration();
+ configure(config);
+ _container = ((Db4oCar) car()).createObjectContainer(config);
}
+
+ public abstract void configure(Configuration config);
+
+ protected void indexField(Configuration config, Class clazz, String fieldName) {
+ ObjectClass objectClass = config.objectClass(clazz);
+ objectClass.objectField(fieldName).indexed(true);
+ }
public void backToPit() {
_container.close();
Modified: trunk/polepos/src/org/polepos/teams/db4o/ImolaDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/ImolaDb4o.java 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/src/org/polepos/teams/db4o/ImolaDb4o.java 2008-11-21 12:30:30 UTC (rev 82)
@@ -22,9 +22,17 @@
import org.polepos.circuits.imola.*;
import org.polepos.data.*;
+import com.db4o.config.*;
+
public class ImolaDb4o extends Db4oDriver implements ImolaDriver {
+
+ @Override
+ public void configure(Configuration config) {
+
+ }
+
private long[] ids;
public void store() {
Modified: trunk/polepos/src/org/polepos/teams/db4o/MelbourneDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/MelbourneDb4o.java 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/src/org/polepos/teams/db4o/MelbourneDb4o.java 2008-11-21 12:30:30 UTC (rev 82)
@@ -23,6 +23,7 @@
import org.polepos.data.*;
import com.db4o.*;
+import com.db4o.config.*;
import com.db4o.query.*;
@@ -32,6 +33,11 @@
public class MelbourneDb4o extends Db4oDriver implements MelbourneDriver{
+ @Override
+ public void configure(Configuration config) {
+
+ }
+
public void write(){
int numobjects = setup().getObjectCount();
Modified: trunk/polepos/src/org/polepos/teams/db4o/MonacoDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/MonacoDb4o.java 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/src/org/polepos/teams/db4o/MonacoDb4o.java 2008-11-21 12:30:30 UTC (rev 82)
@@ -22,8 +22,16 @@
import org.polepos.circuits.monaco.*;
+import com.db4o.config.*;
+
public class MonacoDb4o extends Db4oDriver implements MonacoDriver{
+
+ @Override
+ public void configure(Configuration config) {
+
+ }
+
public void write() {
int commitctr = 0;
Modified: trunk/polepos/src/org/polepos/teams/db4o/MontrealDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/MontrealDb4o.java 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/src/org/polepos/teams/db4o/MontrealDb4o.java 2008-11-21 12:30:30 UTC (rev 82)
@@ -4,10 +4,16 @@
import org.polepos.circuits.montreal.*;
+import com.db4o.config.*;
import com.db4o.query.*;
public class MontrealDb4o extends Db4oDriver implements MontrealDriver {
+
+ @Override
+ public void configure(Configuration config) {
+
+ }
public void write() {
Modified: trunk/polepos/src/org/polepos/teams/db4o/NurburgringDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/NurburgringDb4o.java 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/src/org/polepos/teams/db4o/NurburgringDb4o.java 2008-11-21 12:30:30 UTC (rev 82)
@@ -21,9 +21,17 @@
import org.polepos.circuits.nurburgring.*;
+import com.db4o.config.*;
+
public class NurburgringDb4o extends Db4oDriver implements NurburgringDriver{
+
+ @Override
+ public void configure(Configuration config) {
+
+ }
+
public void write(){
int numobjects = setup().getObjectCount();
Modified: trunk/polepos/src/org/polepos/teams/db4o/SepangDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/SepangDb4o.java 2008-11-14 18:17:41 UTC (rev 81)
+++ trunk/polepos/src/org/polepos/teams/db4o/SepangDb4o.java 2008-11-21 12:30:30 UTC (rev 82)
@@ -21,10 +21,18 @@
import org.polepos.circuits.sepang.*;
+import com.db4o.config.*;
+
/**
* @author Herkules
*/
public class SepangDb4o extends Db4oDriver implements SepangDriver{
+
+ @Override
+ public void configure(Configuration config) {
+
+ }
+
long treeRootID;
Tree lastRead;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
