polepos-devel

[Polepos-devel] SF.net SVN: polepos:[156] trunk/polepos

[<car...@us...>]

Revision: 156
          http://polepos.svn.sourceforge.net/polepos/?rev=156&view=rev
Author:   carlrosenberger
Date:     2010-12-06 16:58:49 +0000 (Mon, 06 Dec 2010)

Log Message:
-----------
cr + acv: Complex now working for Hibernate 

Modified Paths:
--------------
    trunk/polepos/settings/Circuits.properties
    trunk/polepos/settings/DebugCircuits.properties
    trunk/polepos/settings/Jdbc.properties
    trunk/polepos/settings/Jdo.properties
    trunk/polepos/src/org/polepos/RunSeason.java
    trunk/polepos/src/org/polepos/circuits/flatobject/FlatObject.java
    trunk/polepos/src/org/polepos/enhance/AllEnhance.java
    trunk/polepos/src/org/polepos/framework/CircuitBase.java
    trunk/polepos/src/org/polepos/framework/ReflectiveCircuitBase.java
    trunk/polepos/src/org/polepos/framework/TurnSetupConfig.java
    trunk/polepos/src/org/polepos/runner/AbstractRunner.java
    trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/HibernateCar.java
    trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java
    trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/InheritanceHierarchyJdbc.java
    trunk/polepos/src/org/polepos/teams/jdo/ComplexJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
    trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
    trunk/polepos/src/org/polepos/teams/jdo/data/package.jdo

Added Paths:
-----------
    trunk/polepos/src/org/polepos/framework/Concurrent.java
    trunk/polepos/src/org/polepos/teams/jdo/data/vod.jdo

Modified: trunk/polepos/settings/Circuits.properties
===================================================================
--- trunk/polepos/settings/Circuits.properties	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/settings/Circuits.properties	2010-12-06 16:58:49 UTC (rev 156)
@@ -41,12 +41,11 @@
 #
 # [objects]: number of objects to select from
 # [selects]: number of queries run against all objects
+complex.objects=3,5,7
+complex.depth=6,6,6
+complex.selects=50,50,50
 
-complex.depth=7
-complex.objects=5,5,5
-complex.selects=100,100,100
 
-
 # Settings for all circuits in the database benchmark.
 
 # melbourne

Modified: trunk/polepos/settings/DebugCircuits.properties
===================================================================
--- trunk/polepos/settings/DebugCircuits.properties	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/settings/DebugCircuits.properties	2010-12-06 16:58:49 UTC (rev 156)
@@ -46,15 +46,11 @@
 #
 # [objects]: number of objects to select from
 # [selects]: number of queries run against all objects
-#complex.depth=5,6,7
-#complex.objects=5,5,5
-#complex.selects=100,100,100
-complex.depth=5
-complex.objects=5
-complex.selects=50
+complex.objects=1,2,3
+complex.depth=4,4,4
+complex.selects=50,50,50
 
 
-
 # melbourne
 #
 # [objects]: number of objects to be written, read and deleted

Modified: trunk/polepos/settings/Jdbc.properties
===================================================================
--- trunk/polepos/settings/Jdbc.properties	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/settings/Jdbc.properties	2010-12-06 16:58:49 UTC (rev 156)
@@ -23,7 +23,8 @@
 # hibernate=hsqldb
 #
 # Client/Server 
-hibernate=mysql,postgresql 
+hibernate=mysql,postgresql
+ 
 
 
 #

Modified: trunk/polepos/settings/Jdo.properties
===================================================================
--- trunk/polepos/settings/Jdo.properties	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/settings/Jdo.properties	2010-12-06 16:58:49 UTC (rev 156)
@@ -22,10 +22,10 @@
 datanucleus.website=http://www.datanucleus.org
 # 
 # Embedded
-# datanucleus.jdbc=hsqldb
+datanucleus.jdbc=hsqldb
 # 
 # Client/Server
-datanucleus.jdbc=mysql
+# datanucleus.jdbc=mysql
 
 
 #

Modified: trunk/polepos/src/org/polepos/RunSeason.java
===================================================================
--- trunk/polepos/src/org/polepos/RunSeason.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/RunSeason.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -19,8 +19,11 @@
 
 package org.polepos;
 
+import java.io.*;
+
 import org.polepos.circuits.bahrain.*;
 import org.polepos.circuits.barcelona.*;
+import org.polepos.circuits.complex.*;
 import org.polepos.circuits.flatobject.*;
 import org.polepos.circuits.imola.*;
 import org.polepos.circuits.inheritancehierarchy.*;
@@ -51,7 +54,7 @@
  * 
  */
 public class RunSeason extends AbstractRunner {
-
+	
 	public static void main(String[] args) {
 		new RunSeason().run();
 	}
@@ -60,9 +63,10 @@
 	public CircuitBase[] circuits() {
 		return new CircuitBase[] {
 				
-				// new ReflectiveCircuitBase(FlatObject.class),
-				// new ReflectiveCircuitBase(NestedLists.class),
-				// new ReflectiveCircuitBase(InheritanceHierarchy.class),
+//				new ReflectiveCircuitBase(FlatObject.class),
+//				new ReflectiveCircuitBase(NestedLists.class),
+//				new ReflectiveCircuitBase(InheritanceHierarchy.class),
+//				new ReflectiveCircuitBase(Complex.class),
 				
 				new Melbourne(), 
 				new Sepang(), 

Modified: trunk/polepos/src/org/polepos/circuits/flatobject/FlatObject.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/flatobject/FlatObject.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/circuits/flatobject/FlatObject.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -22,6 +22,7 @@
 import org.polepos.framework.*;
 
 @CircuitDescription("write, query, update and delete indexed flat objects")
+@Concurrent
 public interface FlatObject
 {
 	@Order(1)

Modified: trunk/polepos/src/org/polepos/enhance/AllEnhance.java
===================================================================
--- trunk/polepos/src/org/polepos/enhance/AllEnhance.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/enhance/AllEnhance.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -23,10 +23,9 @@
 	
 	public static void main(String[] args) throws Throwable {
 
-//      Call Versant's enhancer directly.		
-		VodEnhancer.main(null);
+//		VodEnhancer.main(null);
 		
-//		JdoEnhance.main(null);
+		JdoEnhance.main(null);
 		
 //		new JviEnhance().runWithoutSystemExit();
 		

Modified: trunk/polepos/src/org/polepos/framework/CircuitBase.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/CircuitBase.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/framework/CircuitBase.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -222,7 +222,6 @@
 		try {
 			driver.takeSeatIn(car, setup);
 		} catch (CarMotorFailureException e1) {
-			// FIXME reasonable exception handling
 			throw new RuntimeException("Circuit aborted", e1);
 		}
 		

Added: trunk/polepos/src/org/polepos/framework/Concurrent.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/Concurrent.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/framework/Concurrent.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -0,0 +1,28 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.framework;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Concurrent {
+
+}


Property changes on: trunk/polepos/src/org/polepos/framework/Concurrent.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/framework/ReflectiveCircuitBase.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/ReflectiveCircuitBase.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/framework/ReflectiveCircuitBase.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -51,14 +51,20 @@
 		}
 		
 	}
+	
+	@Override
+	public boolean isConcurrency() {
+		Concurrent concurrent = _driverClass.getAnnotation(Concurrent.class);
+		return concurrent != null;
+	}
 
 	@Override
 	public String description() {
-		CircuitDescription annotation = _driverClass.getAnnotation(CircuitDescription.class);
-		if(annotation == null){
+		CircuitDescription description = _driverClass.getAnnotation(CircuitDescription.class);
+		if(description == null){
 			throw new IllegalStateException("Class " + _driverClass.getName()+ " has to be annotated with " + CircuitDescription.class.getName());
 		}
-		return annotation.value();
+		return description.value();
 	}
 
 	@Override

Modified: trunk/polepos/src/org/polepos/framework/TurnSetupConfig.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/TurnSetupConfig.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/framework/TurnSetupConfig.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -72,10 +72,7 @@
                 int[] values = mProperties.getIntArray(circuit.internalName() + "." + AVAILABLE_SETTINGS[i]);
                 if(values!= null && values.length > 0){
 
-                	
-
                 	// For concurrency, we only use the first setup parameters.
-                	
                 	setupProperties.add(new SetupProperty(AVAILABLE_SETTINGS[i], values[0]));
                 	
                 }

Modified: trunk/polepos/src/org/polepos/runner/AbstractRunner.java
===================================================================
--- trunk/polepos/src/org/polepos/runner/AbstractRunner.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/runner/AbstractRunner.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -38,7 +38,9 @@
 		circuits.addAll(distinctCircuits);
         if(turnSetupConfig.runConcurrency()){
 	        for(Circuit circuit : distinctCircuits){
-	        	circuits.add(new ConcurrencyCircuit(circuit));
+	        	if(circuit.isConcurrency()){
+	        		circuits.add(new ConcurrencyCircuit(circuit));
+	        	}
 	        }
         }
 		for(Circuit circuit: circuits){

Modified: trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -24,11 +24,13 @@
 
 import org.hibernate.*;
 import org.polepos.circuits.complex.*;
+import org.polepos.framework.*;
 import org.polepos.teams.hibernate.data.*;
 
 
 public class ComplexHibernate extends HibernateDriver implements Complex {
 	
+	
 	@Override
 	public void write() {
 		Transaction tx = begin();
@@ -45,8 +47,8 @@
 	}
 
 	private ComplexHolder0 root() {
-		String from = "from org.polepos.teams.hibernate.data.ComplexRoot";
-		Iterator it = db().iterate(from);
+		String query = "from org.polepos.teams.hibernate.data.ComplexRoot";
+		Iterator it = db().iterate(query);
 		if(! it.hasNext()){
 			throw new IllegalStateException("no ComplexRoot found");
 		}
@@ -54,70 +56,66 @@
 		if(it.hasNext()){
 			throw new IllegalStateException("More than one ComplexRoot found");
 		}
-		ComplexHolder0 holder = root.getHolder();
-		return holder;
+		return root.getHolder();
 	}
 
 	@Override
 	public void query() {
-//		int selectCount = selectCount();
-//		int firstInt = objectCount() * objectCount() + objectCount();
-//		int lastInt = firstInt + (objectCount() * objectCount() * objectCount()) - 1;
-//		int currentInt = firstInt;
-//		for (int run = 0; run < selectCount; run++) {
-//			
-//			Query query = null;
-//			query.constrain(ComplexHolder2.class);
-//			query.descend("_i2").constrain(currentInt);
-//			ObjectSet<ComplexHolder2> result = query.execute();
-//			if(result.size() != 1) {
-//				throw new IllegalStateException("" + result.size());
-//			}
-//			ComplexHolder2 holder = result.get(0);
-//			
-//			addToCheckSum(holder.ownCheckSum());
-//			
-//			currentInt++;
-//			if(currentInt > lastInt){
-//				currentInt = firstInt;
-//			}
-//		}
-//		
+		int selectCount = selectCount();
+		int firstInt = objectCount() * objectCount() + objectCount();
+		int lastInt = firstInt + (objectCount() * objectCount() * objectCount()) - 1;
+		int currentInt = firstInt;
+		for (int run = 0; run < selectCount; run++) {
+			String query = "from org.polepos.teams.hibernate.data.ComplexHolder2 where i2=" + currentInt;
+			Iterator it = db().iterate(query);
+			if(! it.hasNext()){
+				throw new IllegalStateException("no ComplexHolder2 found");
+			}
+			ComplexHolder2 holder = (ComplexHolder2) it.next();
+			addToCheckSum(holder.ownCheckSum());
+			if(it.hasNext()){
+				throw new IllegalStateException("More than one ComplexHolder2 found");
+			}
+			currentInt++;
+			if(currentInt > lastInt){
+				currentInt = firstInt;
+			}
+		}
 	}
 	
 	@Override
 	public void update() {
-//		ComplexHolder0 holder = root();
-//		holder.traverse(new NullVisitor(),
-//				new Visitor<ComplexHolder0>() {
-//			@Override
-//			public void visit(ComplexHolder0 holder) {
-//				addToCheckSum(holder.ownCheckSum());
-//				holder.setName("updated");
-//				ComplexHolder2 newChild = new ComplexHolder2();
-//				newChild._i1 = 1;
-//				newChild._i2 = 2;
-//				newChild.setName("added");
-//				holder.addChild(newChild);
-//				store(holder.getChildren());
-//				store(holder);
-//			}
-//		});
+		Transaction tx = begin();
+		ComplexHolder0 holder = root();
+		holder.traverse(new NullVisitor<ComplexHolder0>(),
+				new Visitor<ComplexHolder0>() {
+			@Override
+			public void visit(ComplexHolder0 holder) {
+				addToCheckSum(holder.ownCheckSum());
+				holder.setName("updated");
+				ComplexHolder2 newChild = new ComplexHolder2();
+				newChild.setI1(1);
+				newChild.setI2(2);
+				newChild.setName("added");
+				holder.addChild(newChild);
+				store(holder);
+			}
+		});
+		tx.commit();
 	}
 
 	@Override
 	public void delete() {
-//		ComplexHolder0 holder = root();
-//		
-//		holder.traverse(
-//			new NullVisitor(),
-//			new Visitor<ComplexHolder0>() {
-//			@Override
-//			public void visit(ComplexHolder0 holder) {
-//				addToCheckSum(holder.ownCheckSum());
-//				db().delete(holder);
-//			}
-//		});
+		ComplexHolder0 holder = root();
+		holder.traverse(
+			new NullVisitor<ComplexHolder0>(),
+			new Visitor<ComplexHolder0>() {
+			@Override
+			public void visit(ComplexHolder0 holder) {
+				addToCheckSum(holder.ownCheckSum());
+				db().delete(holder);
+			}
+		});
 	}
 
 }

Modified: trunk/polepos/src/org/polepos/teams/hibernate/HibernateCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/HibernateCar.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/teams/hibernate/HibernateCar.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -43,10 +43,10 @@
     
     public Session openSession() throws CarMotorFailureException{
     	
-        if ( _sessionFactory == null) {
-            _sessionFactory = getSessionFactory();
-        }
-        
+    	if(_sessionFactory == null){
+    		_sessionFactory = getSessionFactory();
+    	}
+                
         Session session = _sessionFactory.openSession();
         if("hsqldb".equals(_dbType)){
             session.createSQLQuery("SET WRITE_DELAY 0").executeUpdate();
@@ -54,6 +54,13 @@
 		return session;
     }
     
+	public void recreateSessionFactory() {
+		if(_sessionFactory != null){
+			_sessionFactory.close();
+		}
+		_sessionFactory = getSessionFactory();
+	}
+    
     public void closeSession(Session session){
     	session.close();
     }
@@ -116,4 +123,6 @@
         return factory;         
     }
 
+
+
 }

Modified: trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -83,16 +83,7 @@
 	@Override
 	public void setUp() {
 		for(int i = 0; i < _cars.length;i++){
-			Session session = null;
-			try {
-				session = ((HibernateCar)_cars[i]).openSession();
-			} catch (CarMotorFailureException e) {
-				e.printStackTrace();
-			}
-			for (Class clazz : persistentClasses()) {
-				deleteExtent(session, clazz);	
-			}
-			((HibernateCar)_cars[i]).closeSession(session);
+			((HibernateCar)_cars[i]).recreateSessionFactory();
 		}
 	}
 

Modified: trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -34,13 +34,13 @@
 	
 	private static final int ROOT_ID = 1; 
 	
-	private static final String HOLDER_TABLE0 = "complexHolder0";
+	private static final String HOLDER_TABLE0 = "complexHolderJdbc0";
 	
     private static final String[] HOLDER_TABLES = new String[]{
-        "complexHolder1",
-        "complexHolder2",
-        "complexHolder3",
-        "complexHolder4",
+        "complexHolderJdbc1",
+        "complexHolderJdbc2",
+        "complexHolderJdbc3",
+        "complexHolderJdbc4",
     };
     
     private static final String CHILDREN_TABLE = "children";
@@ -108,11 +108,11 @@
 		_idGenerator = new IdGenerator(ROOT_ID);
 		final Stack<Integer> parentIds = new Stack<Integer>();
 		
-		final PreparedStatement complexHolder0Stat = prepareStatement("insert into complexHolder0 (id, name, type) values (?,?,?)");
+		final PreparedStatement complexHolder0Stat = prepareStatement("insert into " + HOLDER_TABLE0 + " (id, name, type) values (?,?,?)");
 		final PreparedStatement[] complexHolderStats = new PreparedStatement[4];
 		for (int i = 0; i < complexHolderStats.length; i++) {
+			String table = HOLDER_TABLES[i];
 			int idx = i + 1;
-			String table = "complexHolder" + idx;
 			complexHolderStats[i] = prepareStatement("insert into " + table + "(id, i" +  idx + ") values (?,?)"); 
 		}
 		final PreparedStatement arrayStat = prepareStatement("insert into tarray (parent, child, pos) values (?,?,?)");
@@ -241,13 +241,11 @@
 	private ComplexHolder0 readRootInternal() {
 		ComplexHolder0 holder = null;
 		try {
-			final PreparedStatement complexHolder0Stat = 
-				prepareStatement("select * from complexHolder0 where id=?");
-			
+			final PreparedStatement complexHolder0Stat = prepareStatement("select * from " + HOLDER_TABLE0 + " where id=?");
 			final PreparedStatement[] complexHolderStats = new PreparedStatement[4];
 			for (int i = 0; i < complexHolderStats.length; i++) {
 				int idx = i + 1;
-				String table = "complexHolder" + idx;
+				String table = HOLDER_TABLES[i];
 				complexHolderStats[i] = prepareStatement("select * from " + table + " where id=?"); 
 			}
 			final PreparedStatement arrayStat = prepareStatement("select * from " + ARRAY_TABLE + " where parent=? order by pos");
@@ -396,16 +394,16 @@
 		int currentInt = firstInt;
 		for (int run = 0; run < selectCount; run++) {
 			StringBuilder sb = new StringBuilder();
-			sb.append("select * from complexHolder0 ");
-			sb.append("INNER JOIN complexHolder1 ");
-			sb.append("on complexHolder0.id = complexHolder1.id ");
-			sb.append("INNER JOIN complexHolder2 ");
-			sb.append("on complexHolder0.id = complexHolder2.id ");
-			sb.append("LEFT OUTER JOIN complexHolder3 ");
-			sb.append("on complexHolder0.id = complexHolder3.id ");
-			sb.append("LEFT OUTER JOIN complexHolder4 ");
-			sb.append("on complexHolder0.id = complexHolder4.id ");
-			sb.append("where complexHolder2.i2 = ?");
+			sb.append("select * from " + HOLDER_TABLE0);
+			sb.append(" INNER JOIN " + HOLDER_TABLES[0]);
+			sb.append(" on " + HOLDER_TABLE0 + ".id = " + HOLDER_TABLES[0] + ".id ");
+			sb.append(" INNER JOIN " + HOLDER_TABLES[1]);
+			sb.append(" on " + HOLDER_TABLE0 + ".id = " + HOLDER_TABLES[1] + ".id ");
+			sb.append(" LEFT OUTER JOIN " + HOLDER_TABLES[2]);
+			sb.append(" on " + HOLDER_TABLE0 + ".id = " + HOLDER_TABLES[2] + ".id ");
+			sb.append(" LEFT OUTER JOIN " + HOLDER_TABLES[3]);
+			sb.append(" on " + HOLDER_TABLE0 + ".id = " + HOLDER_TABLES[3] + ".id ");
+			sb.append(" where " + HOLDER_TABLES[1] + ".i2 = ?");
 			PreparedStatement stat = prepareStatement(sb.toString());
 			
 			try {
@@ -440,12 +438,12 @@
 
 	@Override
 	public void update() {
-		final PreparedStatement nameStat = prepareStatement("update complexholder0 set name=? where id=?");
-		final PreparedStatement complexHolder0Stat = prepareStatement("insert into complexHolder0 (id, name, type) values (?,?,?)");
+		final PreparedStatement nameStat = prepareStatement("update " + HOLDER_TABLE0 + " set name=? where id=?");
+		final PreparedStatement complexHolder0Stat = prepareStatement("insert into " + HOLDER_TABLE0 + " (id, name, type) values (?,?,?)");
 		final PreparedStatement[] complexHolderStats = new PreparedStatement[2];
 		for (int i = 0; i < complexHolderStats.length; i++) {
 			int idx = i + 1;
-			String table = "complexHolder" + idx;
+			String table = HOLDER_TABLES[i];
 			complexHolderStats[i] = prepareStatement("insert into " + table + "(id, i" +  idx + ") values (?,?)"); 
 		}
 		final PreparedStatement childrenStat = prepareStatement("insert into children (parent, child, pos) values (?,?,?)");
@@ -508,8 +506,9 @@
 	@Override
 	public void delete() {
 		final PreparedStatement[] complexHolderStats = new PreparedStatement[5];
-		for (int i = 0; i < complexHolderStats.length; i++) {
-			String table = "complexHolder" + i;
+		complexHolderStats[0] = prepareStatement("delete from " + HOLDER_TABLE0 + " where id=?");
+		for (int i = 1; i < complexHolderStats.length; i++) {
+			String table = HOLDER_TABLES[i - 1];
 			complexHolderStats[i] = prepareStatement("delete from " + table + " where id=?"); 
 		}
 		final PreparedStatement arrayStat = prepareStatement("delete from " + ARRAY_TABLE + " where parent=?");

Modified: trunk/polepos/src/org/polepos/teams/jdbc/InheritanceHierarchyJdbc.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/InheritanceHierarchyJdbc.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/teams/jdbc/InheritanceHierarchyJdbc.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -31,11 +31,11 @@
 public class InheritanceHierarchyJdbc extends JdbcDriver implements InheritanceHierarchy {
     
     private static final String[] TABLES = new String[]{
-        "inheritanceHierarchy0",
-        "inheritanceHierarchy1",
-        "inheritanceHierarchy2",
-        "inheritanceHierarchy3",
-        "inheritanceHierarchy4",
+        "inheritanceHierarchyJdbc0",
+        "inheritanceHierarchyJdbc1",
+        "inheritanceHierarchyJdbc2",
+        "inheritanceHierarchyJdbc3",
+        "inheritanceHierarchyJdbc4",
     };
     
     public void takeSeatIn(Car car, TurnSetup setup) throws CarMotorFailureException{
@@ -43,17 +43,17 @@
         super.takeSeatIn(car, setup);
         openConnection();
         
-        int i = 0;
-        for(String table : TABLES){
-            dropTable( table);
-            createTable( table, new String[]{ "id", "parent", "i" + i}, 
-                        new Class[]{Integer.TYPE, Integer.TYPE, Integer.TYPE} );
-            createIndex( table, "parent" );
-            if(i == 2){
-                createIndex( table, "i2" );
-            }
-            i++;
-        }
+        for (int i = TABLES.length - 1; i >= 0; i--) {
+        	String table = TABLES[i];
+        	dropTable( table);
+        	createTable( table, new String[]{ "id", "parent", "i" + i}, 
+        			new Class[]{Integer.TYPE, Integer.TYPE, Integer.TYPE} );
+        	createIndex( table, "parent" );
+        	if(i == 2){
+        		createIndex( table, "i2" );
+        	}
+		}
+        
         close();
 
     }

Modified: trunk/polepos/src/org/polepos/teams/jdo/ComplexJdo.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/ComplexJdo.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/teams/jdo/ComplexJdo.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -43,12 +43,16 @@
 	@Override
 	public void read() {
 		beginRead();
-		ComplexHolder0 holder = root();
+		ComplexHolder0 holder = rootHolder();
 		addToCheckSum(holder);
 	}
 
-	private ComplexHolder0 root() {
-        Query query = db().newQuery(ComplexRoot.class);
+	private ComplexHolder0 rootHolder() {
+        return root().getHolder();
+	}
+
+	private ComplexRoot root() {
+		Query query = db().newQuery(ComplexRoot.class);
         Collection result = (Collection) query.execute();
 		Iterator it = result.iterator();
 		if(! it.hasNext()){
@@ -58,7 +62,7 @@
 		if(it.hasNext()){
 			throw new IllegalStateException("More than one ComplexRoot found");
 		}
-		return root.getHolder();
+		return root;
 	}
 
 	@Override
@@ -93,7 +97,7 @@
 	@Override
 	public void update() {
 		begin();
-		ComplexHolder0 holder = root();
+		ComplexHolder0 holder = rootHolder();
 		holder.traverse(new NullVisitor<ComplexHolder0>(),
 				new Visitor<ComplexHolder0>() {
 			@Override
@@ -113,7 +117,9 @@
 	@Override
 	public void delete() {
 		begin();
-		ComplexHolder0 holder = root();
+		ComplexRoot root = root();
+		ComplexHolder0 holder = root.getHolder();		
+		delete(root);
 		holder.traverse(
 			new NullVisitor<ComplexHolder0>(),
 			new Visitor<ComplexHolder0>() {

Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -67,7 +67,7 @@
         properties.setProperty("javax.jdo.option.Optimistic", "true");
         
         // Versant VODJDO specific settings
-        properties.setProperty("versant.metadata.0", "org/polepos/teams/jdo/data/package.jdo");
+        properties.setProperty("versant.metadata.0", "org/polepos/teams/jdo/data/vod.jdo");
 
         properties.setProperty("versant.allowPmfCloseWithPmHavingOpenTx","true");
         properties.setProperty("versant.vdsSchemaEvolve","true");

Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java	2010-12-06 16:58:49 UTC (rev 156)
@@ -123,18 +123,18 @@
 			
 		    deleteAll(pm, JdoIndexedObject.class);
 		    deleteAll(pm, ListHolder.class);
+		    deleteAll(pm, ComplexRoot.class);
+		    deleteAll(pm, ComplexHolder4.class);
+		    deleteAll(pm, ComplexHolder3.class);
+		    deleteAll(pm, ComplexHolder2.class);
+		    deleteAll(pm, ComplexHolder1.class);
 		    deleteAll(pm, ComplexHolder0.class);
-		    deleteAll(pm, ComplexHolder1.class);
-		    deleteAll(pm, ComplexHolder2.class);
-		    deleteAll(pm, ComplexHolder3.class);
-		    deleteAll(pm, ComplexHolder4.class);
-		    deleteAll(pm, ComplexRoot.class);
 		    
+		    deleteAll(pm, InheritanceHierarchy4.class);
+		    deleteAll(pm, InheritanceHierarchy3.class);
+		    deleteAll(pm, InheritanceHierarchy2.class);
+		    deleteAll(pm, InheritanceHierarchy1.class);
 		    deleteAll(pm, InheritanceHierarchy0.class);
-		    deleteAll(pm, InheritanceHierarchy1.class);
-		    deleteAll(pm, InheritanceHierarchy2.class);
-		    deleteAll(pm, InheritanceHierarchy3.class);
-		    deleteAll(pm, InheritanceHierarchy4.class);
 		    
 		    deleteAll(pm, JB0.class);
 		    deleteAll(pm, JB1.class);

Modified: trunk/polepos/src/org/polepos/teams/jdo/data/package.jdo
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/data/package.jdo	2010-12-02 17:23:46 UTC (rev 155)
+++ trunk/polepos/src/org/polepos/teams/jdo/data/package.jdo	2010-12-06 16:58:49 UTC (rev 156)
@@ -7,7 +7,7 @@
           <field name = "_string"  indexed = "true"/>
         </class>
         <class name="ListHolder">
-        	<field name="_id" indexed = "true" />
+        	<field name="_id" indexed = "true"/>
         	<field name="_name" indexed = "true"/>
         	<field name="_list">
         		<collection element-type="ListHolder"/>
@@ -15,28 +15,50 @@
         </class>
         <class name="ComplexRoot" />
         <class name="ComplexHolder0">
+        	<inheritance strategy="new-table"/>
         	<field name="name" />
         	<field name="array" />
             <field name="children">
         		<collection element-type="ComplexHolder0"/>
         	</field>
-        
         </class>
-        <class name="ComplexHolder1" persistence-capable-superclass="org.polepos.teams.jdo.data.ComplexHolder0" />
-        <class name="ComplexHolder2" persistence-capable-superclass="org.polepos.teams.jdo.data.ComplexHolder1">
+        <class name="ComplexHolder1">
+        	<inheritance strategy="new-table"/>
+        	<field name = "i1" />
+        </class>
+        <class name="ComplexHolder2">
+        	<inheritance strategy="new-table"/>
 	        <field name = "i2" indexed = "true"/>
         </class> 
-        <class name="ComplexHolder3" persistence-capable-superclass="org.polepos.teams.jdo.data.ComplexHolder2" />
-        <class name="ComplexHolder4" persistence-capable-superclass="org.polepos.teams.jdo.data.ComplexHolder3" />
-        
-        
-        <class name="InheritanceHierarchy0" />
-        <class name="InheritanceHierarchy1" persistence-capable-superclass="org.polepos.teams.jdo.data.InheritanceHierarchy0" />
-        <class name="InheritanceHierarchy2" persistence-capable-superclass="org.polepos.teams.jdo.data.InheritanceHierarchy1">
+        <class name="ComplexHolder3">
+        	<inheritance strategy="new-table"/>
+        	<field name = "i3" />
+        </class>
+        <class name="ComplexHolder4">
+        	<inheritance strategy="new-table"/>
+        	<field name = "i4" />
+        </class>
+        <class name="InheritanceHierarchy0">
+        	<inheritance strategy="new-table"/>
+        	<field name = "i0" />
+        </class>
+        <class name="InheritanceHierarchy1">
+			<inheritance strategy="new-table"/>
+			<field name = "i1" />
+        </class>
+        <class name="InheritanceHierarchy2">
+        	<inheritance strategy="new-table"/>
 	        <field name="i2" indexed="true"/>
         </class> 
-        <class name="InheritanceHierarchy3" persistence-capable-superclass="org.polepos.teams.jdo.data.InheritanceHierarchy2" />
-        <class name="InheritanceHierarchy4" persistence-capable-superclass="org.polepos.teams.jdo.data.InheritanceHierarchy3" />
+        <class name="InheritanceHierarchy3">
+        	<inheritance strategy="new-table"/>
+        	<field name = "i3" />
+        </class>
+        <class name="InheritanceHierarchy4">
+        	<inheritance strategy="new-table"/>
+        	<field name = "i4" />
+        </class>
+        
     
         <class name="JB0" />
         <class name="JB1" persistence-capable-superclass="org.polepos.teams.jdo.data.JB0" />

Added: trunk/polepos/src/org/polepos/teams/jdo/data/vod.jdo
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/data/vod.jdo	                        (rev 0)
+++ trunk/polepos/src/org/polepos/teams/jdo/data/vod.jdo	2010-12-06 16:58:49 UTC (rev 156)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jdo PUBLIC '-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.2//EN' 'http://java.sun.com/dtd/jdo_2_2.dtd'>
+<jdo>
+    <package name="org.polepos.teams.jdo.data">
+    	<class name="JdoIndexedObject">
+          <field name = "_int" indexed = "true"/>
+          <field name = "_string"  indexed = "true"/>
+        </class>
+        <class name="ListHolder">
+        	<field name="_id" indexed = "true"/>
+        	<field name="_name" indexed = "true"/>
+        	<field name="_list">
+        		<collection element-type="ListHolder"/>
+        	</field>
+        </class>
+        <class name="ComplexRoot" />
+        <class name="ComplexHolder0">
+        	<field name="name" />
+        	<field name="array" />
+            <field name="children">
+        		<collection element-type="ComplexHolder0"/>
+        	</field>
+        </class>
+        <class name="ComplexHolder1"/>
+        <class name="ComplexHolder2">
+	        <field name = "i2" indexed = "true"/>
+        </class> 
+        <class name="ComplexHolder3" />
+        <class name="ComplexHolder4" />
+        
+        <class name="InheritanceHierarchy0" />
+        <class name="InheritanceHierarchy1" />
+        <class name="InheritanceHierarchy2" >
+	        <field name="i2" indexed="true"/>
+        </class> 
+        <class name="InheritanceHierarchy3" />
+        <class name="InheritanceHierarchy4" />
+    
+        <class name="JB0" />
+        <class name="JB1" persistence-capable-superclass="org.polepos.teams.jdo.data.JB0" />
+        <class name="JB2" persistence-capable-superclass="org.polepos.teams.jdo.data.JB1">
+	        <field name = "b2" indexed = "true"/>
+        </class> 
+        <class name="JB3" persistence-capable-superclass="org.polepos.teams.jdo.data.JB2" />
+        <class name="JB4" persistence-capable-superclass="org.polepos.teams.jdo.data.JB3" />
+    	<class name="JdoTree">
+        	<fetch-group name="subsequent">
+	   		<field name="subsequent" recursion-depth="16"/>
+		</fetch-group>
+		<fetch-group name="preceding">
+    		<field name="preceding" recursion-depth="16"/>
+		</fetch-group>
+		</class>
+        <class name="JdoPilot" />
+        
+        <class name="JdoIndexedPilot">
+          <field name = "mName" indexed = "true"/>
+          <field name = "mLicenseID"  indexed = "true"/>
+        </class>
+        <class name="JdoLightObject"/>
+        <class name="JdoListHolder">
+        	<field name = "list">
+        		<collection element-type="java.lang.Integer"/>
+        	</field>
+        </class>
+        <class name="JN1"/>
+    </package>    
+</jdo>    
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polepos-devel] SF.net SVN: polepos:[160] trunk/polepos

[<car...@us...>]

Revision: 160
          http://polepos.svn.sourceforge.net/polepos/?rev=160&view=rev
Author:   carlrosenberger
Date:     2010-12-07 15:02:14 +0000 (Tue, 07 Dec 2010)

Log Message:
-----------
cr: Correct log4j setup for Hibernate.

Modified Paths:
--------------
    trunk/polepos/settings/Jdbc.properties
    trunk/polepos/src/log4j.properties
    trunk/polepos/src/org/polepos/teams/hibernate/HibernateCar.java

Modified: trunk/polepos/settings/Jdbc.properties
===================================================================
--- trunk/polepos/settings/Jdbc.properties	2010-12-07 13:33:29 UTC (rev 159)
+++ trunk/polepos/settings/Jdbc.properties	2010-12-07 15:02:14 UTC (rev 160)
@@ -23,7 +23,8 @@
 # hibernate=hsqldb
 #
 # Client/Server 
-hibernate=mysql,postgresql
+# hibernate=mysql,postgresql
+hibernate=hsqldb, mysql
  
 
 

Modified: trunk/polepos/src/log4j.properties
===================================================================
--- trunk/polepos/src/log4j.properties	2010-12-07 13:33:29 UTC (rev 159)
+++ trunk/polepos/src/log4j.properties	2010-12-07 15:02:14 UTC (rev 160)
@@ -4,33 +4,21 @@
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
-### direct messages to file hibernate.log ###
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
-### set log levels - for more verbose logging change 'info' to 'debug' ###
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=hibernate.log
+log4j.appender.file.MaxFileSize=1MB
+log4j.appender.file.MaxBackupIndex=1
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+ 
+# Root logger option
+log4j.rootLogger=warn, file
+ 
+# Hibernate logging options (INFO only shows startup messages)
+log4j.logger.org.hibernate=warn, file
+ 
+# Log JDBC bind parameter runtime arguments
+log4j.logger.org.hibernate.type=warn, file
 
-log4j.rootLogger=warn, stdout
-
-log4j.logger.net.sf.hibernate=warn
-
-### log just the SQL
-#log4j.logger.net.sf.hibernate.SQL=debug
-
-### log JDBC bind parameters ###
-log4j.logger.net.sf.hibernate.type=warn
-
-### log schema export/update ###
-log4j.logger.net.sf.hibernate.tool.hbm2ddl=warn
-
-### log cache activity ###
-#log4j.logger.net.sf.hibernate.cache=debug
-
-### log jdbc resource acquisition
-#log4j.logger.net.sf.hibernate.impl.BatcherImpl=debug
-
-### enable the following line if you want to track down connection ###
-### leakages when using DriverManagerConnectionProvider ###
-#log4j.logger.net.sf.hibernate.connection.DriverManagerConnectionProvider=trace

Modified: trunk/polepos/src/org/polepos/teams/hibernate/HibernateCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/HibernateCar.java	2010-12-07 13:33:29 UTC (rev 159)
+++ trunk/polepos/src/org/polepos/teams/hibernate/HibernateCar.java	2010-12-07 15:02:14 UTC (rev 160)
@@ -119,7 +119,7 @@
         cfg.setProperty("hibernate.connection.writedelay", "0");
  
         SessionFactory factory = cfg.buildSessionFactory();     
-        new SchemaExport(cfg).create(true, true);
+        new SchemaExport(cfg).create(false, true);
         return factory;         
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polepos-devel] SF.net SVN: polepos:[180] trunk/polepos

[<car...@us...>]

Revision: 180
          http://polepos.svn.sourceforge.net/polepos/?rev=180&view=rev
Author:   carlrosenberger
Date:     2011-02-04 12:16:15 +0000 (Fri, 04 Feb 2011)

Log Message:
-----------
cr + acv: Settings set for the release. Improved output PDF. Changed reporting to Bar reporter.

Modified Paths:
--------------
    trunk/polepos/doc/circuits.html
    trunk/polepos/doc/index.html
    trunk/polepos/settings/Circuits.properties
    trunk/polepos/src/org/polepos/framework/PropertiesHandler.java
    trunk/polepos/src/org/polepos/reporters/CustomBarPDFReporter.java
    trunk/polepos/src/org/polepos/reporters/DefaultReporterFactory.java
    trunk/polepos/src/org/polepos/reporters/PDFReporterBase.java
    trunk/polepos/src/org/polepos/reporters/ReporterConstants.java
    trunk/polepos/src/org/polepos/teams/jdbc/JdbcSettings.java

Added Paths:
-----------
    trunk/polepos/src/org/polepos/teams/jdbc/CircuitSettings.java

Modified: trunk/polepos/doc/circuits.html
===================================================================
--- trunk/polepos/doc/circuits.html	2011-02-03 16:03:36 UTC (rev 179)
+++ trunk/polepos/doc/circuits.html	2011-02-04 12:16:15 UTC (rev 180)
@@ -6,11 +6,20 @@
 	</head>
 	<body>
 	<h1>PolePosition Circuits</h1>
-	    <p>This file explains what each circuit of the Poleposition benchmark does.
+	    <p>This file is a complementary narrative for the open source <a href="http://www.polepos.org">Poleposition benchmark project</a>.  
+            Source code snippets are provided for selected tasks to show how they are implemented. As a general rule 
+	    using plain JDBC required many more lines of code than using modern object-oriented techniques like object databases or object-relational
+	    mappers. For example <a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java">ComplexJdbc.java</a>
+	    was written with 550 lines of code, whereas the same task was possible with the OO counterparts 
+	    <a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/db4o/ComplexDb4o.java">ComplexDb4o.java</a>, 
+        <a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/jdo/ComplexJdo.java">ComplexJdo.java</a> and 
+        <a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java">ComplexHibernate.java</a>
+        with only about 150 lines of code.
 	    </p>
 		<hr>
 		<h2>Content</h2>
-		<p>
+		<p>Poleposition benchmark tasks are called circuits. This document contains
+		explanations to the following circuits:</p>
 			<ul>
 				<li>
 					<a href="#complex">Complex</a>
@@ -22,7 +31,6 @@
 					<a href="#flatobject">Flatobject</a>
 				</li>
 			</ul>
-		<P></P>
 		<hr>
 		<a name="complex"></a>
 		<h2>Complex</h2>
@@ -34,11 +42,10 @@
             <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/db4o/ComplexDb4o.java">ComplexDb4o.java</a></li>
             <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/jdo/ComplexJdo.java">ComplexJdo.java</a></li>
             <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java">ComplexHibernate.java</a></li>
-            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/db4o/ComplexJdbc.java">ComplexJdbc.java</a></li>
+            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java">ComplexJdbc.java</a></li>
             </ul>
-        <p>
-			In a nutshell the class model looks like this:</p>
-            <pre>
+<p>The class model for the Complex circuit looks like this:</p>
+<pre>
 class ComplexHolder0 {
     String _name;
     List &lt;ComplexHolder0&gt; _children;
@@ -61,37 +68,47 @@
     int _i4;
 }
 </pre>
+<p>Member _i2 on ComplexHolder2 is indexed for queries.</p>
+<hr />
 <h3>Complex.write</h3>
-<p>ComplexHolder0#generate() generates a structure with depth and objectcount as 
-    specificied in the configuration file. The _children List and the _array member 
+<p>ComplexHolder0#generate() generates a deep object graph as configured by the &#39;depth&#39; 
+    and &#39;objects&#39; properties in the 
+    <a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/settings/Circuits.properties">Circuits.properties configuration file</a>. 
+    The _children List and the _array member 
     are again filled with ComplexHolder0 objects. Varying instances from 
     ComplexHolder0 to ComplexHolder4 are used.
 <p>Complex.write stores the complete graph
-    and measures the time taken for each database access technology.
+    and measures the time taken for each database. <hr />    
 <h3>Complex.read</h3>
 <p>Complex.read accesses the root object of the structure that was generated with 
 Complex.write, loads all attached objects into
 memory and traverses them, making sure that all objects are present by calculating
 a checksum over all objects.
 </p>
+<hr />
 <h3>Complex.query</h3>
 <p>
-Complex.query queries for ComplexHolder2 instances over the indexed _i2 field. The 
-    query is run multiple times, specified by the selects property in the 
-    configuration file. Sample queries look like this:</p>
+    Complex.query queries for ComplexHolder2 instances over the indexed _i2 field. 
+    The query is run multiple times, specified by the selects property in the 
+    <a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/settings/Circuits.properties">Circuits.properties configuration file</a>. 
+    Sample queries look like this:</p>
 <pre>
 // db4o
-Query query = db().query();
+Query query = db.query();
 query.constrain(ComplexHolder2.class);
 query.descend("_i2").constrain(currentInt);
 ObjectSet<ComplexHolder2> result = query.execute();
 
 // JDO
 String filter = "this.i2 == param";
-Query query = db().newQuery(ComplexHolder2.class, filter);
+Query query = pm.newQuery(ComplexHolder2.class, filter);
 query.declareParameters("int param");
 Collection result = (Collection) query.execute(currentInt);
 
+// Hibernate
+String query = "from org.polepos.teams.hibernate.data.ComplexHolder2 where i2=" + currentInt;
+Iterator it = session.iterate(query);
+
 // JDBC
 StringBuilder sb = new StringBuilder();
 sb.append("select " + HOLDER_TABLE0 + ".id from " + HOLDER_TABLE0);
@@ -107,10 +124,12 @@
 PreparedStatement stat = prepareStatement(sb.toString());
 ResultSet resultSet stat.executeQuery();
 </pre>
-<p>For JDBC we are only showing the main query. Reading individual object 
-intances required another 150 lines of code with our implementation, see
-<a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/db4o/ComplexJdbc.java">ComplexJdbc.java</a>.
+<p>For JDBC we are only showing the code to set up the main query. Reading individual object 
+instances required another 150 lines of code with our implementation, see the 
+    #readHolder() methods in
+<a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java">ComplexJdbc.java</a>.
  </p>
+ <hr />
 <h3>Complex.update</h3>
 <p>Complex.update reads the root object of the graph and traverses all
 holder objects, updates the name, copies all instances from the _children list
@@ -126,11 +145,11 @@
     array[i] = children.get(i);
 }
 holder.setArray(array);
-store(holder);
+db.store(holder);
 
 // JDBC 
 PreparedStatement nameStat = prepareStatement("update " + HOLDER_TABLE0 + " set name=? where id=?");
-PreparedStatement arrayDeleteStat = prepareStatement("delete from " + ARRAY_TABLE + " where parent = ?");
+PreparedStatement arrayDeleteStat = prepareStatement("delete from tarray where parent = ?");
 PreparedStatement arrayInsertStat = prepareStatement("insert into tarray (parent, child, pos) values (?,?,?)");
 nameStat.setString(1, "updated");
 nameStat.setInt(2, holder.getId());
@@ -145,34 +164,39 @@
     arrayInsertStat.addBatch();
 }
 </pre>
+<hr />
 <h3>Complex.delete</h3>
-<p>Complex.delete traverses all objects from the root and deletes each object individually.</p>
+<p>Complex.delete traverses all objects from the root and deletes each object 
+    individually, using batched prepared statements where applicable.</p>
 		<hr>
 		<a name="nestedlists"></a>
 		<h2>Nestedlists</h2>
-			The Nestelists circuit simulates writing, reading, querying and updating a deep 
+		<p>The Nestelists circuit simulates writing, reading, querying and updating a deep 
             graph of lists. Objects are partially reused within the lists. 
             The sources for the implementations can be found here:</p>
             <ul>
             <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/db4o/NestedListsDb4o.java">NestedListsDb4o.java</a></li>
             <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/jdo/NestedListsJdo.java">NestedListsJdo.java</a></li>
             <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/hibernate/NestedListsHibernate.java">NestedListsHibernate.java</a></li>
-            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/db4o/NestedListsJdbc.java">NestedListsJdbc.java</a></li>
+            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/jdbc/NestedListsJdbc.java">NestedListsJdbc.java</a></li>
             </ul>
-		<hr>
 <p>The class model for the NestedLists circuit looks like this:</p>
 <pre>
 class ListHolder {
     private long _id;
     private String _name;
     List &lt;ListHolder&gt; _list;
+}
 </pre>
+<hr />
 <h3>Nestedlists.create</h3>
-<p>ListHolder#generate() generates a deep structure of lists, reusing an amount of previous objects
-specified by the reuse property in the configuration file. Nestedlists.create stores the root of
-this generated graph and measures the time taken.</p>
-<pre>
-// OO
+<p>ListHolder#generate() generates a deep structure of lists, reusing an amount of previously 
+    instantiated objects
+specified by the &#39;reuse&#39; property in the 
+    <a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/settings/Circuits.properties">Circuits.properties configuration file</a>. Nestedlists.create stores the root of
+this generated graph and measures the time taken.</p>
+<pre>
+// OOOOOOOOO
 db.store(ListHolder.generate(depth(), objectCount(), reuse()));
 db.commit();
 
@@ -182,7 +206,6 @@
 final PreparedStatement listStatement = prepareStatement("insert into " + LIST_TABLE + " (fid, fitem, felement) values (?,?,?)");
 _rootId = (int) root.id();
 root.accept(new Visitor&lt;ListHolder&gt;() {
-	@Override
     public void visit(ListHolder listHolder) {
         try {
             int listHolderId = (int) listHolder.id();
@@ -210,23 +233,19 @@
 listHolderStatement.close();
 commit();
 </pre>
+<hr />
 <h3>Nestedlists.read</h3>
 <p>Nestedlists.read loads the root object of the structure stored with Nestedlists.create
-and traverses all objects and adds them to the checksum.</p>
-<pre>
+and traverses all objects adding them to the checksum.</p>
+<pre>
 // OO just traverses the root with a simple visitor
-
-@Override
 public void read() throws Throwable {
-    ListHolder root = root();
-    activate(root, Integer.MAX_VALUE);
-    root.accept(new Visitor&lt;ListHolder&gt;(){
+    root().accept(new Visitor&lt;ListHolder&gt;(){
         public void visit(ListHolder listHolder){
             addToCheckSum(listHolder);
         }
     });
 }
-
 private ListHolder root() {
     Query query = db().query();
     query.constrain(ListHolder.class);
@@ -236,10 +255,7 @@
 }
 
 
-// JDBC requires a recursive read method and a set to check if an instance
-// was already loaded
-
-@Override
+// JDBC requires a recursive read method and a set to check if an instance was already loaded
 public void read() throws Throwable {
     ListHolder root = root();
     root.accept(new Visitor&lt;ListHolder&gt;(){
@@ -248,7 +264,6 @@
         }
     });
 }
-
 private ListHolder root() throws SQLException {
     PreparedStatement listHolderStatement = prepareStatement("select * from " + LISTHOLDER_TABLE + " where fid = ?");
     PreparedStatement listStatement = prepareStatement("select * from " + LIST_TABLE + " where fid = ? order by felement");
@@ -258,7 +273,6 @@
     closePreparedStatement(listStatement);
     return root;
 }
-
 private ListHolder recurseRead(PreparedStatement listHolderStatement,
         PreparedStatement listStatement, int id, Set&lt;ListHolder&gt; found) throws SQLException {
     listHolderStatement.setInt(ID, id);
@@ -290,20 +304,179 @@
     return listHolder;
 }
 </pre>
+<hr />
+<h3>Nestedlists.update</h3>
+<p>Nestedlists.update traverses the graph of lists created in Nestedlists.create and
+updates the name of each Listholder individually (using batched prepared statements 
+with JDBC).
+</p>
+<hr />
+<h3>Nestedlists.delete</h3>
+<p>Nestedlists.delete traverses the graph of lists created in Nestedlists.create and
+deletes each Listholder individually (using batched prepared statements with JDBC).
+</p>
+<hr />
+<a name="inheritancehierarchy"></a>
+<h2>Inheritancehierarchy</h2>
+<p>The Inheritancehierarchy circuit simulates writing, reading, querying and deleting
+objects of a class hierarchy with a depth of 5 levels.
+The sources for the implementations can be found here:</p>
+            <ul>
+            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/db4o/InheritanceHierarchyDb4o.java">InheritanceHierarchyDb4o.java</a></li>
+            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/jdo/InheritanceHierarchyJdo.java">InheritanceHierarchyJdo.java</a></li>
+            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/hibernate/InheritanceHierarchyHibernate.java">InheritanceHierarchyHibernate.java</a></li>
+            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/jdbc/InheritanceHierarchyJdbc.java">InheritanceHierarchyJdbc.java</a></li>
+            </ul>
+<p>The class model for the InheritanceHierarchy circuit looks like this:</p>
+<pre>
+class InheritanceHierarchy0 {
+    int i0;
+}
+class InheritanceHierarchy1 extends InheritanceHierarchy0 {
+   int i1  
+}
+class InheritanceHierarchy2 extends InheritanceHierarchy1 {
+   int i2  
+}
+class InheritanceHierarchy3 extends InheritanceHierarchy2 {
+   int i3  
+}
+class InheritanceHierarchy4 extends InheritanceHierarchy3 {
+   int i4  
+}
+</pre>
+<p>Member i2 on InheritanceHierarchy2 is indexed for queries.
+Since we are simulating the scenario where a class structure may contain tens or even hundreds of
+classes, we store the data for each class in a separate table instead of putting all 
+    classes into a single table.</p>
+<hr />
+<h3>InheritanceHierarchy.write</h3>
+<p>InheritanceHierarchy.write stores a number of InheritanceHierarchy4 objects
+and measures the time taken.</p>
+<pre>
+// OO
+int count = setup().getObjectCount();
+for (int i = 1; i<= count; i++) {
+    InheritanceHierarchy4 inheritancheHierarchy4 = new InheritanceHierarchy4();
+    inheritancheHierarchy4.setAll(i);
+    db.store(inheritancheHierarchy4);
+}
+commit();
 
+
+// JDBC
+PreparedStatement[] statements = new PreparedStatement[5];
+for (int i = 0; i < 5; i++) {
+    statements[i] = prepareStatement("insert into " + TABLES[i] + " (id, parent, i" + i + ") values (?,?,?)");
+}
+int count = setup().getObjectCount();
+for (int j = 0; j < 5; j++) {
+	for (int i = 1; i <= count; i++) {  
+		InheritanceHierarchy4 inheritanceHierarchy4 = new InheritanceHierarchy4();
+		inheritanceHierarchy4.setAll(i);
+		statements[j].setInt(1, i);
+		statements[j].setInt(2, i);
+		statements[j].setInt(3, inheritanceHierarchy4.getIx(j));
+		statements[j].addBatch();
+	}
+	statements[j].executeBatch();
+	statements[j].close();
+}
+commit();
+</pre>
+<hr />
+<h3>InheritanceHierarchy.read</h3>
+<p>InheritanceHierarchy.read executes a number of queries for all 
+    InheritanceHierarchy4 objects, adding each to a checksum.</p>
+<hr />
+<h3>InheritanceHierarchy.query</h3>
+<p>InheritanceHierarchy.query executes a number of queries for all InheritanceHierarchy4 
+objects with a where clause for the indexed i2 member.</p>
+<hr />
+<h3>InheritanceHierarchy.delete</h3>
+<p>InheritanceHierarchy.delete simulates deleting all InheritanceHierarchy4 objects
+individually. 
+</p>
+<pre>
+// db4o
+Query q = db.query();
+q.constrain(InheritanceHierarchy4.class);
+ObjectSet&lt;InheritanceHierarchy4&gt; deleteSet = q.execute();
+while(deleteSet.hasNext()){
+    db().delete(deleteSet.next());
+}
+db.commit();
+
+// JDO
+Extent extent = db().getExtent(InheritanceHierarchy4.class, false);
+Iterator it = extent.iterator();
+while(it.hasNext()){
+    db().deletePersistent(it.next());
+}
+extent.closeAll();
+commit();
+
+// Hibernate
+Transaction tx = session.beginTransaction();
+Iterator it = session.iterate("from org.polepos.teams.hibernate.data.InheritanceHierarchy4");
+while(it.hasNext()){
+    db().delete(it.next());
+}
+tx.commit();
+
 
+// JDBC
+int count = setup().getObjectCount();
+PreparedStatement[] statements = new PreparedStatement[5];
+for (int i = 0; i < 5; i++) {
+    statements[i] = prepareStatement("delete from " + TABLES[i] + " where id=?");
+}
+for (int j = 0; j < 5; j++) {
+    for (int i = 1; i <= count; i++) {
+        statements[j].setInt(1, i);
+        statements[j].addBatch();
+    }
+statements[j].executeBatch();
+statements[j].close();
+commit();     
 
-		<a name="inheritancehierarchy"></a>
-		<h2>Inheritancehierarchy</h2>
-		<p>As already expressed above, there is no best product. </p>
-		<hr>
+</pre>
+
+<hr />		
 		<a name="flatobject"></a>
 		<h2>Flatobject</h2>
 		<p>
-			All sources of the PolePosition test suite including a couple of open source 
-			database engines to run tests are available for download 
-            <a href="http://sourceforge.net/project/showfiles.php?group_id=134549" target="_blank">here</a>.
-		</p>
-
+The Flatobject circuit simulates writing, updating and deleting plain simple
+flat objects as well as querying for indexed int members and string members.
+The sources for the implementations can be found here:</p>
+            <ul>
+            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/db4o/FlatObjectDb4o.java">FlatObjectDb4o.java</a></li>
+            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/jdo/FlatObjectJdo.java">FlatObjectJdo.java</a></li>
+            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/hibernate/FlatObjectHibernate.java">FlatObjectHibernate.java</a></li>
+            <li><a href="https://polepos.svn.sourceforge.net/svnroot/polepos/trunk/polepos/src/org/polepos/teams/jdbc/FlatObjectJdbc.java">FlatObjectJdbc.java</a></li>
+            </ul>
+<p>The class model for the FlatObject circuit looks like this:</p>
+<pre>
+class IndexedObject {
+    int _int;
+    String _string;
+}
+</pre>            
+<p>Both the _int and the _string field are indexed.</p>
+<hr />
+<h3>FlatObject.write</h3>
+<p>FlatObject.write simulates storing a number of simple objects to a database.</p>
+<hr />
+<h3>FlatObject.queryIndexedString</h3>
+<p>FlatObject.queryIndexedString simulates querying for a number of flat objects by an indexed string member.</p>
+<hr />
+<h3>FlatObject.queryIndexedInt</h3>
+<p>FlatObject.queryIndexedInt simulates querying for a number of flat objects by an indexed int member.</p>
+<hr />
+<h3>FlatObject.update</h3>
+<p>FlatObject.write simulates updating a string member on a number of simple objects after querying for an indexed int member.</p>
+<hr />
+<h3>FlatObject.delete</h3>
+<p>FlatObject.delete simulates deleting a number of simple objects individually after querying for an indexed int member.</p>
 	</body>
 </html>

Modified: trunk/polepos/doc/index.html
===================================================================
--- trunk/polepos/doc/index.html	2011-02-03 16:03:36 UTC (rev 179)
+++ trunk/polepos/doc/index.html	2011-02-04 12:16:15 UTC (rev 180)
@@ -52,7 +52,7 @@
             database engines and object-relational mapping technology. It is by no means 
             complete. Database vendors and open source database project contributors are 
             invited to improve the test implementations and to write further scenarios 
-            (&quot;Circuits&quot;). The PolePosition framework will help you to implement tests 
+            (&quot;Circuits&quot;). The PolePosition framework will help to implement tests 
             quickly and to time and output the results as number series and graph 
 			visualizations.
 		</p>
@@ -84,15 +84,17 @@
         </p>
         <p>
             <a href="results/PolePositionClientServer.pdf" target="_blank">Client/Server Results</a><br />
-            Database setups with client/server functionality for scalable applications.
-		</p>
+            Database setups with client/server functionality for scalable applications.</p>
+        <p>
+            An explanation about each benchmark scenario (&quot;Circuit&quot;) and what it does can be 
+            found <a href="circuits.html">here</a>.</p>
 		<p>
 			You are encouraged to 
             <a href="http://sourceforge.net/project/showfiles.php?group_id=134549" target="_blank">download</a>
             the PolePosition suite and to run the tests yourself with your 
 			favourite databases on your hardware, see <a href="#running">Running the tests</a>. 
             If you are evaluating databases for a concrete scenario, the best thing you can 
-            do is to write your own customized circuit for this usecase.</p>
+            do is to write your own customized circuit for this use case.</p>
 		<hr>
 		<a name="interpretation"></a>
 		<h2>Interpretation</h2>
@@ -104,14 +106,14 @@
 				<li>
 				    When you interpret the results, you should focus on significant differences, 
                     where the results differ by an order of magnitude. If you see differences of 
-                    only 20% or 30% this may be an effect of Java garbage collection kicking in.<li>
-				    The longer the tests run (see the milliseconds value in the table), the more 
-                    meaningful the results will be.<li>
-				HSQLDB looks very good on many graphs, because much processing is done in 
-				memory. We configured HSQLDB to use cached tables and with write_delay=false to be 
-                    fair to other databases that flush file buffers on commit. Before you consider to use HSQLDB for a complex database application, you 
-				should take a close look at Barcelona:query. The query optimizer does not seem 
-				to cope with a query over five tables.
+                    only 20% or 30% this may be an effect of Java garbage collection.<li>
+				    The longer the tests run (see the milliseconds values), the more 
+                    meaningful the results will be.<li>
+				HSQLDB looks very good on many graphs, because much processing is done in 
+				memory. We configured HSQLDB to use cached tables and with write_delay=false to be 
+                    fair to other databases that flush file buffers on commit. Before you consider to use HSQLDB for a complex database application, you 
+				should take a close look at Complex:query. The query optimizer does not seem 
+				to cope with a query over five tables. 
 				<li>
 		The use of O-R mapping technology like Hibernate, 
                     Datanucleus or OpenJPA has a 
@@ -121,34 +123,23 @@
 				application. If you want your data to be up-to-date, you have to reread from 
 				the database.
 				<li>
-				As would be expected, object databases like db4o and Versant VOD provide best performance for 
-				inheritance hierarchies, tree structures and navigational access to object 
-                    members. 
-				<li>
-				If you need a relational database for whatever reason, MySQL should certainly 
-				be on your evaluation list. We tested quite a few other proprietary databases with 
-                    PolePosition, products that may not be listed here because of their 
-				license agreements. These other products did not look good at all in comparison.
-				<li>
-				If you take a look at the sources of the tests, they are also a measurement, 
-					how easy it is to work against a specific database. SQL looks like a foreigner 
-					in Java code, very ugly, difficult to write and refactor. O-R mappers and 
-					object databases make life so much easier and productive for developers. The task of storing 
-					objects is very similar among all the products tested. An 
-                    object-oriented query language, like LINQ, would be great for Java.</li>
-                <li>
-					The pseudocode shown on each page is not an accurate representation of the 
-                    actual code that is run. It&#39;s just a shorthand to give you a general idea of the 
-                    nature of the circuit, abbreviated as much as possible so it fits on the page. 
-                    Please look at the actual source code if you really want to know what&#39;s going 
-                    on.</li>
-			</ul>
-		<hr>
-		<a name="download"></a>
+			As would be expected, object databases like db4o and Versant VOD provide best performance for 
+				inheritance hierarchies, complex structures and navigational access to object 
+                    members. 
+				<li>
+				If you take a look at the sources of the tests, they are also a measurement, 
+					how easy it is to work against a specific database. SQL statements look like 
+                    aliens in Java code, ugly, difficult to write, debug and refactor. O-R mappers and 
+					object databases make life so much easier and productive for developers. The task of storing 
+					objects is very similar among all the products tested. A common 
+                    object-oriented query language, like LINQ, would be great for Java.</li>
+			</ul>
+		<hr>
+		<a name="download"></a>
 		<h2>Download</h2>
 		<p>
-			All sources of the PolePosition test suite including a couple of open source 
-			database engines to run tests are available for download 
+		All sources of the PolePosition test suite including some open source 
+			database engines to run tests are available for download 
             <a href="http://sourceforge.net/project/showfiles.php?group_id=134549" target="_blank">here</a>.
 		</p>
 		<hr>
@@ -165,10 +156,10 @@
 			like to take a look at the configuration possibilities, so you can first check 
             that all configured databases run through successfully.</p>
         <p>
-			Changing org.polepos.Settings.DEBUG to true will run all benchmarks with less 
-            objects.s.</p>
-		<p>
-			The main class to start the PolePosition suite is org.polepos.RunSeasonAfterEnhancing.<br />
+		Changing org.polepos.Settings.DEBUG to true will run all benchmarks with less 
+            objects.</p>
+		<p>
+			The main class to start the PolePosition suite is org.polepos.RunSeasonAfterEnhancing..<br />
             To run with all engines in one go, you need quite a lot of RAM. We ran with 
             -Xmx1500m</p>
         <p>
@@ -192,18 +183,16 @@
 					configures the settings for all circuits<BR>
 				<li>
 					/results/<BR>
-			is where the results of your test run will end up. 
-                    Open PolePosition.pdf from there when your run is done. <span class="red">
-                    Before you run again, don&#39;t forget to close PolePosition.pdf in Acrobat Reader, 
-                    otherwise the run will not complete because the file will be locked.</span> <BR>
-				<li>
-					/build.xml<BR>
-			is a simple Ant script to help you compile and run the tests, if you prefer 
-					that to running from within Eclipse.
-				</li>
-			</ul>
-		<hr>
-		<a name="source"></a>
+		is where the results of your test run will end up. 
+                    Open PolePosition.pdf from there when your test run is done. <BR>
+				<li>
+					/build.xmll<BR>
+		is a simple Ant script to help you compile and run the tests, if you prefer 
+					Ant to running from within Eclipse.
+				</li>
+			</ul>
+		<hr>
+		<a name="source"></a>
 		<h2>Source Code</h2>
 		<p>
 			What 
@@ -237,7 +226,7 @@
 		<hr>
 		<a name="license"></a>
 		<h2>License</h2>
-		<p>PolePosition sourcecode is supplied under the <a href="http://www.gnu.org/copyleft/gpl.html">
+		<p>PolePosition source code is supplied under the <a href="http://www.gnu.org/copyleft/gpl.html">
 				GPL</a>.
 		</p>
 		<p><br>

Modified: trunk/polepos/settings/Circuits.properties
===================================================================
--- trunk/polepos/settings/Circuits.properties	2011-02-03 16:03:36 UTC (rev 179)
+++ trunk/polepos/settings/Circuits.properties	2011-02-04 12:16:15 UTC (rev 180)
@@ -1,18 +1,22 @@
 
 
-
 # Global settings for all circuits
 
 concurrency=false
-threads=1,3,10
+threads=1, 3,10
 
+#configurationname=Client/Server
+#configurationname=Embedded
+
+
+
 # complex
 #
 # [objects]: number of objects to select from
 # [selects]: number of queries run against all objects
-complex.objects=6,7
-complex.depth=6,6
-complex.selects=500,500
+complex.objects=5,6,7
+complex.depth=6,6,6
+complex.selects=500,500,500
 
 
 # nestedlists
@@ -20,9 +24,9 @@
 # [objects]: number of objects to store as leafs
 # [reuse]: number of objects to reuse from the total objects 
 # [depth]: depth of the tree
-nestedlists.objects=50,50
-nestedlists.reuse=15,1
-nestedlists.depth=4,4
+nestedlists.objects=50,50,50
+nestedlists.reuse=30,15,1
+nestedlists.depth=4,4,4
 
 
 # inheritancehierarchy
@@ -30,8 +34,8 @@
 # [objects]: number of objects to select from
 # [selects]: number of queries run against all objects
 
-inheritancehierarchy.objects=10000,30000
-inheritancehierarchy.selects=100,100
+inheritancehierarchy.objects=3000,10000,30000
+inheritancehierarchy.selects=100,100,100
 
 
 
@@ -41,10 +45,10 @@
 # [selects]: number of queries to be run against all objects
 # [updates]: number of updates and deletes to be run
 # [commitinterval]: when to perform an intermediate commit during write and delete
-flatobject.objects=100000,300000
-flatobject.selects=3000,3000
-flatobject.updates=3000,3000
-flatobject.commitinterval=10000,10000
+flatobject.objects=30000,100000,300000
+flatobject.selects=3000,3000,3000
+flatobject.updates=3000,3000,3000
+flatobject.commitinterval=10000,10000,10000
 
 
 # Settings for all circuits in the database benchmark.

Modified: trunk/polepos/src/org/polepos/framework/PropertiesHandler.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/PropertiesHandler.java	2011-02-03 16:03:36 UTC (rev 179)
+++ trunk/polepos/src/org/polepos/framework/PropertiesHandler.java	2011-02-04 12:16:15 UTC (rev 180)
@@ -23,10 +23,6 @@
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-/**
- *
- * @author Herkules
- */
 public class PropertiesHandler
 {
 	private final static	String		DBPROPSDIR = ".bdbench";

Modified: trunk/polepos/src/org/polepos/reporters/CustomBarPDFReporter.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/CustomBarPDFReporter.java	2011-02-03 16:03:36 UTC (rev 179)
+++ trunk/polepos/src/org/polepos/reporters/CustomBarPDFReporter.java	2011-02-04 12:16:15 UTC (rev 180)
@@ -41,7 +41,9 @@
 	    EmbeddedConfiguration cfg = Db4oEmbedded.newConfiguration();
 	    cfg.common().add(new TransparentPersistenceSupport());
 		
-		EmbeddedObjectContainer db = Db4oEmbedded.openFile(cfg, "graph.db4o");
+	    // EmbeddedObjectContainer db = Db4oEmbedded.openFile(cfg, "ClientServerGraph.db4o");
+	    EmbeddedObjectContainer db = Db4oEmbedded.openFile(cfg, "EmbeddedGraph.db4o");
+	    // EmbeddedObjectContainer db = Db4oEmbedded.openFile(cfg, "ConcurrentGraph.db4o");
 		PersistentGraphs pg = db.query(PersistentGraphs.class).iterator().next();
 		
 		reporter.graphs(pg.graphs());

Modified: trunk/polepos/src/org/polepos/reporters/DefaultReporterFactory.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/DefaultReporterFactory.java	2011-02-03 16:03:36 UTC (rev 179)
+++ trunk/polepos/src/org/polepos/reporters/DefaultReporterFactory.java	2011-02-04 12:16:15 UTC (rev 180)
@@ -27,8 +27,8 @@
 		return new Reporter[] {
 			new CheckSumReporter(defaultReporterOutputPath()),
 			new PlainTextReporter(defaultReporterOutputPath()), 
-//			new CustomBarPDFReporter(defaultReporterOutputPath()),
-			new LinePDFReporter(defaultReporterOutputPath()),
+			new CustomBarPDFReporter(defaultReporterOutputPath()),
+			// new LinePDFReporter(defaultReporterOutputPath()),
 			new CSVReporter(defaultReporterOutputPath()), 
 			new HTMLReporter(subfolderPath(defaultReporterOutputPath(), "html")),
 			new XLSReporter(defaultReporterOutputPath()),

Modified: trunk/polepos/src/org/polepos/reporters/PDFReporterBase.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/PDFReporterBase.java	2011-02-03 16:03:36 UTC (rev 179)
+++ trunk/polepos/src/org/polepos/reporters/PDFReporterBase.java	2011-02-04 12:16:15 UTC (rev 180)
@@ -27,6 +27,7 @@
 
 import org.jfree.chart.*;
 import org.polepos.framework.*;
+import org.polepos.teams.jdbc.*;
 
 import com.lowagie.text.*;
 import com.lowagie.text.pdf.*;
@@ -43,6 +44,7 @@
 	protected static final com.lowagie.text.Font h2Font = FontFactory.getFont(FontFactory.HELVETICA,12,Font.BOLD);
     protected static final com.lowagie.text.Font bigFont = FontFactory.getFont(FontFactory.HELVETICA,10,Font.BOLD);
     protected static final com.lowagie.text.Font smallFont = FontFactory.getFont(FontFactory.HELVETICA,9,Font.PLAIN);
+    protected static final com.lowagie.text.Font smallBoldFont = FontFactory.getFont(FontFactory.HELVETICA,9,Font.BOLD);
     protected static final com.lowagie.text.Font codeFont = FontFactory.getFont(FontFactory.COURIER,8,Font.PLAIN);
 
 	public PDFReporterBase(String path) {
@@ -74,10 +76,21 @@
     
     private void renderFirstPage(List<TeamCar> cars) throws DocumentException{        
         Paragraph para=new Paragraph();
-        para.add(new Chunk("PolePosition\n",h1Font));
-        para.add(new Chunk("the open source database benchmark\n",smallFont));
-        para.add(linked(new Chunk(ReporterConstants.WEBSITE + "\n\n\n", smallFont), ReporterConstants.WEBSITE));
-        para.add(new Chunk("Participating teams\n\n",h2Font));
+        CircuitSettings circuitSettings = new CircuitSettings();
+        String configurationName = circuitSettings.configurationName();
+        String title = "PolePosition";
+        if(configurationName != null && configurationName.length() > 0){
+        	title = title + " - " + configurationName;
+        }
+        title = title + " Results\n";
+        para.add(new Chunk(title,h1Font));
+        para.add(new Chunk("Results from running the Poleposition open source database benchmark\n\n\n",smallFont));
+        para.add(new Chunk("Related Links\n\n",h2Font));
+        para.add(new Chunk("Poleposition website\n", smallBoldFont));
+        para.add(linked(new Chunk(ReporterConstants.WEBSITE + "\n", smallFont), ReporterConstants.WEBSITE));
+        para.add(new Chunk("Explanation how the benchmarks are run\n", smallBoldFont));
+        para.add(linked(new Chunk(ReporterConstants.CIRCUITS_PAGE + "\n\n\n", smallFont), ReporterConstants.CIRCUITS_PAGE ));
+        para.add(new Chunk("Databases benchmarked in this run\n\n",h2Font));
         
         int i = 0;
         _pdfData.add(i++, para);
@@ -108,7 +121,7 @@
     
     private Element renderTeam(String name, String description, String website) throws DocumentException{
         Paragraph para=new Paragraph();
-        para.add(linked(new Chunk(name + "\n",bigFont), website));
+        para.add(linked(new Chunk(name + "\n",smallBoldFont), website));
         if(description != null){
             para.add(linked(new Chunk(description + "\n",smallFont), website));
         }
@@ -127,8 +140,6 @@
         anchor.setReference(link);
         return anchor;
     }
-    
-    
 
 	private void setupDocument(String path) {
 		if(_document != null){
@@ -178,7 +189,6 @@
         renderTableAndGraph(type, graph, unitsLegend);
 	}
 
-
 	protected abstract void renderTableAndGraph(int type, Graph graph, String unitsLegend) throws BadElementException;
 
 	@SuppressWarnings("unchecked")

Modified: trunk/polepos/src/org/polepos/reporters/ReporterConstants.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/ReporterConstants.java	2011-02-03 16:03:36 UTC (rev 179)
+++ trunk/polepos/src/org/polepos/reporters/ReporterConstants.java	2011-02-04 12:16:15 UTC (rev 180)
@@ -24,6 +24,7 @@
 
 public class ReporterConstants {
 	protected final static String WEBSITE="http://www.polepos.org";
+	protected final static String CIRCUITS_PAGE="http://www.polepos.org/circuits.html";
     public final static int TIME = 1;
     public final static int MEMORY = 2;
 	public static final String OLD_LOGARITHMIC_TIME_CHART_LEGEND = " 1  /  log(t + 2)                     better >";

Added: trunk/polepos/src/org/polepos/teams/jdbc/CircuitSettings.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/CircuitSettings.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/teams/jdbc/CircuitSettings.java	2011-02-04 12:16:15 UTC (rev 180)
@@ -0,0 +1,38 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.teams.jdbc;
+
+import org.polepos.*;
+import org.polepos.framework.*;
+
+public class CircuitSettings extends PropertiesHandler{
+	
+	private final static String     KEY_CONFIGURATION_NAME  = "configurationname";
+
+	public CircuitSettings() {
+		super(Settings.CIRCUIT);
+	}
+	
+	public String configurationName(){
+		return get(KEY_CONFIGURATION_NAME);
+	}
+
+}


Property changes on: trunk/polepos/src/org/polepos/teams/jdbc/CircuitSettings.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/teams/jdbc/JdbcSettings.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/JdbcSettings.java	2011-02-03 16:03:36 UTC (rev 179)
+++ trunk/polepos/src/org/polepos/teams/jdbc/JdbcSettings.java	2011-02-04 12:16:15 UTC (rev 180)
@@ -22,9 +22,6 @@
 import org.polepos.*;
 import org.polepos.framework.*;
 
-/**
- * @author Herkules
- */
 public class JdbcSettings extends RdbmsSettings {
 
     public JdbcSettings() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polepos-devel] SF.net SVN: polepos:[183] trunk/polepos

[<car...@us...>]

Revision: 183
          http://polepos.svn.sourceforge.net/polepos/?rev=183&view=rev
Author:   carlrosenberger
Date:     2011-02-09 14:28:48 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
cr + frm: Dropping old duplicated circuits. Renaming the ones that continue to exist to what they are really doing.

Modified Paths:
--------------
    trunk/polepos/settings/Circuits.properties
    trunk/polepos/settings/DebugCircuits.properties
    trunk/polepos/src/org/polepos/Db4oVersionRace.java
    trunk/polepos/src/org/polepos/RunSeason.java
    trunk/polepos/src/org/polepos/circuits/arraylists/ListHolder.java
    trunk/polepos/src/org/polepos/circuits/commits/LightObject.java
    trunk/polepos/src/org/polepos/circuits/strings/N1.java
    trunk/polepos/src/org/polepos/circuits/trees/Tree.java
    trunk/polepos/src/org/polepos/circuits/trees/TreeVisitor.java
    trunk/polepos/src/org/polepos/reporters/GraphReporter.java
    trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java
    trunk/polepos/src/org/polepos/teams/cobra/CobraTeam.java
    trunk/polepos/src/org/polepos/teams/db4o/Db4oTeam.java
    trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java
    trunk/polepos/src/org/polepos/teams/jdbc/JdbcTeam.java
    trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
    trunk/polepos/src/org/polepos/teams/jpa/JpaTeam.java
    trunk/polepos/src/org/polepos/teams/jvi/JviTeam.java

Added Paths:
-----------
    trunk/polepos/src/org/polepos/circuits/arraylists/
    trunk/polepos/src/org/polepos/circuits/arraylists/ArrayLists.java
    trunk/polepos/src/org/polepos/circuits/arraylists/ArrayListsDriver.java
    trunk/polepos/src/org/polepos/circuits/commits/
    trunk/polepos/src/org/polepos/circuits/commits/Commits.java
    trunk/polepos/src/org/polepos/circuits/commits/CommitsDriver.java
    trunk/polepos/src/org/polepos/circuits/nativeids/
    trunk/polepos/src/org/polepos/circuits/nativeids/NativeIds.java
    trunk/polepos/src/org/polepos/circuits/nativeids/NativeIdsDriver.java
    trunk/polepos/src/org/polepos/circuits/strings/
    trunk/polepos/src/org/polepos/circuits/strings/Strings.java
    trunk/polepos/src/org/polepos/circuits/strings/StringsDriver.java
    trunk/polepos/src/org/polepos/circuits/trees/
    trunk/polepos/src/org/polepos/circuits/trees/Trees.java
    trunk/polepos/src/org/polepos/circuits/trees/TreesDriver.java
    trunk/polepos/src/org/polepos/teams/cobra/TreesCobra.java
    trunk/polepos/src/org/polepos/teams/db4o/ArrayListsDb4o.java
    trunk/polepos/src/org/polepos/teams/db4o/CommitsDb4o.java
    trunk/polepos/src/org/polepos/teams/db4o/NativeIdsDb4o.java
    trunk/polepos/src/org/polepos/teams/db4o/StringsDb4o.java
    trunk/polepos/src/org/polepos/teams/db4o/TreesDb4o.java
    trunk/polepos/src/org/polepos/teams/hibernate/ArrayListsHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/CommitsHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/NativeIdsHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/StringsHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/TreesHibernate.java
    trunk/polepos/src/org/polepos/teams/jdbc/CommitsJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/NativeIdsJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/TreesJdbc.java
    trunk/polepos/src/org/polepos/teams/jdo/ArrayListsJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/CommitsJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/NativeIdsJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/StringsJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/TreesJdo.java
    trunk/polepos/src/org/polepos/teams/jpa/ArrayListsJpa.java
    trunk/polepos/src/org/polepos/teams/jpa/CommitsJpa.java
    trunk/polepos/src/org/polepos/teams/jpa/NativeIdsJpa.java
    trunk/polepos/src/org/polepos/teams/jpa/StringsJpa.java
    trunk/polepos/src/org/polepos/teams/jpa/TreesJpa.java
    trunk/polepos/src/org/polepos/teams/jvi/ArrayListsJvi.java
    trunk/polepos/src/org/polepos/teams/jvi/CommitsJvi.java
    trunk/polepos/src/org/polepos/teams/jvi/NativeIdsJvi.java
    trunk/polepos/src/org/polepos/teams/jvi/StringsJvi.java
    trunk/polepos/src/org/polepos/teams/jvi/TreesJvi.java

Removed Paths:
-------------
    trunk/polepos/src/org/polepos/circuits/arraylists/Montreal.java
    trunk/polepos/src/org/polepos/circuits/arraylists/MontrealDriver.java
    trunk/polepos/src/org/polepos/circuits/bahrain/
    trunk/polepos/src/org/polepos/circuits/barcelona/
    trunk/polepos/src/org/polepos/circuits/commits/Monaco.java
    trunk/polepos/src/org/polepos/circuits/commits/MonacoDriver.java
    trunk/polepos/src/org/polepos/circuits/imola/
    trunk/polepos/src/org/polepos/circuits/melbourne/
    trunk/polepos/src/org/polepos/circuits/monaco/
    trunk/polepos/src/org/polepos/circuits/montreal/
    trunk/polepos/src/org/polepos/circuits/nativeids/Imola.java
    trunk/polepos/src/org/polepos/circuits/nativeids/ImolaDriver.java
    trunk/polepos/src/org/polepos/circuits/nurburgring/
    trunk/polepos/src/org/polepos/circuits/sepang/
    trunk/polepos/src/org/polepos/circuits/strings/Nurburgring.java
    trunk/polepos/src/org/polepos/circuits/strings/NurburgringDriver.java
    trunk/polepos/src/org/polepos/circuits/trees/Sepang.java
    trunk/polepos/src/org/polepos/circuits/trees/SepangDriver.java
    trunk/polepos/src/org/polepos/teams/cobra/MelbourneCobra.java
    trunk/polepos/src/org/polepos/teams/cobra/SepangCobra.java
    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/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
    trunk/polepos/src/org/polepos/teams/hibernate/BahrainHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/BarcelonaHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/ImolaHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/MelbourneHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/MonacoHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/MontrealHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/NurburgringHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/SepangHibernate.java
    trunk/polepos/src/org/polepos/teams/jdbc/BahrainJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/BarcelonaJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/ImolaJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/MelbourneJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/MonacoJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/SepangJdbc.java
    trunk/polepos/src/org/polepos/teams/jdo/BahrainJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/BarcelonaJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/ImolaJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/MelbourneJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/MonacoJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/MontrealJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/NurburgringJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/SepangJdo.java
    trunk/polepos/src/org/polepos/teams/jpa/BahrainJpa.java
    trunk/polepos/src/org/polepos/teams/jpa/BarcelonaJpa.java
    trunk/polepos/src/org/polepos/teams/jpa/ImolaJpa.java
    trunk/polepos/src/org/polepos/teams/jpa/MelbourneJpa.java
    trunk/polepos/src/org/polepos/teams/jpa/MonacoJpa.java
    trunk/polepos/src/org/polepos/teams/jpa/MontrealJpa.java
    trunk/polepos/src/org/polepos/teams/jpa/NurburgringJpa.java
    trunk/polepos/src/org/polepos/teams/jpa/SepangJpa.java
    trunk/polepos/src/org/polepos/teams/jvi/BahrainJvi.java
    trunk/polepos/src/org/polepos/teams/jvi/BarcelonaJvi.java
    trunk/polepos/src/org/polepos/teams/jvi/ImolaJvi.java
    trunk/polepos/src/org/polepos/teams/jvi/MelbourneJvi.java
    trunk/polepos/src/org/polepos/teams/jvi/MonacoJvi.java
    trunk/polepos/src/org/polepos/teams/jvi/MontrealJvi.java
    trunk/polepos/src/org/polepos/teams/jvi/NurburgringJvi.java
    trunk/polepos/src/org/polepos/teams/jvi/SepangJvi.java

Modified: trunk/polepos/settings/Circuits.properties
===================================================================
--- trunk/polepos/settings/Circuits.properties	2011-02-05 13:35:50 UTC (rev 182)
+++ trunk/polepos/settings/Circuits.properties	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,3 +1,4 @@
+# Settings for all circuits in the Poleposition database benchmark.
 
 
 # Global settings for all circuits
@@ -51,90 +52,56 @@
 flatobject.commitinterval=10000,10000,10000
 
 
-# Settings for all circuits in the database benchmark.
+# commits
+#
+# [objects]: number of objects in the database
+# [commits]: number of added objects and commits
 
-# melbourne
+commits.objects=100000,300000,1000000
+commits.commits=30,30,30
+
+
+# strings
 #
 # [objects]: number of objects to be written, read and deleted
 # [commitintervall]: when to perform an intermediate commit during write and delete
 
-melbourne.objects=10000,30000,100000
-melbourne.commitinterval=1000,1000,1000
+strings.objects=10000,30000,100000
+strings.commitinterval=1000,1000,1000
 
 
-# sepang
+# arraylists
 #
-# [depth]: depth of the tree
+# [size]: number of elements per list
 
-sepang.depth=10,12,14
+arraylists.size=30,100,300
 
 
-
-#  bahrain
+# querycaching
 #
-# [objects]: number of objects to select from
-# [selects]: number of queries to be run against all objects
-# [updates]: number of updates to be run
-# [commitinterval]: when to perform an intermediate commit during write and delete
+# [objects]: number of objects to store
+# [selects]: number of query runs, executing the same query
 
-bahrain.objects=3000,10000,30000
-bahrain.selects=900,900,900
-bahrain.updates=800,800,800
-bahrain.commitinterval=1000,1000,1000
+querycaching.objects=10000,30000,100000
+querycaching.selects=1000,1000,1000
 
 
-# imola
+
+# trees
 #
-# [objects]: number of objects to select from
-# [selects]: number of queries run against all objects
-# [commitinterval]: when to perform an intermediate commit during write and delete
+# [depth]: depth of the tree
 
-imola.objects=30000,100000,300000
-imola.selects=5000,5000,5000
-imola.commitinterval=1000,1000,1000
+trees.depth=10,12,14
 
 
-# barcelona
+# nativeids
 #
 # [objects]: number of objects to select from
 # [selects]: number of queries run against all objects
+# [commitinterval]: when to perform an intermediate commit during write and delete
 
-barcelona.objects=3000,10000,30000
-barcelona.selects=100,100,100
+nativeids.objects=30000,100000,300000
+nativeids.selects=5000,5000,5000
+nativeids.commitinterval=1000,1000,1000
 
 
-# monaco
-#
-# [objects]: number of objects in the database
-# [commits]: number of added objects and commits
-
-monaco.objects=100000,300000,1000000
-monaco.commits=30,30,30
-
-
-# nurburgring
-#
-# [objects]: number of objects to be written, read and deleted
-# [commitintervall]: when to perform an intermediate commit during write and delete
-
-nurburgring.objects=10000,30000,100000
-nurburgring.commitinterval=1000,1000,1000
-
-
-# montreal
-#
-# [size]: number of elements per list
-
-montreal.size=30,100,300
-
-
-# istanbul
-#
-# [objects]: number of objects to store
-# [selects]: number of query runs, executing the same query
-
-istanbul.objects=10000,30000,100000
-istanbul.selects=1000,1000,1000
-
-
-

Modified: trunk/polepos/settings/DebugCircuits.properties
===================================================================
--- trunk/polepos/settings/DebugCircuits.properties	2011-02-05 13:35:50 UTC (rev 182)
+++ trunk/polepos/settings/DebugCircuits.properties	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,4 +1,4 @@
-# Settings for the database benchmark 
+# Settings for the Poleposition database benchmark 
 # with short test runs for debugging only
 # Results are not signifant
 
@@ -50,88 +50,56 @@
 flatobject.commitinterval=100,100,100
 
 
-# melbourne
-#
-# [objects]: number of objects to be written, read and deleted
-# [commitintervall]: when to perform an intermediate commit during write and delete
 
-melbourne.objects=10,30,100
-melbourne.commitinterval=10,10,10
-
-
-# sepang
+# commits
 #
-# [treedepth]: depth of the tree
-#
+# [objects]: number of objects in the database
+# [commits]: number of added objects and commits
 
-sepang.depth=2,3,4
+commits.objects=100,300,1000
+commits.commits=30,30,30
 
 
-#  bahrain
+# strings
 #
-# [objects]: number of objects to select from
-# [selects]: number of queries to be run against all objects
-# [updates]: number of updates to be run
-# [commitinterval]: when to perform an intermediate commit during write and delete
-#
+# [objects]: number of objects to be written, read and deleted
+# [commitintervall]: when to perform an intermediate commit during write and delete
 
-bahrain.objects=10,30,100,300
-bahrain.selects=10,10
-bahrain.updates=10,10
-bahrain.commitinterval=1000,1000
+strings.objects=30,100,300
+strings.commitinterval=10,10,10
 
 
-# imola
+# arraylists
 #
-# [objects]: number of objects to select from
-# [selects]: number of queries run against all objects
-# [commitinterval]: when to perform an intermediate commit during write and delete
+# [size]: number of elements per list
 
-imola.objects=1000,3000,10000
-imola.selects=500,500,500
-imola.commitinterval=1000,1000,1000
+arraylists.size=5,10,20
 
 
-
-# barcelona
+# querycaching
 #
-# [objects]: number of objects to select from
-# [selects]: number of queries run against all objects
+# [objects]: number of objects to store
+# [selects]: number of query runs, executing the same query
 
-barcelona.objects=100,300,1000
-barcelona.selects=10,10,10
+querycaching.objects=1000,3000,10000
+querycaching.selects=10,10,10,10
 
 
-
-# monaco
+# trees
 #
-# [objects]: number of objects in the database
-# [commits]: number of added objects and commits
-
-monaco.objects=100,300,1000
-monaco.commits=30,30,30
-
-
-# nurburgring
+# [treedepth]: depth of the tree
 #
-# [objects]: number of objects to be written, read and deleted
-# [commitintervall]: when to perform an intermediate commit during write and delete
 
-nurburgring.objects=30,100,300
-nurburgring.commitinterval=10,10,10
+trees.depth=2,3,4
 
 
-# montreal
+# nativeids
 #
-# [size]: number of elements per list
+# [objects]: number of objects to select from
+# [selects]: number of queries run against all objects
+# [commitinterval]: when to perform an intermediate commit during write and delete
 
-montreal.size=5,10,20
+nativeids.objects=1000,3000,10000
+nativeids.selects=500,500,500
+nativeids.commitinterval=1000,1000,1000
 
-
-# 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/Db4oVersionRace.java
===================================================================
--- trunk/polepos/src/org/polepos/Db4oVersionRace.java	2011-02-05 13:35:50 UTC (rev 182)
+++ trunk/polepos/src/org/polepos/Db4oVersionRace.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -22,14 +22,18 @@
 
 import java.util.*;
 
+import org.polepos.circuits.arraylists.*;
 import org.polepos.circuits.bahrain.*;
 import org.polepos.circuits.barcelona.*;
-import org.polepos.circuits.imola.*;
+import org.polepos.circuits.commits.*;
+import org.polepos.circuits.complex.*;
+import org.polepos.circuits.flatobject.*;
+import org.polepos.circuits.inheritancehierarchy.*;
 import org.polepos.circuits.melbourne.*;
-import org.polepos.circuits.monaco.*;
-import org.polepos.circuits.montreal.*;
-import org.polepos.circuits.nurburgring.*;
-import org.polepos.circuits.sepang.*;
+import org.polepos.circuits.nativeids.*;
+import org.polepos.circuits.nestedlists.*;
+import org.polepos.circuits.strings.*;
+import org.polepos.circuits.trees.*;
 import org.polepos.framework.*;
 import org.polepos.runner.db4o.*;
 import org.polepos.teams.db4o.*;
@@ -72,27 +76,29 @@
 
 	public CircuitBase[] circuits() {
 		return new CircuitBase[] { 
-				new Melbourne(), 
-				new Sepang(), 
-				new Bahrain(),
-				new Imola(),
-				new Barcelona(),
-				new Monaco(),
-				new Montreal(),
-				new Nurburgring(),
+				new ReflectiveCircuitBase(Complex.class),
+				new ReflectiveCircuitBase(NestedLists.class),
+				new ReflectiveCircuitBase(InheritanceHierarchy.class),
+				new ReflectiveCircuitBase(FlatObject.class),
+				new Trees(), 
+				new NativeIds(),
+				new Commits(),
+				new ArrayLists(),
+				new Strings(),
 		};
 	}
 
 	public DriverBase[] drivers() {
 		return new DriverBase [] {
-				new MelbourneDb4o(),
-		        new SepangDb4o(),
-		        new BahrainDb4o(),
-		        new ImolaDb4o(),
-		        new BarcelonaDb4o(),
-		        new MonacoDb4o(),
-		        new NurburgringDb4o(),
-		        new MontrealDb4o(),
+				new ComplexDb4o(),
+				new NestedListsDb4o(),
+				new InheritanceHierarchyDb4o(),
+				new FlatObjectDb4o(),
+		        new TreesDb4o(),
+		        new NativeIdsDb4o(),
+		        new CommitsDb4o(),
+		        new StringsDb4o(),
+		        new ArrayListsDb4o(),
 		};
 	}
     

Modified: trunk/polepos/src/org/polepos/RunSeason.java
===================================================================
--- trunk/polepos/src/org/polepos/RunSeason.java	2011-02-05 13:35:50 UTC (rev 182)
+++ trunk/polepos/src/org/polepos/RunSeason.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -21,18 +21,18 @@
 
 import java.io.*;
 
+import org.polepos.circuits.arraylists.*;
 import org.polepos.circuits.bahrain.*;
 import org.polepos.circuits.barcelona.*;
+import org.polepos.circuits.commits.*;
 import org.polepos.circuits.complex.*;
 import org.polepos.circuits.flatobject.*;
-import org.polepos.circuits.imola.*;
 import org.polepos.circuits.inheritancehierarchy.*;
 import org.polepos.circuits.melbourne.*;
-import org.polepos.circuits.monaco.*;
-import org.polepos.circuits.montreal.*;
+import org.polepos.circuits.nativeids.*;
 import org.polepos.circuits.nestedlists.*;
-import org.polepos.circuits.nurburgring.*;
-import org.polepos.circuits.sepang.*;
+import org.polepos.circuits.strings.*;
+import org.polepos.circuits.trees.*;
 import org.polepos.framework.*;
 import org.polepos.reporters.*;
 import org.polepos.runner.*;
@@ -62,23 +62,16 @@
 	@Override
 	public CircuitBase[] circuits() {
 		return new CircuitBase[] {
-				
 				new ReflectiveCircuitBase(Complex.class),
 				new ReflectiveCircuitBase(NestedLists.class),
 				new ReflectiveCircuitBase(InheritanceHierarchy.class),
 				new ReflectiveCircuitBase(FlatObject.class),
 				
-// Old Circuits
-// Most usecases are covered by the 4 new circuits
-				
-//				new Melbourne(), 
-//				new Sepang(), 
-//				new Bahrain(),
-//				new Imola(),
-//				new Barcelona(),
-//				new Monaco(),
-//				new Montreal(),
-//				new Nurburgring(),
+//				new Trees(), 
+//				new NativeIds(),
+//				new Commits(),
+//				new ArrayLists(),
+//				new Strings(),
 		};
 	}
 	

Copied: trunk/polepos/src/org/polepos/circuits/arraylists/ArrayLists.java (from rev 172, trunk/polepos/src/org/polepos/circuits/montreal/Montreal.java)
===================================================================
--- trunk/polepos/src/org/polepos/circuits/arraylists/ArrayLists.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/arraylists/ArrayLists.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -0,0 +1,27 @@
+/* Copyright (C) 2004 - 2006  db4objects Inc.  http://www.db4o.com */
+
+package org.polepos.circuits.arraylists;
+
+import org.polepos.framework.*;
+
+
+public class ArrayLists extends CircuitBase{
+
+    @Override
+    public String description() {
+        return "writes and reads 1000 ArrayLists";
+    }
+
+    @Override
+    protected void addLaps() {
+        add(new Lap("write"));
+        add(new Lap("read"));
+    }
+    
+    @Override
+    public Class requiredDriver() {
+        return ArrayListsDriver.class;
+    }
+
+
+}

Copied: trunk/polepos/src/org/polepos/circuits/arraylists/ArrayListsDriver.java (from rev 172, trunk/polepos/src/org/polepos/circuits/montreal/MontrealDriver.java)
===================================================================
--- trunk/polepos/src/org/polepos/circuits/arraylists/ArrayListsDriver.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/arraylists/ArrayListsDriver.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -0,0 +1,12 @@
+/* Copyright (C) 2004 - 2006  db4objects Inc.  http://www.db4o.com */
+
+package org.polepos.circuits.arraylists;
+
+
+public interface ArrayListsDriver {
+    
+    public void write();
+    
+    public void read();
+
+}

Modified: trunk/polepos/src/org/polepos/circuits/arraylists/ListHolder.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/montreal/ListHolder.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/arraylists/ListHolder.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004 - 2006  db4objects Inc.  http://www.db4o.com */
 
-package org.polepos.circuits.montreal;
+package org.polepos.circuits.arraylists;
 
 import java.util.*;
 

Deleted: trunk/polepos/src/org/polepos/circuits/arraylists/Montreal.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/montreal/Montreal.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/arraylists/Montreal.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,27 +0,0 @@
-/* Copyright (C) 2004 - 2006  db4objects Inc.  http://www.db4o.com */
-
-package org.polepos.circuits.montreal;
-
-import org.polepos.framework.*;
-
-
-public class Montreal extends CircuitBase{
-
-    @Override
-    public String description() {
-        return "writes and reads 1000 ArrayLists";
-    }
-
-    @Override
-    protected void addLaps() {
-        add(new Lap("write"));
-        add(new Lap("read"));
-    }
-    
-    @Override
-    public Class requiredDriver() {
-        return MontrealDriver.class;
-    }
-
-
-}

Deleted: trunk/polepos/src/org/polepos/circuits/arraylists/MontrealDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/montreal/MontrealDriver.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/arraylists/MontrealDriver.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,12 +0,0 @@
-/* Copyright (C) 2004 - 2006  db4objects Inc.  http://www.db4o.com */
-
-package org.polepos.circuits.montreal;
-
-
-public interface MontrealDriver {
-    
-    public void write();
-    
-    public void read();
-
-}

Copied: trunk/polepos/src/org/polepos/circuits/commits/Commits.java (from rev 172, trunk/polepos/src/org/polepos/circuits/monaco/Monaco.java)
===================================================================
--- trunk/polepos/src/org/polepos/circuits/commits/Commits.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/commits/Commits.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -0,0 +1,44 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+package org.polepos.circuits.commits;
+
+import org.polepos.framework.*;
+
+
+public class Commits extends CircuitBase{
+
+    @Override
+    public String description() {
+        return "tests the scalability of commit performance";
+    }
+
+    @Override
+    protected void addLaps() {
+        add(new Lap("write",false, false));
+        add(new Lap("commits"));
+    }
+    
+    @Override
+    public Class requiredDriver() {
+		return CommitsDriver.class;
+	}
+
+
+}

Added: trunk/polepos/src/org/polepos/circuits/commits/CommitsDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/commits/CommitsDriver.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/commits/CommitsDriver.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -0,0 +1,29 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+package org.polepos.circuits.commits;
+
+
+public interface CommitsDriver {
+    
+    void write();
+    
+    void commits();
+
+}

Modified: trunk/polepos/src/org/polepos/circuits/commits/LightObject.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/monaco/LightObject.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/commits/LightObject.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -18,7 +18,7 @@
 MA  02111-1307, USA. */
 
 
-package org.polepos.circuits.monaco;
+package org.polepos.circuits.commits;
 
 import org.polepos.framework.*;
 

Deleted: trunk/polepos/src/org/polepos/circuits/commits/Monaco.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/monaco/Monaco.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/commits/Monaco.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,44 +0,0 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-package org.polepos.circuits.monaco;
-
-import org.polepos.framework.*;
-
-
-public class Monaco extends CircuitBase{
-
-    @Override
-    public String description() {
-        return "tests the scalability of commit performance";
-    }
-
-    @Override
-    protected void addLaps() {
-        add(new Lap("write",false, false));
-        add(new Lap("commits"));
-    }
-    
-    @Override
-    public Class requiredDriver() {
-		return MonacoDriver.class;
-	}
-
-
-}

Deleted: trunk/polepos/src/org/polepos/circuits/commits/MonacoDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/monaco/MonacoDriver.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/commits/MonacoDriver.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,29 +0,0 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-package org.polepos.circuits.monaco;
-
-
-public interface MonacoDriver {
-    
-    void write();
-    
-    void commits();
-
-}

Deleted: trunk/polepos/src/org/polepos/circuits/nativeids/Imola.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/imola/Imola.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/nativeids/Imola.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,43 +0,0 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-package org.polepos.circuits.imola;
-
-import org.polepos.framework.*;
-
-public class Imola extends CircuitBase {
-
-	@Override
-	public String description() {
-		return "retrieves objects by native id";
-	}
-    
-    @Override
-    protected void addLaps() {
-        add(new Lap("store", false, false));
-        add(new Lap("retrieve"));
-    }
-    
-    @Override
-    public Class requiredDriver() {
-		return ImolaDriver.class;
-	}
-
-    
-}

Deleted: trunk/polepos/src/org/polepos/circuits/nativeids/ImolaDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/imola/ImolaDriver.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/nativeids/ImolaDriver.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,25 +0,0 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-package org.polepos.circuits.imola;
-
-public interface ImolaDriver {
-	void store();
-	void retrieve();
-}

Copied: trunk/polepos/src/org/polepos/circuits/nativeids/NativeIds.java (from rev 172, trunk/polepos/src/org/polepos/circuits/imola/Imola.java)
===================================================================
--- trunk/polepos/src/org/polepos/circuits/nativeids/NativeIds.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/nativeids/NativeIds.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -0,0 +1,43 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+package org.polepos.circuits.nativeids;
+
+import org.polepos.framework.*;
+
+public class NativeIds extends CircuitBase {
+
+	@Override
+	public String description() {
+		return "retrieves objects by native id";
+	}
+    
+    @Override
+    protected void addLaps() {
+        add(new Lap("store", false, false));
+        add(new Lap("retrieve"));
+    }
+    
+    @Override
+    public Class requiredDriver() {
+		return NativeIdsDriver.class;
+	}
+
+    
+}

Added: trunk/polepos/src/org/polepos/circuits/nativeids/NativeIdsDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/nativeids/NativeIdsDriver.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/nativeids/NativeIdsDriver.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -0,0 +1,25 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+package org.polepos.circuits.nativeids;
+
+public interface NativeIdsDriver {
+	void store();
+	void retrieve();
+}

Modified: trunk/polepos/src/org/polepos/circuits/strings/N1.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/nurburgring/N1.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/strings/N1.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,6 +1,6 @@
 /* Copyright (C) 2004 - 2006  db4objects Inc.  http://www.db4o.com */
 
-package org.polepos.circuits.nurburgring;
+package org.polepos.circuits.strings;
 
 
 public class N1 {

Deleted: trunk/polepos/src/org/polepos/circuits/strings/Nurburgring.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/nurburgring/Nurburgring.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/strings/Nurburgring.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,45 +0,0 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-
-package org.polepos.circuits.nurburgring;
-
-import org.polepos.framework.*;
-
-
-public class Nurburgring extends CircuitBase{
-    
-    @Override
-    public String description(){
-        return "tests String storing and loading efficieny";
-    }
-    
-    @Override
-    protected void addLaps() {
-        add(new Lap("write"));
-        add(new Lap("read"));
-    }
-    
-    @Override
-    public Class requiredDriver() {
-        return NurburgringDriver.class;
-    }
-
-
-}

Deleted: trunk/polepos/src/org/polepos/circuits/strings/NurburgringDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/nurburgring/NurburgringDriver.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/strings/NurburgringDriver.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,30 +0,0 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-
-package org.polepos.circuits.nurburgring;
-
-
-public interface NurburgringDriver {
-    
-    public void write();
-    
-    public void read();
-
-}

Copied: trunk/polepos/src/org/polepos/circuits/strings/Strings.java (from rev 172, trunk/polepos/src/org/polepos/circuits/nurburgring/Nurburgring.java)
===================================================================
--- trunk/polepos/src/org/polepos/circuits/strings/Strings.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/strings/Strings.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -0,0 +1,45 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.circuits.strings;
+
+import org.polepos.framework.*;
+
+
+public class Strings extends CircuitBase{
+    
+    @Override
+    public String description(){
+        return "tests String storing and loading efficieny";
+    }
+    
+    @Override
+    protected void addLaps() {
+        add(new Lap("write"));
+        add(new Lap("read"));
+    }
+    
+    @Override
+    public Class requiredDriver() {
+        return StringsDriver.class;
+    }
+
+
+}

Copied: trunk/polepos/src/org/polepos/circuits/strings/StringsDriver.java (from rev 172, trunk/polepos/src/org/polepos/circuits/nurburgring/NurburgringDriver.java)
===================================================================
--- trunk/polepos/src/org/polepos/circuits/strings/StringsDriver.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/strings/StringsDriver.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -0,0 +1,30 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.circuits.strings;
+
+
+public interface StringsDriver {
+    
+    public void write();
+    
+    public void read();
+
+}

Deleted: trunk/polepos/src/org/polepos/circuits/trees/Sepang.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/sepang/Sepang.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/trees/Sepang.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,52 +0,0 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-package org.polepos.circuits.sepang;
-
-import org.polepos.framework.*;
-
-/**
- * @author Herkules
- */
-public class Sepang extends CircuitBase
-{
-    
-    @Override
-    public String description(){
-        return "writes, reads and then deletes an object tree";
-    }
-    
-    @Override
-    protected void addLaps() {
-        add(new Lap("write"));
-        add(new Lap("read"));
-        add(new Lap("delete", false, true, false));
-   }
-    
-    @Override
-    public Class requiredDriver() {
-		return SepangDriver.class;
-	}
-    
-    @Override
-    public String name() {
-    	return "Tree";
-    }
-
-}

Deleted: trunk/polepos/src/org/polepos/circuits/trees/SepangDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/sepang/SepangDriver.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/trees/SepangDriver.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,31 +0,0 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-package org.polepos.circuits.sepang;
-
-public interface SepangDriver
-{
-    
-	void write();
-    
-    void read ();
-    
-	void delete ();
-    
-}

Modified: trunk/polepos/src/org/polepos/circuits/trees/Tree.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/sepang/Tree.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/trees/Tree.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -17,7 +17,7 @@
 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA  02111-1307, USA. */
 
-package org.polepos.circuits.sepang;
+package org.polepos.circuits.trees;
 
 
 public class Tree {

Modified: trunk/polepos/src/org/polepos/circuits/trees/TreeVisitor.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/sepang/TreeVisitor.java	2011-01-03 15:21:54 UTC (rev 172)
+++ trunk/polepos/src/org/polepos/circuits/trees/TreeVisitor.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -17,7 +17,7 @@
 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA  02111-1307, USA. */
 
-package org.polepos.circuits.sepang;
+package org.polepos.circuits.trees;
 
 public interface TreeVisitor {
     

Copied: trunk/polepos/src/org/polepos/circuits/trees/Trees.java (from rev 172, trunk/polepos/src/org/polepos/circuits/sepang/Sepang.java)
===================================================================
--- trunk/polepos/src/org/polepos/circuits/trees/Trees.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/trees/Trees.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -0,0 +1,49 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+package org.polepos.circuits.trees;
+
+import org.polepos.framework.*;
+
+public class Trees extends CircuitBase
+{
+    
+    @Override
+    public String description(){
+        return "writes, reads and then deletes an object tree";
+    }
+    
+    @Override
+    protected void addLaps() {
+        add(new Lap("write"));
+        add(new Lap("read"));
+        add(new Lap("delete", false, true, false));
+   }
+    
+    @Override
+    public Class requiredDriver() {
+		return TreesDriver.class;
+	}
+    
+    @Override
+    public String name() {
+    	return "Tree";
+    }
+
+}

Copied: trunk/polepos/src/org/polepos/circuits/trees/TreesDriver.java (from rev 172, trunk/polepos/src/org/polepos/circuits/sepang/SepangDriver.java)
===================================================================
--- trunk/polepos/src/org/polepos/circuits/trees/TreesDriver.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/trees/TreesDriver.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -0,0 +1,31 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+package org.polepos.circuits.trees;
+
+public interface TreesDriver
+{
+    
+	void write();
+    
+    void read ();
+    
+	void delete ();
+    
+}

Modified: trunk/polepos/src/org/polepos/reporters/GraphReporter.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/GraphReporter.java	2011-02-05 13:35:50 UTC (rev 182)
+++ trunk/polepos/src/org/polepos/reporters/GraphReporter.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -111,7 +111,7 @@
     
     @Override
     public void endSeason() {
-    	persist(mGraphs);
+    	// persist(mGraphs);
     	render();
     }
 

Modified: trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java
===================================================================
--- trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java	2011-02-05 13:35:50 UTC (rev 182)
+++ trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -32,6 +32,16 @@
 
 public abstract class AbstractDb4oVersionsRaceRunner extends AbstractRunner {
 	
+	private String[] colors = new String[]{
+			"0xFFCA07",
+			"0x44BDE0", 
+			"0x127ABF",
+			"0x2B439C", 
+
+	};
+	
+	private int currentColor;
+	
 	public abstract DriverBase[] drivers();
 	
 	private String _workspace;
@@ -85,11 +95,16 @@
                 
                 ClassLoader loader=new VersionClassLoader(urls, prefixes, Team.class.getClassLoader());
                 team = instantiateTeam((Class<? extends Team>)loader.loadClass(Db4oTeam.class.getName()), loadDrivers);
+                
             }
             team.configure(options, configurations);
             if(jarName != null){
                 team.getClass().getMethod("setJarName", new Class[]{String.class}).invoke(team, jarName);
             }
+            if(currentColor < colors.length){
+            	String color = colors[currentColor++];
+            	invoke(team, "setColor", color);
+            }
             
             for (int i = 0; i < drivers.length; i++) {
                 String driverName = drivers[i].getClass().getName();

Modified: trunk/polepos/src/org/polepos/teams/cobra/CobraTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/cobra/CobraTeam.java	2011-02-05 13:35:50 UTC (rev 182)
+++ trunk/polepos/src/org/polepos/teams/cobra/CobraTeam.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -70,8 +70,7 @@
     @Override
     public DriverBase[] drivers() {
         return new DriverBase[]{
-            new MelbourneCobra(),
-            new SepangCobra()
+            new TreesCobra()
         };
     }
     

Deleted: trunk/polepos/src/org/polepos/teams/cobra/MelbourneCobra.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/cobra/MelbourneCobra.java	2011-02-05 13:35:50 UTC (rev 182)
+++ trunk/polepos/src/org/polepos/teams/cobra/MelbourneCobra.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,115 +0,0 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-package org.polepos.teams.cobra;
-
-
-import java.util.Arrays;
-
-import org.polepos.circuits.melbourne.MelbourneDriver;
-import org.polepos.teams.jdo.Log;
-import org.polepos.teams.jdo.data.JdoPilot;
-
-import com.versant.odbms.DataStoreLockMode;
-import com.versant.odbms.DatastoreInfo;
-import com.versant.odbms.DatastoreManager;
-import com.versant.odbms.Options;
-import com.versant.odbms.model.DatastoreObject;
-import com.versant.odbms.model.DatastoreSchemaClass;
-import com.versant.odbms.model.DatastoreSchemaField;
-import com.versant.odbms.model.SchemaEditor;
-import com.versant.odbms.query.DatastoreQuery;
-
-/**
- * @author Christian Ernst
- */
-public class MelbourneCobra extends CobraDriver implements MelbourneDriver{
-	
-	public void write(){
-    	
-        DatastoreManager dm = db();
-		DatastoreInfo info = dm.getPrimaryDatastoreInfo();
-		SchemaEditor editor = dm.getSchemaEditor();
-
-		DatastoreSchemaClass dsc = editor.findClass(JdoPilot.class.getName(), info);
-		
-		DatastoreSchemaField dsfName = dsc.findField("mName");
-		DatastoreSchemaField dsfPoints = dsc.findField("mPoints");
-		
-		begin();
-        
-        int numobjects = setup().getObjectCount();
-        int commitinterval = setup().getCommitInterval();
-		
-		int commitctr = 0;
-		
-		for ( int i = 1; i <= numobjects; i++ ){
-
-			DatastoreObject dos = new DatastoreObject(dm.getNewLoid(),dsc,info); 
-            
-			dos.allocate();
-			dos.setIsNew(true);
-			               
-			dos.writeString(dsfName,new String("Pilot_" + i));
-			dos.writeInt(dsfPoints, i);
-
-			store(dos);
-			
-			if ( commitinterval > 0  &&  ++commitctr >= commitinterval ){
-				commitctr = 0;
-				commit();
-				begin();
-				Log.logger.fine( "commit while writing at " + i+1 ); //NOI18N
-			}
-            addToCheckSum(i);
-		}
-		
-		commit();
-	}
-	
-	public void read(){
-		readExtent(JdoPilot.class,"mPoints");
-	}
-    
-    public void read_hot() {
-    	readExtent(JdoPilot.class,"mPoints");
-    }
-    
-	public void delete(){
-		
-		DatastoreManager dm = db();
-		
-        int numobjects =setup().getObjectCount();
-        int commitinterval = setup().getCommitInterval();
-
-		begin();
-
-		DatastoreQuery qry = new DatastoreQuery(JdoPilot.class.getName());
-		Object[] loids = dm.executeQuery(qry, DataStoreLockMode.NOLOCK, DataStoreLockMode.NOLOCK, Options.NO_OPTIONS);
-
-		for ( int i = 0; i < numobjects; i+=commitinterval ){
-			
-			DatastoreObject[] dsos = dm.getLoidsAsDSO(Arrays.copyOfRange(loids, i, i+commitinterval));
-			dm.groupDeleteObjects(dsos, Options.NO_OPTIONS);
-            commit();
-			begin();
-		}
-		commit();
-	}
-}

Deleted: trunk/polepos/src/org/polepos/teams/cobra/SepangCobra.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/cobra/SepangCobra.java	2011-02-05 13:35:50 UTC (rev 182)
+++ trunk/polepos/src/org/polepos/teams/cobra/SepangCobra.java	2011-02-09 14:28:48 UTC (rev 183)
@@ -1,175 +0,0 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-package org.polepos.teams.cobra;
-import org.polepos.circuits.sepang.SepangDriver;
-import org.polepos.teams.jdo.data.JdoTree;
-
-import com.versant.odbms.DataStoreLockMode;
-import com.versant.odbms.DatastoreInfo;
-import com.versant.odbms.DatastoreLoid;
-import com.versant.odbms.DatastoreManager;
-import com.versant.odbms.Options;
-import com.versant.odbms.model.DatastoreObject;
-import com.versant.odbms.model.DatastoreSchemaClass;
-import com.versant.odbms.model.DatastoreSchemaField;
-import com.versant.odbms.model.SchemaEditor;
-
-/**
- * @author Christian Ernst
- */
-public class SepangCobra extends CobraDriver implements SepangDriver {
-    
-    private long oid;
-    
-	private static long idGenerator;
-	
-    private DatastoreObject writeTree(int depth){
-        idGenerator = 0;
-        return writeTree(depth, 0);
-    }
-    
-    private DatastoreObject writeTree(int maxDepth, int currentDepth){
-        
-        if(maxDepth <= 0){
-            return null;
-        }
-        
-        DatastoreManager dm = db();
-		DatastoreInfo info = dm.getPrimaryDatastoreInfo();
-		SchemaEditor editor = dm.getSchemaEditor();
-		DatastoreSchemaClass dsc = editor.findClass(JdoTree.class.getName(), info);
-		DatastoreSchemaField dsfName = dsc.findField("name");
-		DatastoreSchemaField dsfId = dsc.findField("id");
-		DatastoreSchemaField dsfDepth = dsc.findField("depth");
-		DatastoreSchemaField dsfPreceding = dsc.findField("preceding");
-		DatastoreSchemaField dsfSubsequent = dsc.findField("subsequent");
-		
-		DatastoreObject dos = new DatastoreObject(dm.getNewLoid(),dsc,info); 
- 		dos.allocate();
-		dos.setIsNew(true);
-
-        if(currentDepth == 0){
-        	dos.writeString(dsfName, "root");
-        }else{
-        	dos.writeString(dsfName, "node at depth " + currentDepth);
-        }
-        dos.writeLong(dsfId, ++idGenerator);
-        dos.writeInt(dsfDepth,currentDepth);
-        
-        DatastoreObject preceding = writeTree(maxDepth - 1, currentDepth + 1);
-        DatastoreObject subsequent = writeTree(maxDepth - 1, currentDepth + 1);
-        
-        if(preceding != null){
-        	dos.writeLOID(dsfPreceding, preceding.getLOID());
-        }
-        if(subsequent != null){
-        	dos.writeLOID(dsfSubsequent,subsequent.getLOID() );
-        }
-        
-        store(dos);
-        
-        return dos;
-    }
-
-    private void readTree(DatastoreObject tree){
-    	
-    	DatastoreManager dm = db();
-		DatastoreInfo info = dm.getPrimaryDatastoreInfo();
-		SchemaEditor editor = dm.getSchemaEditor();
-		DatastoreSchemaClass dsc = editor.findClass(JdoTree.class.getName(), info);
-		DatastoreSchemaField dsfDepth = dsc.findField("depth");
-		DatastoreSchemaField dsfPreceding = dsc.findField("preceding");
-		DatastoreSchemaField dsfSubsequent = dsc.findField("subsequent");
-    	
-    	addToCheckSum(tree.readInt(dsfDepth));
-    	
-    	long loidPreceding = tree.readLOID(dsfPreceding);
-    	long loidSubsequent = tree.readLOID(dsfSubsequent);
-    	DatastoreObject preceding = null;
-    	DatastoreObject subsequent = null;
-    	
-    	if(loidPreceding != 0){
-    		preceding = db().getLoidsAsDSO(new DatastoreLoid[]{new DatastoreLoid(loidPreceding)})[0];
-    		db().readObject(preceding, DataStoreLockMode.NOLOCK, Options.NO_OPTIONS);
-        	readTree(preceding);
-    	}
-    	if(loidSubsequent != 0){
-    		subsequent = db().getLoidsAsDSO(new DatastoreLoid[]{new DatastoreLoid(loidSubsequent)})[0];
-    		db().readObject(subsequent, DataStoreLockMode.NOLOCK, Options.NO_OPTIONS);
-        	readTree(subsequent);
-    	}
-    	
-    }
-    
-	public void write(){
-		begin();
-        DatastoreObject tree = writeTree(setup().getDepth());
-        oid = tree.getLOID();
-		commit();
-	}
-
-	public void read(){
-		
-		DatastoreObject tree = db().getLoidsAsDSO(new DatastoreLoid[]{new DatastoreLoid(oid)})[0];
-		db().readObject(tree, DataStoreLockMode.NOLOCK, Options.NO_OPTIONS);
-		readTree(tree);
-	}
-    
-    private void deleteTree(DatastoreObject tree){
-    	
-    	DatastoreManager dm = db();
-		DatastoreInfo info = dm.getPrimaryDatastoreInfo();
-		SchemaEditor editor = dm.getSchemaEditor();
-...
 
[truncated message content]

[Polepos-devel] SF.net SVN: polepos:[186] trunk/polepos

[<car...@us...>]

Revision: 186
          http://polepos.svn.sourceforge.net/polepos/?rev=186&view=rev
Author:   carlrosenberger
Date:     2011-02-17 17:15:21 +0000 (Thu, 17 Feb 2011)

Log Message:
-----------
cr + pr: Work on concurrency circuit and fixed time circuit runner.

Modified Paths:
--------------
    trunk/polepos/settings/Circuits.properties
    trunk/polepos/settings/DebugCircuits.properties
    trunk/polepos/src/org/polepos/Db4oVersionRace.java
    trunk/polepos/src/org/polepos/RunSeason.java
    trunk/polepos/src/org/polepos/circuits/arraylists/ArrayLists.java
    trunk/polepos/src/org/polepos/circuits/commits/Commits.java
    trunk/polepos/src/org/polepos/circuits/nativeids/NativeIds.java
    trunk/polepos/src/org/polepos/circuits/strings/Strings.java
    trunk/polepos/src/org/polepos/circuits/trees/Trees.java
    trunk/polepos/src/org/polepos/framework/Circuit.java
    trunk/polepos/src/org/polepos/framework/CircuitBase.java
    trunk/polepos/src/org/polepos/framework/ConcurrencyCircuit.java
    trunk/polepos/src/org/polepos/framework/ConcurrentDriver.java
    trunk/polepos/src/org/polepos/framework/Driver.java
    trunk/polepos/src/org/polepos/framework/DriverBase.java
    trunk/polepos/src/org/polepos/framework/Racer.java
    trunk/polepos/src/org/polepos/framework/ReflectiveCircuitBase.java
    trunk/polepos/src/org/polepos/framework/Result.java
    trunk/polepos/src/org/polepos/framework/TurnSetup.java
    trunk/polepos/src/org/polepos/framework/TurnSetupConfig.java
    trunk/polepos/src/org/polepos/reporters/PlainTextReporter.java
    trunk/polepos/src/org/polepos/runner/AbstractRunner.java
    trunk/polepos/src/org/polepos/teams/cobra/CobraCar.java
    trunk/polepos/src/org/polepos/teams/cobra/CobraDriver.java
    trunk/polepos/src/org/polepos/teams/db4o/ComplexDb4o.java
    trunk/polepos/src/org/polepos/teams/db4o/Db4oDriver.java
    trunk/polepos/src/org/polepos/teams/db4o/Db4oTeam.java
    trunk/polepos/src/org/polepos/teams/hibernate/HibernateDriver.java
    trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java
    trunk/polepos/src/org/polepos/teams/hibernate/NativeIdsHibernate.java
    trunk/polepos/src/org/polepos/teams/jdbc/CommitsJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/FlatObjectJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/InheritanceHierarchyJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/JdbcCar.java
    trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java
    trunk/polepos/src/org/polepos/teams/jdbc/JdbcTeam.java
    trunk/polepos/src/org/polepos/teams/jdbc/NativeIdsJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/NestedListsJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/TreesJdbc.java
    trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
    trunk/polepos/src/org/polepos/teams/jdo/JdoDriver.java
    trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
    trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java
    trunk/polepos/src/org/polepos/teams/jpa/JpaDriver.java
    trunk/polepos/src/org/polepos/teams/jvi/JviCar.java
    trunk/polepos/src/org/polepos/teams/jvi/JviDriver.java

Added Paths:
-----------
    trunk/polepos/src/org/polepos/circuits/complexconcurrency/
    trunk/polepos/src/org/polepos/circuits/complexconcurrency/ComplexConcurrency.java
    trunk/polepos/src/org/polepos/circuits/complexconcurrency/ComplexConcurrencyDriver.java
    trunk/polepos/src/org/polepos/framework/FixedTimeCircuitBase.java
    trunk/polepos/src/org/polepos/framework/FixedTimeDriver.java
    trunk/polepos/src/org/polepos/framework/FixedTimeRacingStrategy.java
    trunk/polepos/src/org/polepos/framework/FixedTimeResult.java
    trunk/polepos/src/org/polepos/framework/RacingStrategy.java
    trunk/polepos/src/org/polepos/framework/TimedLapsCircuitBase.java
    trunk/polepos/src/org/polepos/framework/TimedLapsRacingStrategy.java
    trunk/polepos/src/org/polepos/framework/TimedLapsResult.java
    trunk/polepos/src/org/polepos/teams/db4o/ComplexConcurrencyDb4o.java
    trunk/polepos/src/org/polepos/teams/jdo/ComplexConcurrencyJdo.java

Removed Paths:
-------------
    trunk/polepos/src/org/polepos/framework/CarMotorFailureException.java

Modified: trunk/polepos/settings/Circuits.properties
===================================================================
--- trunk/polepos/settings/Circuits.properties	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/settings/Circuits.properties	2011-02-17 17:15:21 UTC (rev 186)
@@ -105,3 +105,15 @@
 nativeids.commitinterval=1000,1000,1000
 
 
+
+# complexconcurrency
+# 
+# [threads]: number of worker threads
+# [time]: time until stopped
+
+complexconcurrency.threads=1,3,10
+complexconcurrency.time=1000,1000,1000
+complexconcurrency.objects=3,3,3
+complexconcurrency.depth=3,3,3
+complexconcurrency.selects=10,10,10
+

Modified: trunk/polepos/settings/DebugCircuits.properties
===================================================================
--- trunk/polepos/settings/DebugCircuits.properties	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/settings/DebugCircuits.properties	2011-02-17 17:15:21 UTC (rev 186)
@@ -103,3 +103,17 @@
 nativeids.selects=500,500,500
 nativeids.commitinterval=1000,1000,1000
 
+
+
+# complexconcurrency
+# 
+# [threads]: number of worker threads
+# [time]: time until stopped
+
+complexconcurrency.threads=1,3,10
+complexconcurrency.time=1000,1000,1000
+complexconcurrency.objects=3,3,3
+complexconcurrency.depth=3,3,3
+complexconcurrency.selects=10,10,10
+
+

Modified: trunk/polepos/src/org/polepos/Db4oVersionRace.java
===================================================================
--- trunk/polepos/src/org/polepos/Db4oVersionRace.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/Db4oVersionRace.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -71,8 +71,8 @@
         return teams;
     }
 
-	public CircuitBase[] circuits() {
-		return new CircuitBase[] { 
+	public Circuit[] circuits() {
+		return new Circuit[] { 
 				new ReflectiveCircuitBase(Complex.class),
 				new ReflectiveCircuitBase(NestedLists.class),
 				new ReflectiveCircuitBase(InheritanceHierarchy.class),

Modified: trunk/polepos/src/org/polepos/RunSeason.java
===================================================================
--- trunk/polepos/src/org/polepos/RunSeason.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/RunSeason.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -24,6 +24,7 @@
 import org.polepos.circuits.arraylists.*;
 import org.polepos.circuits.commits.*;
 import org.polepos.circuits.complex.*;
+import org.polepos.circuits.complexconcurrency.*;
 import org.polepos.circuits.flatobject.*;
 import org.polepos.circuits.inheritancehierarchy.*;
 import org.polepos.circuits.nativeids.*;
@@ -57,8 +58,11 @@
 	}
 
 	@Override
-	public CircuitBase[] circuits() {
-		return new CircuitBase[] {
+	public Circuit[] circuits() {
+		return new Circuit[] {
+				
+				// new ComplexConcurrency(),
+				
 				new ReflectiveCircuitBase(Complex.class),
 				new ReflectiveCircuitBase(NestedLists.class),
 				new ReflectiveCircuitBase(InheritanceHierarchy.class),

Modified: trunk/polepos/src/org/polepos/circuits/arraylists/ArrayLists.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/arraylists/ArrayLists.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/circuits/arraylists/ArrayLists.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -5,7 +5,7 @@
 import org.polepos.framework.*;
 
 
-public class ArrayLists extends CircuitBase{
+public class ArrayLists extends TimedLapsCircuitBase{
 
     @Override
     public String description() {

Modified: trunk/polepos/src/org/polepos/circuits/commits/Commits.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/commits/Commits.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/circuits/commits/Commits.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -22,7 +22,7 @@
 import org.polepos.framework.*;
 
 
-public class Commits extends CircuitBase{
+public class Commits extends TimedLapsCircuitBase{
 
     @Override
     public String description() {

Added: trunk/polepos/src/org/polepos/circuits/complexconcurrency/ComplexConcurrency.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/complexconcurrency/ComplexConcurrency.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/complexconcurrency/ComplexConcurrency.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -0,0 +1,38 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.circuits.complexconcurrency;
+
+
+import org.polepos.framework.*;
+
+public class ComplexConcurrency extends FixedTimeCircuitBase{
+
+	@Override
+	public String description() {
+		return "runs the complex scenario against multiple concurrent clients within a fixed time span";
+	}
+
+	@Override
+	public Class<?> requiredDriver() {
+		return ComplexConcurrencyDriver.class;
+	}
+
+}


Property changes on: trunk/polepos/src/org/polepos/circuits/complexconcurrency/ComplexConcurrency.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/polepos/src/org/polepos/circuits/complexconcurrency/ComplexConcurrencyDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/complexconcurrency/ComplexConcurrencyDriver.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/complexconcurrency/ComplexConcurrencyDriver.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -0,0 +1,27 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.circuits.complexconcurrency;
+
+import org.polepos.framework.*;
+
+public interface ComplexConcurrencyDriver extends FixedTimeDriver {
+
+}


Property changes on: trunk/polepos/src/org/polepos/circuits/complexconcurrency/ComplexConcurrencyDriver.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/circuits/nativeids/NativeIds.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/nativeids/NativeIds.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/circuits/nativeids/NativeIds.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -21,7 +21,7 @@
 
 import org.polepos.framework.*;
 
-public class NativeIds extends CircuitBase {
+public class NativeIds extends TimedLapsCircuitBase {
 
 	@Override
 	public String description() {

Modified: trunk/polepos/src/org/polepos/circuits/strings/Strings.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/strings/Strings.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/circuits/strings/Strings.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -23,7 +23,7 @@
 import org.polepos.framework.*;
 
 
-public class Strings extends CircuitBase{
+public class Strings extends TimedLapsCircuitBase{
     
     @Override
     public String description(){

Modified: trunk/polepos/src/org/polepos/circuits/trees/Trees.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/trees/Trees.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/circuits/trees/Trees.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -21,7 +21,7 @@
 
 import org.polepos.framework.*;
 
-public class Trees extends CircuitBase
+public class Trees extends TimedLapsCircuitBase
 {
     
     @Override

Deleted: trunk/polepos/src/org/polepos/framework/CarMotorFailureException.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/CarMotorFailureException.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/framework/CarMotorFailureException.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -1,27 +0,0 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-package org.polepos.framework;
-
-
-public class CarMotorFailureException extends Exception{
-
-	private static final long serialVersionUID = 1L;
-
-}

Modified: trunk/polepos/src/org/polepos/framework/Circuit.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/Circuit.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/framework/Circuit.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -23,10 +23,8 @@
 
 public interface Circuit {
 
-	public TurnResult[] race(Team team, Car car, Driver driver);
+ 	public List<Lap> laps();
 
-	public List<Lap> laps();
-
 	public TurnSetup[] lapSetups();
 
 	public Class<?> requiredDriver();
@@ -35,20 +33,17 @@
 
 	public String internalName();
 	
-	public String fileNamePrefix();
-
 	public String name();
 
 	public void setTurnSetups(TurnSetup[] turnSetups);
 	
-	public TurnSetup[] getTurnSetups();
-
 	public Driver[] nominate(Team team);
 	
 	public void reportTo(Circuit circuit);
 	
 	public boolean isConcurrency();
 
-	public void runLapsBefore(Lap lap, TurnSetup turnSetup, DriverBase driver, Car car);
+	public RacingStrategy racingStrategy();
+	
 
 }
\ No newline at end of file

Modified: trunk/polepos/src/org/polepos/framework/CircuitBase.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/CircuitBase.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/framework/CircuitBase.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -1,346 +1,87 @@
-/* 
-This file is part of the PolePosition database benchmark
-http://www.polepos.org
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA  02111-1307, USA. */
-
-package org.polepos.framework;
-
-import java.util.*;
-
-import org.polepos.util.*;
-import org.polepos.watcher.*;
-
-/**
- * a set of timed test cases that work against the same data
- */
-public abstract class CircuitBase implements Circuit {
-    
-    public static final String NUM_RUNS_PROPERTY_ID = "POLEPOS_NUM_RUNS";
-    public static final String MEMORY_USAGE_PROPERTY_ID = "POLEPOS_MEMORY_USAGE";
-
-	private final int _numRuns = Integer.parseInt(System.getProperty(NUM_RUNS_PROPERTY_ID, "1"));
-	private final MemoryUsage _memoryUsage = memoryUsage();
-
-	private static MemoryUsage memoryUsage() {
-		try {
-			return (MemoryUsage)Class.forName(System.getProperty(MEMORY_USAGE_PROPERTY_ID, SimpleMemoryUsage.class.getName())).newInstance();
-		} 
-		catch (Exception exc) {
-			exc.printStackTrace();
-			return new SimpleMemoryUsage();
-		}
-	}
-
-	private List<Lap> _laps;
-    
-    private TurnSetup[] _turnSetups;
-        
-    // TODO: watcher can be installed, and should be sorted, i.e. memory watcher
-	// should start before time watcher
-    private TimeWatcher _timeWatcher;
-    
-    // TODO: The effect of MemoryWatcher is too strong on the running tests.
-    //       We should investigate if we can get less intrusive results with JMX
-    // private MemoryWatcher _memoryWatcher;
-    
-    private FileSizeWatcher _fileSizeWatcher;
-    
-    private Circuit _reportTo = this;
-    
-    protected CircuitBase(){
-        initWatchers();
-    }
-    
-    @Override
-	public void setTurnSetups(TurnSetup[] turnSetups){
-    	_turnSetups = turnSetups;
-    }
-
-	private void initWatchers() {
-		_timeWatcher = new TimeWatcher();
-		// _memoryWatcher = new MemoryWatcher();
-		_fileSizeWatcher = new FileSizeWatcher();
-	}
-    
-	/**
-     * public official name for reporting
-	 */
-    @Override
-	public String name(){
-        String name = internalName();
-        return name.substring(0,1).toUpperCase() + name.substring(1);
-    }
-
-    /**
-     * internal name for BenchmarkSettings.properties
-     */
-    @Override
-	public String internalName(){
-        String name = className();
-        int pos = name.lastIndexOf(".");
-        return name.substring(pos + 1).toLowerCase();
-    }
-
-	protected String className() {
-		return circuitClass().getName();
-	}
-
-	protected Class<?> circuitClass() {
-		return this.getClass();
-	}
-    
-    /**
-     * describes the intent of this circuit, what it wants to test
-     */
-	@Override
-	public abstract String description();
-
-    /**
-     * @return the driver class needed to run on this Circuit
-     */
-    @Override
-	public abstract Class<?> requiredDriver();
-    
-    /**
-     * @return the methods that are intended to be run 
-     */
-    protected abstract void addLaps();
-    
-	protected void add(Lap lap){
-        _laps.add(lap);
-        lap.circuit(this);
-    }
-    
-    /**
-     * setups are needed for reporting
-     */
-    @Override
-	public TurnSetup[] lapSetups(){
-        return _turnSetups;
-    }
-    
-    @Override
-	public List<Lap> laps() {
-    	if(_laps == null){
-    		_laps = new ArrayList<Lap>();
-    		addLaps();
-    	}
-        return _laps;
-    }
-    
-    /**
-     * calling all the laps for all the lapSetups
-     */
-    @Override
-	public TurnResult[] race( Team team, Car car, Driver driver){
-        TurnResult[] results = new TurnResult[ _turnSetups.length ];
-
-        int index = 0;
-        
-        for(TurnSetup setup : _turnSetups) {
-            System.out.println("*** Turn " + index);
-            results[index++] = runTurn(team, car, driver, index, setup);
-        }
-        return results;
-    }
-
-	private TurnResult runTurn(Team team, Car car, Driver driver, int index, TurnSetup setup) {
-		
-		Map<Lap, Set<LapReading>> lapReadings = new HashMap<Lap, Set<LapReading>>();
-		for (Lap lap : laps()) {
-			
-			if(lap.reportResult()) {
-				lapReadings.put(lap, new HashSet<LapReading>());
-			}
-		}
-		boolean warmUp = _numRuns > 1;
-		for (int runIdx = 0; runIdx < _numRuns; runIdx++) {
-			
-			prepareDriverToRunLaps(car, driver, setup);        
-			
-			for(Lap lap : laps()) {
-				
-				if(driver.canRunLap(lap)){
-					
-	            	System.out.println("*** Lap " + lap.name());
-	
-				    LapReading lapReading = runLap(team, driver, setup, lap);
-				    if(!warmUp && lap.reportResult()) {
-				    	lapReadings.get(lap).add(lapReading);
-				    }
-				}
-			}
-	
-			driver.backToPit();
-						
-			tearDownTurn(team, driver);
-			warmUp = false;
-		}
-		
-		TurnResult turnResult = new TurnResult();
-		for (Lap lap : laps()) {
-			if(!lap.reportResult()) {
-				continue;
-			}
-			if(! driver.canRunLap(lap)){
-				continue;
-			}
-			long time = 0;
-			long memory = 0;
-			long fileSize = 0;
-			long checkSum = 0;
-			Set<LapReading> curReadings = lapReadings.get(lap);
-			for (LapReading curReading : curReadings) {
-				time += curReading.time;
-				memory += curReading.memory;
-				fileSize += curReading.fileSize;
-				checkSum += curReading.checkSum;
-			}
-			Result lapResult = new Result(_reportTo , team, lap, setup, index, time, memory, fileSize, checkSum);
-			turnResult.report(lapResult);
-		}
-		return turnResult;
-	}
-
-	private void prepareDriverToRunLaps(Car car, Driver driver, TurnSetup setup) {
-		car.team().setUp();
-		
-		try {
-			driver.takeSeatIn(car, setup);
-		} catch (CarMotorFailureException e1) {
-			throw new RuntimeException("Circuit aborted", e1);
-		}
-		
-		try {
-			driver.prepare();
-		} catch (CarMotorFailureException e) {
-		    e.printStackTrace();
-		}
-	}
-
-	private void tearDownTurn(Team team, Driver driver) {
-		team.tearDown();
-		driver.circuitCompleted();
-	}
-
-	private LapReading runLap(Team team, Driver driver, TurnSetup setup, Lap lap) {
-		
-		Runnable lapRunnable = driver.prepareLap(lap);
-		
-		if( ! lap.hot() ){
-			driver.backToPit();
-		    
-		    try {
-		    	driver.prepare();
-		    } catch (CarMotorFailureException e) {
-		        e.printStackTrace();
-		    }        
-		}
-		
-		MemoryUtil.gc();
-		
-		// _memoryWatcher.start();
-		
-		_timeWatcher.start();
-		_fileSizeWatcher.monitorFile(team.databaseFile());
-		_fileSizeWatcher.start();
-		
-		lapRunnable.run();
-		
-		_timeWatcher.stop();
-		
-		// _memoryWatcher.stop();
-		
-		_fileSizeWatcher.stop();
-		
-		return new LapReading(_timeWatcher.value(), _memoryUsage.usedMemory(), _fileSizeWatcher.value(), driver.checkSum());
-	}
-	
-	private final static class LapReading {
-		public final long time;
-		public final long memory;
-		public final long fileSize;
-		public final long checkSum;
-
-		public LapReading(long time, long memory, long fileSize, long checkSum) {
-			this.time = time;
-			this.memory = memory;
-			this.fileSize = fileSize;
-			this.checkSum = checkSum;
-		}
-		
-		@Override
-		public String toString() {
-			return time + " ms";
-		}
-	}
-	
-	public static interface MemoryUsage {
-		long usedMemory();
-	}
-	
-	public static class SimpleMemoryUsage implements MemoryUsage {
-		public long usedMemory() {
-			return MemoryUtil.usedMemory();
-		}
-	}
-	
-	public static class NullMemoryUsage implements MemoryUsage {
-		public long usedMemory() {
-			return 0;
-		}
-	}
-	
-	@Override
-	public String fileNamePrefix() {
-		return internalName();
-	}
-	
-	@Override
-	public Driver[] nominate(Team team){
-		return team.nominate(this);
-	}
-	
-	public void reportTo(Circuit circuit){
-		_reportTo = circuit;
-	}
-	
-	public boolean isConcurrency(){
-		return false;
-	}
-	
-	@Override
-	public TurnSetup[] getTurnSetups() {
-		return _turnSetups;
-	}
-	
-	@Override
-	public void runLapsBefore(Lap lap, TurnSetup turnSetup, DriverBase driver, Car car) {
-		prepareDriverToRunLaps(car, driver, turnSetup);
-		for (Lap currentLap : laps()) {
-			if(currentLap == lap){
-				return;
-			}
-			if(driver.canRunLap(lap)){
-			    runLap(car.team(), driver, turnSetup, currentLap);
-			}
-			
-		}
-	}
-    
-}
-
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.framework;
+
+import java.util.*;
+
+public abstract class CircuitBase implements Circuit {
+
+	protected TurnSetup[] _turnSetups;
+	
+	protected Circuit _reportTo = this;
+
+	@Override
+	public void setTurnSetups(TurnSetup[] turnSetups) {
+		_turnSetups = turnSetups;
+	}
+
+	/**
+	 * public official name for reporting
+	 */
+	@Override
+	public String name() {
+	    String name = internalName();
+	    return name.substring(0,1).toUpperCase() + name.substring(1);
+	}
+
+	/**
+	 * internal name for BenchmarkSettings.properties
+	 */
+	@Override
+	public String internalName() {
+	    String name = className();
+	    int pos = name.lastIndexOf(".");
+	    return name.substring(pos + 1).toLowerCase();
+	}
+
+	protected String className() {
+		return circuitClass().getName();
+	}
+
+	protected Class<?> circuitClass() {
+		return this.getClass();
+	}
+
+	@Override
+	public abstract List<Lap> laps();
+
+	@Override
+	public Driver[] nominate(Team team) {
+		return team.nominate(this);
+	}
+
+	public void reportTo(Circuit circuit) {
+		_reportTo = circuit;
+	}
+
+	public TurnSetup[] turnSetups() {
+		return _turnSetups;
+	}
+    /**
+     * setups are needed for reporting
+     */
+    @Override
+	public TurnSetup[] lapSetups(){
+        return _turnSetups;
+    }
+
+
+}

Modified: trunk/polepos/src/org/polepos/framework/ConcurrencyCircuit.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/ConcurrencyCircuit.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/framework/ConcurrencyCircuit.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -22,16 +22,14 @@
 
 import java.util.*;
 
-public class ConcurrencyCircuit implements Circuit {
+public class ConcurrencyCircuit extends TimedLapsCircuitBase {
 	
 	public static final String NAME_ADD_ON = "Concurrency";
 	
-	private final Circuit _delegate;
+	private final TimedLapsCircuitBase _delegate;
 	
-    private TurnSetup[] _turnSetups;
-	
-	public ConcurrencyCircuit(Circuit delegate){
-		_delegate = delegate;
+    public ConcurrencyCircuit(Circuit delegate){
+		_delegate = (TimedLapsCircuitBase) delegate;
 	}
 
 	@Override
@@ -59,10 +57,9 @@
 		return NAME_ADD_ON + " " + _delegate.name();
 	}
 
-	@Override
 	public TurnResult[] race(Team team, Car car, Driver driver) {
 		
-		TurnSetup[] turnSetups = _delegate.getTurnSetups();
+		TurnSetup[] turnSetups = _delegate.turnSetups();
 		
 		_delegate.setTurnSetups(_turnSetups);
 		_delegate.reportTo(this);
@@ -85,11 +82,6 @@
 	public void setTurnSetups(TurnSetup[] turnSetups) {
 		_turnSetups = turnSetups;
 	}
-
-	@Override
-	public String fileNamePrefix() {
-		return _delegate.fileNamePrefix() + "_" + NAME_ADD_ON;
-	}
 	
 	@Override
 	public Driver[] nominate(Team team){
@@ -111,14 +103,22 @@
 		return true;
 	}
 
-	@Override
-	public TurnSetup[] getTurnSetups() {
+	public TurnSetup[] turnSetups() {
 		return _turnSetups;
 	}
 
-	@Override
 	public void runLapsBefore(Lap lap, TurnSetup turnSetup, DriverBase driver, Car car) {
 		_delegate.runLapsBefore(lap, turnSetup, driver, car);
 	}
+	
+	@Override
+	public RacingStrategy racingStrategy() {
+		return new TimedLapsRacingStrategy(this);
+	}
 
+	@Override
+	protected void addLaps() {
+		_delegate.addLaps();
+	}
+
 }

Modified: trunk/polepos/src/org/polepos/framework/ConcurrentDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/ConcurrentDriver.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/framework/ConcurrentDriver.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -32,12 +32,11 @@
 	}
 	
 	@Override
-	public void takeSeatIn(Car car, TurnSetup setup)
-			throws CarMotorFailureException {
+	public void configure(Car car, TurnSetup setup) {
 		int threadCount = setup.getThreadCount();
 		cloneMasterDriver(threadCount);
 		for(Driver driver : _drivers){
-			driver.takeSeatIn(car, setup);
+			driver.configure(car, setup);
 		}
 	}
 
@@ -51,17 +50,17 @@
 	}
 
 	@Override
-	public void backToPit() {
+	public void closeDatabase() {
 		// We send the master driver back to pit last,
 		// since it may have opened the server.
 		for (int i = 1; i < _drivers.length; i++) {
-			_drivers[i].backToPit();
+			_drivers[i].closeDatabase();
 		}
-		_drivers[0].backToPit();
+		_drivers[0].closeDatabase();
 	}
 
 	@Override
-	public void prepare() throws CarMotorFailureException {
+	public void prepare() {
 		for(Driver driver : _drivers){
 			driver.prepare();
 		}
@@ -86,7 +85,8 @@
 	
 	public Runnable prepareLap(final Lap lap) {
 		
-		lap.circuit().runLapsBefore(lap, lap.circuit().getTurnSetups()[0], _masterDriver, _masterDriver.car());
+		TimedLapsCircuitBase circuit = (TimedLapsCircuitBase) lap.circuit();
+		circuit.runLapsBefore(lap, circuit.turnSetups()[0], _masterDriver, _masterDriver.car());
 		
 		for (int i = 1; i < _drivers.length; i++) {
 			_drivers[i].copyStateFrom(_masterDriver);

Modified: trunk/polepos/src/org/polepos/framework/Driver.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/Driver.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/framework/Driver.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -20,7 +20,7 @@
 package org.polepos.framework;
 
 
-public abstract class Driver {
+public abstract class Driver implements Cloneable{
 
 	public Driver() {
 		super();
@@ -30,12 +30,11 @@
 
 	public abstract long checkSum();
 
-	public abstract void backToPit();
+	public abstract void closeDatabase();
 
-	public abstract void prepare() throws CarMotorFailureException;
+	public abstract void prepare() ;
 
-	public abstract void takeSeatIn(Car car, TurnSetup setup)
-			throws CarMotorFailureException;
+	public abstract void configure(Car car, TurnSetup setup);
 
 	public abstract Runnable prepareLap(final Lap lap);
 

Modified: trunk/polepos/src/org/polepos/framework/DriverBase.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/DriverBase.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/framework/DriverBase.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -51,7 +51,7 @@
 	 * take a seat in a car.
 	 */
 	@Override
-	public void takeSeatIn( Car car, TurnSetup setup ) throws CarMotorFailureException{
+	public void configure( Car car, TurnSetup setup ) {
         mCar = car;
         mSetup = setup;
         _checkSum = 0;
@@ -62,7 +62,7 @@
 	 * Normally opens the database.
 	 */
 	@Override
-	public abstract void prepare() throws CarMotorFailureException;
+	public abstract void prepare();
 	
 	
 	/**
@@ -70,7 +70,7 @@
      * created and close any resources it opened. 
      */
     @Override
-	public abstract void backToPit();
+	public abstract void closeDatabase();
     
     
 	protected TurnSetup setup(){

Added: trunk/polepos/src/org/polepos/framework/FixedTimeCircuitBase.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/FixedTimeCircuitBase.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/framework/FixedTimeCircuitBase.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -0,0 +1,47 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.framework;
+
+import java.util.*;
+
+public abstract class FixedTimeCircuitBase extends CircuitBase {
+	
+	@Override
+	public boolean isConcurrency() {
+		return false;
+	}
+
+	@Override
+	public RacingStrategy racingStrategy() {
+		return new FixedTimeRacingStrategy(this);
+	}
+	
+	@Override
+	public List<Lap> laps() {
+		ArrayList<Lap> list = new ArrayList<Lap>();
+		Lap lap = new Lap("");
+		lap.circuit(this);
+		list.add(lap);
+		return list;
+	}
+	
+
+}


Property changes on: trunk/polepos/src/org/polepos/framework/FixedTimeCircuitBase.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/polepos/src/org/polepos/framework/FixedTimeDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/FixedTimeDriver.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/framework/FixedTimeDriver.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -0,0 +1,29 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.framework;
+
+public interface FixedTimeDriver {
+	
+	public void bulkId(int id);
+	
+	public void race(); 
+
+}


Property changes on: trunk/polepos/src/org/polepos/framework/FixedTimeDriver.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/polepos/src/org/polepos/framework/FixedTimeRacingStrategy.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/FixedTimeRacingStrategy.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/framework/FixedTimeRacingStrategy.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -0,0 +1,152 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.framework;
+
+import java.util.*;
+
+import org.polepos.reporters.*;
+import org.polepos.util.*;
+
+public class FixedTimeRacingStrategy implements RacingStrategy {
+	
+
+	private final FixedTimeCircuitBase _circuit;
+
+	public FixedTimeRacingStrategy(FixedTimeCircuitBase circuit) {
+		_circuit = (FixedTimeCircuitBase) circuit;
+	}
+
+	@Override
+	public void race(Team team, Car car, Driver driver, List<Reporter> reporters) {
+		TurnSetup[] turnSetups = _circuit.turnSetups();
+		TurnResult[] results = new TurnResult[ turnSetups.length];
+		for (int i = 0; i < turnSetups.length; i++) {
+			Result result = raceTurn(team, car, driver, turnSetups[i], i);
+			TurnResult turnResult = new TurnResult();
+			turnResult.report(result);
+			results[i] = turnResult;
+		}
+        for (Reporter reporter : reporters) {
+            reporter.report(team, car, turnSetups, results);
+        }
+		
+	}
+
+	private Result raceTurn(Team team, Car car, Driver driver, TurnSetup setup, int setupIndex) {
+		car.team().setUp();
+		
+		driver.configure(car, setup);
+		driver.prepare();
+		// fill database
+		
+		driver.closeDatabase();
+		
+		MemoryUtil.gc();
+		
+		int threadCount = setup.getThreadCount();
+		
+		int time = setup.getTime();
+		
+		DriverBase[] drivers = new DriverBase[threadCount];
+		ConcurrentTurnRacer[] racers = new ConcurrentTurnRacer[threadCount];
+		Thread[] threads = new Thread[threadCount];
+		
+		for (int i = 0; i < threads.length; i++) {
+			drivers[i] = ((DriverBase)driver).clone();
+			// drivers[i].configure(car, setup);
+			drivers[i].prepare();
+			drivers[i].bulkId(i + 1);
+			racers[i] = new ConcurrentTurnRacer((FixedTimeDriver)drivers[i]);
+			threads[i] = new Thread(racers[i]);
+		}
+		
+		for (int i = 0; i < threads.length; i++) {
+			threads[i].start();
+		}
+		
+		try {
+			Thread.sleep(time);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		
+		for (int i = 0; i < threads.length; i++) {
+			racers[i].stop();
+		}
+		
+		for (int i = 0; i < threads.length; i++) {
+			try {
+				threads[i].join();
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+		}
+		
+		long iterations = 0;
+		
+		for (int i = 0; i < threads.length; i++) {
+			drivers[i].closeDatabase();
+			iterations += racers[i].iterations();
+		}
+		
+		
+		// FIXME: Change to FixedTimeResult
+		// Result result = new FixedTimeResult(_circuit, _circuit.laps().get(0), team,turnSetups[i],i,iterations);
+		
+		Result result = new TimedLapsResult(_circuit, team,_circuit.laps().get(0), setup ,setupIndex,iterations,0,0,0);
+		
+		team.tearDown();
+		driver.circuitCompleted();
+		return result;
+	}
+	
+	private static class ConcurrentTurnRacer implements Runnable {
+		
+		private long _iterations;
+		
+		private volatile boolean _stopped;
+		
+		private FixedTimeDriver _driver;
+		
+		ConcurrentTurnRacer(FixedTimeDriver driver){
+			_driver = driver;
+		}
+
+		@Override
+		public void run() {
+			while(! _stopped){
+				_driver.race();
+				_iterations++;
+			}
+			
+		}
+		
+		public void stop(){
+			_stopped = true;
+		}
+		
+		public long iterations(){
+			return _iterations;
+		}
+	}
+
+
+}


Property changes on: trunk/polepos/src/org/polepos/framework/FixedTimeRacingStrategy.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/polepos/src/org/polepos/framework/FixedTimeResult.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/FixedTimeResult.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/framework/FixedTimeResult.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -0,0 +1,61 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.framework;
+
+public class FixedTimeResult extends Result {
+
+	private final long _iterations;
+
+	public FixedTimeResult(Circuit circuit, Lap lap, Team team, TurnSetup setup, int index, long iterations) {
+		super(circuit, lap, team, setup, index);
+		_iterations = iterations;
+	}
+	
+	public long iterations(){
+		return _iterations;
+	}
+
+	@Override
+	public String getName() {
+		return getCircuit().name();
+	}
+
+	@Override
+	public long getCheckSum() {
+		return 0;
+	}
+
+	@Override
+	public long getDatabaseSize() {
+		return 0;
+	}
+
+	@Override
+	public long getMemory() {
+		return 0;
+	}
+
+	@Override
+	public long getTime() {
+		return 0;
+	}
+
+}


Property changes on: trunk/polepos/src/org/polepos/framework/FixedTimeResult.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/framework/Racer.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/Racer.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/framework/Racer.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -73,24 +73,11 @@
                         for (Reporter reporter : reporters) {
                             reporter.sendToCircuit(circuit);
                         }
-
     
                         for (Driver driver : drivers) {
-                        	
                             System.out.println("** On track: " + team.name() + "/" + car.name());
-                            long startTime = System.currentTimeMillis();
-
-    
-                            TurnSetup[] setups = circuit.lapSetups();
-                            TurnResult[] results = circuit.race(team, car, driver);
-                            
-                            long stopTime = System.currentTimeMillis();
-                            long t = stopTime - startTime;
-                            System.out.println("Time[ms]: " + t);	
-    
-                            for (Reporter reporter : reporters) {
-                                reporter.report(team, car, setups, results);
-                            }
+                            RacingStrategy racingStrategy = circuit.racingStrategy();
+                            racingStrategy.race(team, car, driver, reporters);
                         }
                         
                     }

Added: trunk/polepos/src/org/polepos/framework/RacingStrategy.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/RacingStrategy.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/framework/RacingStrategy.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -0,0 +1,31 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.framework;
+
+import java.util.*;
+
+import org.polepos.reporters.*;
+
+public interface RacingStrategy {
+
+	void race(Team team, Car car, Driver driver, List<Reporter> reporters);
+
+}


Property changes on: trunk/polepos/src/org/polepos/framework/RacingStrategy.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/framework/ReflectiveCircuitBase.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/ReflectiveCircuitBase.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/framework/ReflectiveCircuitBase.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -24,7 +24,7 @@
 import java.util.*;
 
 
-public class ReflectiveCircuitBase extends CircuitBase {
+public class ReflectiveCircuitBase extends TimedLapsCircuitBase {
 
 	private final Class<?> _driverClass;
 

Modified: trunk/polepos/src/org/polepos/framework/Result.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/Result.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/framework/Result.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -22,9 +22,8 @@
 /**
  * a result for a lap that holds the name and the time.
  */
-public class Result {
+public abstract class Result {
     
-    
     private final Circuit _circuit;
     
     private final Team _team;
@@ -35,34 +34,19 @@
     
     private final Lap _lap;
     
-    private final long _time;
-    
-    private final long _checkSum;
-    
-    private final long _memory;    
-    
-    private final long _databaseSize;
-    
-    public Result(Circuit circuit, Team team, Lap lap, TurnSetup setup, int index, long time, long memory, long databaseSize, long checkSum){
+    public Result(Circuit circuit, Lap lap, Team team, TurnSetup setup, int index){
         _circuit = circuit;
         _team = team;
-        _lap = lap;
         _setup = setup;
+        _lap = lap;
         _index = index;
-        _time = time;
-        _memory = memory;
-        _databaseSize = databaseSize;
-        _checkSum = checkSum;
+        
     }
     
-    public String getName(){
-        return _lap.name();
-    }
+	public String getName() {
+		return _lap.name();
+	}
     
-    public long getTime(){
-        return _time;
-    }
-    
     public TurnSetup getSetup(){
         return _setup;
     }
@@ -75,24 +59,23 @@
         return _circuit;
     }
     
-    public Lap getLap(){
-        return _lap;
-    }
-    
-    public long getCheckSum(){
-        return _checkSum;
-    }
-    
     public Team getTeam(){
-        return _team;
+    	return _team;
     }
     
-    public long getMemory(){
-        return _memory;
+    public Lap getLap(){
+        return _lap;
     }
     
-    public long getDatabaseSize() {
-    	return _databaseSize;
-    }
+    public abstract long getCheckSum();
+
+	public abstract long getTime();
+
+	public abstract long getMemory();
+
+	public abstract long getDatabaseSize();
+
+
+    
 }
 

Copied: trunk/polepos/src/org/polepos/framework/TimedLapsCircuitBase.java (from rev 172, trunk/polepos/src/org/polepos/framework/CircuitBase.java)
===================================================================
--- trunk/polepos/src/org/polepos/framework/TimedLapsCircuitBase.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/framework/TimedLapsCircuitBase.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -0,0 +1,272 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+package org.polepos.framework;
+
+import java.util.*;
+
+import org.polepos.util.*;
+import org.polepos.watcher.*;
+
+/**
+ * a set of timed test cases that work against the same data
+ */
+public abstract class TimedLapsCircuitBase extends CircuitBase implements Circuit {
+    
+    public static final String NUM_RUNS_PROPERTY_ID = "POLEPOS_NUM_RUNS";
+    public static final String MEMORY_USAGE_PROPERTY_ID = "POLEPOS_MEMORY_USAGE";
+
+	private final int _numRuns = Integer.parseInt(System.getProperty(NUM_RUNS_PROPERTY_ID, "1"));
+	private final MemoryUsage _memoryUsage = memoryUsage();
+
+	private static MemoryUsage memoryUsage() {
+		try {
+			return (MemoryUsage)Class.forName(System.getProperty(MEMORY_USAGE_PROPERTY_ID, SimpleMemoryUsage.class.getName())).newInstance();
+		} 
+		catch (Exception exc) {
+			exc.printStackTrace();
+			return new SimpleMemoryUsage();
+		}
+	}
+
+	List<Lap> _laps;
+    
+    // TODO: watcher can be installed, and should be sorted, i.e. memory watcher
+	// should start before time watcher
+    private TimeWatcher _timeWatcher;
+    
+    // TODO: The effect of MemoryWatcher is too strong on the running tests.
+    //       We should investigate if we can get less intrusive results with JMX
+    // private MemoryWatcher _memoryWatcher;
+    
+    private FileSizeWatcher _fileSizeWatcher;
+    
+    protected TimedLapsCircuitBase(){
+        initWatchers();
+    }
+    
+    private void initWatchers() {
+		_timeWatcher = new TimeWatcher();
+		// _memoryWatcher = new MemoryWatcher();
+		_fileSizeWatcher = new FileSizeWatcher();
+	}
+    
+	/**
+     * describes the intent of this circuit, what it wants to test
+     */
+	@Override
+	public abstract String description();
+
+    /**
+     * @return the driver class needed to run on this Circuit
+     */
+    @Override
+	public abstract Class<?> requiredDriver();
+    
+    /**
+     * @return the methods that are intended to be run 
+     */
+    protected abstract void addLaps();
+    
+	protected void add(Lap lap){
+        _laps.add(lap);
+        lap.circuit(this);
+    }
+    
+    /**
+     * calling all the laps for all the lapSetups
+     */
+	public TurnResult[] race( Team team, Car car, Driver driver){
+        TurnResult[] results = new TurnResult[ _turnSetups.length ];
+
+        int index = 0;
+        
+        for(TurnSetup setup : _turnSetups) {
+            System.out.println("*** Turn " + index);
+            results[index++] = runTurn(team, car, driver, index, setup);
+        }
+        return results;
+    }
+
+	private TurnResult runTurn(Team team, Car car, Driver driver, int index, TurnSetup setup) {
+		
+		Map<Lap, Set<LapReading>> lapReadings = new HashMap<Lap, Set<LapReading>>();
+		for (Lap lap : laps()) {
+			
+			if(lap.reportResult()) {
+				lapReadings.put(lap, new HashSet<LapReading>());
+			}
+		}
+		boolean warmUp = _numRuns > 1;
+		for (int runIdx = 0; runIdx < _numRuns; runIdx++) {
+			
+			prepareDriverToRunLaps(car, driver, setup);        
+			
+			for(Lap lap : laps()) {
+				
+				if(driver.canRunLap(lap)){
+					
+	            	System.out.println("*** Lap " + lap.name());
+	
+				    LapReading lapReading = runLap(team, driver, setup, lap);
+				    if(!warmUp && lap.reportResult()) {
+				    	lapReadings.get(lap).add(lapReading);
+				    }
+				}
+			}
+	
+			driver.closeDatabase();
+						
+			tearDownTurn(team, driver);
+			warmUp = false;
+		}
+		
+		TurnResult turnResult = new TurnResult();
+		for (Lap lap : laps()) {
+			if(!lap.reportResult()) {
+				continue;
+			}
+			if(! driver.canRunLap(lap)){
+				continue;
+			}
+			long time = 0;
+			long memory = 0;
+			long fileSize = 0;
+			long checkSum = 0;
+			Set<LapReading> curReadings = lapReadings.get(lap);
+			for (LapReading curReading : curReadings) {
+				time += curReading.time;
+				memory += curReading.memory;
+				fileSize += curReading.fileSize;
+				checkSum += curReading.checkSum;
+			}
+			Result lapResult = new TimedLapsResult(_reportTo , team, lap, setup, index, time, memory, fileSize, checkSum);
+			turnResult.report(lapResult);
+		}
+		return turnResult;
+	}
+
+	private void prepareDriverToRunLaps(Car car, Driver driver, TurnSetup setup) {
+		car.team().setUp();
+		driver.configure(car, setup);
+		driver.prepare();
+	}
+
+	private void tearDownTurn(Team team, Driver driver) {
+		team.tearDown();
+		driver.circuitCompleted();
+	}
+
+	private LapReading runLap(Team team, Driver driver, TurnSetup setup, Lap lap) {
+		
+		Runnable lapRunnable = driver.prepareLap(lap);
+		
+		if( ! lap.hot() ){
+			driver.closeDatabase();
+		    driver.prepare();
+		}
+		
+		MemoryUtil.gc();
+		
+		// _memoryWatcher.start();
+		
+		_timeWatcher.start();
+		_fileSizeWatcher.monitorFile(team.databaseFile());
+		_fileSizeWatcher.start();
+		
+		lapRunnable.run();
+		
+		_timeWatcher.stop();
+		
+		// _memoryWatcher.stop();
+		
+		_fileSizeWatcher.stop();
+		
+		return new LapReading(_timeWatcher.value(), _memoryUsage.usedMemory(), _fileSizeWatcher.value(), driver.checkSum());
+	}
+	
+	private final static class LapReading {
+		public final long time;
+		public final long memory;
+		public final long fileSize;
+		public final long checkSum;
+
+		public LapReading(long time, long memory, long fileSize, long checkSum) {
+			this.time = time;
+			this.memory = memory;
+			this.fileSize = fileSize;
+			this.checkSum = checkSum;
+		}
+		
+		@Override
+		public String toString() {
+			return time + " ms";
+		}
+	}
+	
+	public static interface MemoryUsage {
+		long usedMemory();
+	}
+	
+	public static class SimpleMemoryUsage implements MemoryUsage {
+		public long usedMemory() {
+			return MemoryUtil.usedMemory();
+		}
+	}
+	
+	public static class NullMemoryUsage implements MemoryUsage {
+		public long usedMemory() {
+			return 0;
+		}
+	}
+	
+	public boolean isConcurrency(){
+		return false;
+	}
+	
+	public void runLapsBefore(Lap lap, TurnSetup turnSetup, DriverBase driver, Car car) {
+		prepareDriverToRunLaps(car, driver, turnSetup);
+		for (Lap currentLap : laps()) {
+			if(currentLap == lap){
+				return;
+			}
+			if(driver.canRunLap(lap)){
+			    runLap(car.team(), driver, turnSetup, currentLap);
+			}
+			
+		}
+	}
+	
+	@Override
+	public RacingStrategy racingStrategy() {
+		return new TimedLapsRacingStrategy(this);
+	}
+	
+	@Override
+	public List<Lap> laps() {
+		if(_laps == null){
+			_laps = new ArrayList<Lap>();
+			addLaps();
+		}
+	    return _laps;
+	}
+
+    
+}
+

Added: trunk/polepos/src/org/polepos/framework/TimedLapsRacingStrategy.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/TimedLapsRacingStrategy.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/framework/TimedLapsRacingStrategy.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -0,0 +1,53 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.framework;
+
+import java.util.*;
+
+import org.polepos.reporters.*;
+
+public class TimedLapsRacingStrategy implements RacingStrategy {
+	
+	private final TimedLapsCircuitBase _circuit;
+
+	public TimedLapsRacingStrategy(TimedLapsCircuitBase circuit) {
+		_circuit = circuit;
+	}
+
+	@Override
+	public void race(Team team, Car car, Driver driver, List<Reporter> reporters) {
+
+		long startTime = System.currentTimeMillis();
+        
+        TurnSetup[] setups = _circuit.lapSetups();
+        TurnResult[] results = _circuit.race(team, car, driver);
+        
+        long stopTime = System.currentTimeMillis();
+        long t = stopTime - startTime;
+        System.out.println("Time[ms]: " + t);	
+
+        for (Reporter reporter : reporters) {
+            reporter.report(team, car, setups, results);
+        }
+		
+	}
+
+}


Property changes on: trunk/polepos/src/org/polepos/framework/TimedLapsRacingStrategy.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/polepos/src/org/polepos/framework/TimedLapsResult.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/TimedLapsResult.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/framework/TimedLapsResult.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -0,0 +1,61 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.framework;
+
+public class TimedLapsResult extends Result{
+	
+    private final long _time;
+    
+    private final long _checkSum;
+    
+    private final long _memory;    
+    
+    private final long _databaseSize;
+    
+	public TimedLapsResult(Circuit circuit, Team team, Lap lap,
+			TurnSetup setup, int index, long time, long memory,
+			long databaseSize, long checkSum) {
+		super(circuit, lap, team, setup, index);
+		
+		_time = time;
+		_checkSum = checkSum;
+		_memory = memory;
+		_databaseSize = databaseSize;
+	}
+	
+    public long getTime(){
+    	return _time;
+    }
+    
+    public long getCheckSum(){
+        return _checkSum;
+    }
+    
+    public long getMemory(){
+        return _memory;
+    }
+    
+    public long getDatabaseSize() {
+    	return _databaseSize;
+    }
+    
+
+}


Property changes on: trunk/polepos/src/org/polepos/framework/TimedLapsResult.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/framework/TurnSetup.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/TurnSetup.java	2011-02-14 20:21:43 UTC (rev 185)
+++ trunk/polepos/src/org/polepos/framework/TurnSetup.java	2011-02-17 17:15:21 UTC (rev 186)
@@ -167,6 +167,10 @@
 	public int getThreadCount() {
 		return getSetting(TurnSetupConfig.THREADCOUNT);
 	}
+	
+	public int getTime() {
+		return getSetting(TurnSetupConfig.TIME);
+	}
     
 ...
 
[truncated message content]

[Polepos-devel] SF.net SVN: polepos:[192] trunk/polepos

[<car...@us...>]

Revision: 192
          http://polepos.svn.sourceforge.net/polepos/?rev=192&view=rev
Author:   carlrosenberger
Date:     2011-02-22 13:15:56 +0000 (Tue, 22 Feb 2011)

Log Message:
-----------
cr + pr: Improvement to complex concurrency: Update data is now distinct to the threads.

Modified Paths:
--------------
    trunk/polepos/settings/Jdo.properties
    trunk/polepos/src/org/polepos/data/ComplexHolder0.java
    trunk/polepos/src/org/polepos/teams/db4o/ComplexConcurrencyDb4o.java
    trunk/polepos/src/org/polepos/teams/db4o/ComplexDb4o.java
    trunk/polepos/src/org/polepos/teams/hibernate/ComplexConcurrencyHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java
    trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java
    trunk/polepos/src/org/polepos/teams/jdbc/ComplexConcurrencyJdbc.java
    trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java
    trunk/polepos/src/org/polepos/teams/jdo/ComplexConcurrencyJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/ComplexJdo.java
    trunk/polepos/src/org/polepos/teams/jdo/data/ComplexHolder0.java

Modified: trunk/polepos/settings/Jdo.properties
===================================================================
--- trunk/polepos/settings/Jdo.properties	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/settings/Jdo.properties	2011-02-22 13:15:56 UTC (rev 192)
@@ -23,10 +23,10 @@
 datanucleus.color=0x146879
 # 
 # Embedded
-datanucleus.jdbc=hsqldb
+# datanucleus.jdbc=hsqldb
 # 
 # Client/Server
-# datanucleus.jdbc=mysql
+datanucleus.jdbc=mysql
 
 
 #

Modified: trunk/polepos/src/org/polepos/data/ComplexHolder0.java
===================================================================
--- trunk/polepos/src/org/polepos/data/ComplexHolder0.java	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/src/org/polepos/data/ComplexHolder0.java	2011-02-22 13:15:56 UTC (rev 192)
@@ -37,15 +37,16 @@
 	
 	private ComplexHolder0[] _array;
 	
-	public static ComplexHolder0 generate(int depth, int leafs){
+	public static ComplexHolder0 generate(int depth, int leafs, boolean disjunctSpecial){
 		ComplexHolder0 complexHolder = new ComplexHolder0();
 		complexHolder._name = "root";
-		createChildren(complexHolder, depth -1, leafs);
+		int specialValue = disjunctSpecial ? (int) Math.pow(leafs, depth) : 0;
+		createChildren(complexHolder, depth -1, leafs, specialValue);
 		return complexHolder;
 	}
 	
 	
-	private static void createChildren(ComplexHolder0 root, int depth, int numChildren) {
+	private static void createChildren(ComplexHolder0 root, int depth, int numChildren, int specialValue) {
 		if(depth < 1){
 			return;
 		}
@@ -62,7 +63,7 @@
 					ComplexHolder0 curChild = curFactory.run();
 					curChild._name = String.valueOf(holderIdx);
 					curChild._array = createArray(holderIdx);
-					curChild.setSpecial(holderIdx);
+					curChild.setSpecial(holderIdx + specialValue);
 					curParent.addChild(curChild);
 					childLevel.add(curChild);
 					previous = curChild;

Modified: trunk/polepos/src/org/polepos/teams/db4o/ComplexConcurrencyDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/ComplexConcurrencyDb4o.java	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/src/org/polepos/teams/db4o/ComplexConcurrencyDb4o.java	2011-02-22 13:15:56 UTC (rev 192)
@@ -43,7 +43,7 @@
 	public void race() {
 		int[] ids = new int[writes()];
 		for (int i = 0; i < writes(); i++) {
-			ids[i] = ((Integer)_delegate.write()).intValue();
+			ids[i] = ((Integer)_delegate.write(true)).intValue();
 		}
 		_delegate.query();
 		for (int i = 0; i < updates(); i++) {

Modified: trunk/polepos/src/org/polepos/teams/db4o/ComplexDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/ComplexDb4o.java	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/src/org/polepos/teams/db4o/ComplexDb4o.java	2011-02-22 13:15:56 UTC (rev 192)
@@ -34,9 +34,14 @@
 	
 	private int _rootId;
 	
+	
 	@Override
 	public Object write() {
-		ComplexHolder0 holder = ComplexHolder0.generate(depth(), objects());
+		return write(false);
+	}
+	
+	public Object write(boolean disjunctSpecial) {
+		ComplexHolder0 holder = ComplexHolder0.generate(depth(), objects(), disjunctSpecial);
 		store(holder);
 		addToCheckSum(holder);
 		commit();

Modified: trunk/polepos/src/org/polepos/teams/hibernate/ComplexConcurrencyHibernate.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/ComplexConcurrencyHibernate.java	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/src/org/polepos/teams/hibernate/ComplexConcurrencyHibernate.java	2011-02-22 13:15:56 UTC (rev 192)
@@ -38,7 +38,7 @@
 	public void race() {
 		Serializable[] ids = new Serializable[writes()];
 		for (int i = 0; i < writes(); i++) {
-			ids[i]= (Serializable) _delegate.write();
+			ids[i]= (Serializable) _delegate.write(true);
 		}
 		_delegate.query();
 		for (int i = 0; i < updates(); i++) {

Modified: trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java	2011-02-22 13:15:56 UTC (rev 192)
@@ -36,8 +36,12 @@
 
 	@Override
 	public Object write() {
+		return write(false);
+	}
+		
+	public Object write(boolean disjunctSpecial) {
 		Transaction tx = begin();
-		ComplexHolder0 holder = ComplexHolder0.generate(depth(), objects());
+		ComplexHolder0 holder = ComplexHolder0.generate(depth(), objects(), disjunctSpecial);
 		addToCheckSum(holder);
 		_rootId = store(holder);
 		tx.commit();

Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java	2011-02-22 13:15:56 UTC (rev 192)
@@ -42,14 +42,15 @@
 		id = _idGenerator.nextId();
 	}
 	
-	public static ComplexHolder0 generate(int depth, int leafs){
+	public static ComplexHolder0 generate(int depth, int leafs, boolean disjunctSpecial){
 		ComplexHolder0 complexHolder = new ComplexHolder0();
 		complexHolder.name = "root";
-		createChildren(complexHolder, depth -1, leafs);
+		int specialValue = disjunctSpecial ? (int) Math.pow(leafs, depth) : 0;	
+		createChildren(complexHolder, depth -1, leafs, specialValue);
 		return complexHolder;
 	}
 	
-	private static void createChildren(ComplexHolder0 root, int depth, int numChildren) {
+	private static void createChildren(ComplexHolder0 root, int depth, int numChildren, int specialValue) {
 		if(depth < 1){
 			return;
 		}
@@ -65,7 +66,7 @@
 					ComplexHolder0 curChild = curFactory.run();
 					curChild.name = String.valueOf(holderIdx);
 					curChild.array = createArray(holderIdx);
-					curChild.setSpecial(holderIdx);
+					curChild.setSpecial(holderIdx + specialValue);
 					curParent.addChild(curChild);
 					childLevel.add(curChild);
 					holderIdx++;

Modified: trunk/polepos/src/org/polepos/teams/jdbc/ComplexConcurrencyJdbc.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/ComplexConcurrencyJdbc.java	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/src/org/polepos/teams/jdbc/ComplexConcurrencyJdbc.java	2011-02-22 13:15:56 UTC (rev 192)
@@ -36,7 +36,7 @@
 	public void race() {
 		int[] ids = new int[writes()];
 		for (int i = 0; i < writes(); i++) {
-			ids[i] = ((Integer)_delegate.write()).intValue();
+			ids[i] = ((Integer)_delegate.write(true)).intValue();
 		}
 		_delegate.query();
 		for (int i = 0; i < updates(); i++) {

Modified: trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java	2011-02-22 13:15:56 UTC (rev 192)
@@ -102,6 +102,11 @@
     
 	@Override
 	public Object write() {
+		return write(false);
+	}
+
+    
+	public Object write(boolean disjunctSpecial) {
 		final Stack<Integer> parentIds = new Stack<Integer>();
 		final PreparedStatement complexHolder0Stat = prepareStatement("insert into " + HOLDER_TABLE0 + " (id, name, type) values (?,?,?)");
 		final PreparedStatement[] complexHolderStats = new PreparedStatement[4];
@@ -113,7 +118,7 @@
 		final PreparedStatement arrayStat = prepareStatement("insert into tarray (parent, child, pos) values (?,?,?)");
 		final PreparedStatement childrenStat = prepareStatement("insert into children (parent, child, pos) values (?,?,?)");
 		final Map<ComplexHolder0,Integer> ids = new HashMap<ComplexHolder0, Integer>();
-		ComplexHolder0 holder = ComplexHolder0.generate(depth(), objects());
+		ComplexHolder0 holder = ComplexHolder0.generate(depth(), objects(), disjunctSpecial);
 		addToCheckSum(holder);
 		holder.traverse(new Visitor<ComplexHolder0>() {
 			@Override
@@ -238,14 +243,7 @@
 			final PreparedStatement arrayStat = prepareStatement("select * from " + ARRAY_TABLE + " where parent=? order by pos");
 			final PreparedStatement childrenStat = prepareStatement("select * from " + CHILDREN_TABLE + " where parent=? order by pos");
 			Map<Integer, ComplexHolder0> idToInstance = new HashMap<Integer, ComplexHolder0>();
-			holder = readHolder(
-					depth,
-					idToInstance, 
-					complexHolder0Stat, 
-					complexHolderStats,
-					arrayStat,
-					childrenStat,
-					id);
+			holder = readHolder(depth,idToInstance,complexHolder0Stat,complexHolderStats,arrayStat,childrenStat, id);
 			complexHolder0Stat.close();
 			for (int i = 0; i < complexHolderStats.length; i++) {
 				complexHolderStats[i].close(); 
@@ -466,10 +464,17 @@
 		try {
 			nameStat.executeBatch();
 			nameStat.close();
+			
 			arrayDeleteStat.executeBatch();
 			arrayDeleteStat.close();
+			
+			// Without this commit we get deadlocks
+			// in the concurrency runs
+			commit();
+			
 			arrayInsertStat.executeBatch();
 			arrayInsertStat.close();
+			
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}

Modified: trunk/polepos/src/org/polepos/teams/jdo/ComplexConcurrencyJdo.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/ComplexConcurrencyJdo.java	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/src/org/polepos/teams/jdo/ComplexConcurrencyJdo.java	2011-02-22 13:15:56 UTC (rev 192)
@@ -36,7 +36,7 @@
 	public void race() {
 		Object[] ids = new Object[writes()];
 		for (int i = 0; i < writes(); i++) {
-			ids[i] = _delegate.write();
+			ids[i] = _delegate.write(true);
 		}
 		_delegate.query();
 		for (int i = 0; i < updates(); i++) {

Modified: trunk/polepos/src/org/polepos/teams/jdo/ComplexJdo.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/ComplexJdo.java	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/src/org/polepos/teams/jdo/ComplexJdo.java	2011-02-22 13:15:56 UTC (rev 192)
@@ -35,8 +35,12 @@
 	
 	@Override
 	public Object write() {
+		return write(false);
+	}
+	
+	public Object write(boolean disjunctSpecial) {
 		begin();
-		ComplexHolder0 holder = ComplexHolder0.generate(depth(), objects());
+		ComplexHolder0 holder = ComplexHolder0.generate(depth(), objects(), disjunctSpecial);
 		addToCheckSum(holder);
 		store(holder);
 		_rootId = db().getObjectId(holder);
@@ -44,6 +48,7 @@
 		return _rootId;
 	}
 
+
 	@Override
 	public void read() {
 		begin();

Modified: trunk/polepos/src/org/polepos/teams/jdo/data/ComplexHolder0.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/data/ComplexHolder0.java	2011-02-18 19:10:29 UTC (rev 191)
+++ trunk/polepos/src/org/polepos/teams/jdo/data/ComplexHolder0.java	2011-02-22 13:15:56 UTC (rev 192)
@@ -38,14 +38,15 @@
 		
 	}
 	
-	public static ComplexHolder0 generate(int depth, int leafs){
+	public static ComplexHolder0 generate(int depth, int leafs, boolean disjunctSpecial){
 		ComplexHolder0 complexHolder = new ComplexHolder0();
 		complexHolder.name = "root";
-		createChildren(complexHolder, depth -1, leafs);
+		int specialValue = disjunctSpecial ? (int) Math.pow(leafs, depth) : 0;
+		createChildren(complexHolder, depth -1, leafs, specialValue);
 		return complexHolder;
 	}
 	
-	private static void createChildren(ComplexHolder0 root, int depth, int numChildren) {
+	private static void createChildren(ComplexHolder0 root, int depth, int numChildren, int specialValue) {
 		if(depth < 1){
 			return;
 		}
@@ -61,7 +62,7 @@
 					ComplexHolder0 curChild = curFactory.run();
 					curChild.name = String.valueOf(holderIdx);
 					curChild.array = createArray(holderIdx);
-					curChild.setSpecial(holderIdx);
+					curChild.setSpecial(holderIdx + specialValue);
 					curParent.addChild(curChild);
 					childLevel.add(curChild);
 					holderIdx++;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polepos-devel] SF.net SVN: polepos:[196] trunk/polepos

[<car...@us...>]

Revision: 196
          http://polepos.svn.sourceforge.net/polepos/?rev=196&view=rev
Author:   carlrosenberger
Date:     2011-03-07 14:07:04 +0000 (Mon, 07 Mar 2011)

Log Message:
-----------
cr + pr: Added functionality to set Settings.isDebug() and Settings.isConcurrency in a
system property.

Modified Paths:
--------------
    trunk/polepos/build.xml
    trunk/polepos/src/org/polepos/RunSeason.java
    trunk/polepos/src/org/polepos/Settings.java
    trunk/polepos/src/org/polepos/framework/DriverBase.java
    trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java

Added Paths:
-----------
    trunk/polepos/src/org/polepos/framework/ArraysP.java

Modified: trunk/polepos/build.xml
===================================================================
--- trunk/polepos/build.xml	2011-03-03 14:54:59 UTC (rev 195)
+++ trunk/polepos/build.xml	2011-03-07 14:07:04 UTC (rev 196)
@@ -49,7 +49,8 @@
 
 	<!-- <target name="race" depends="clean,compile,jdoenhance,jvienhance,jpaenhance" description="runs with all circuits and all teams "> -->
 	<target name="race" depends="clean,compile,jdoenhance" description="runs with all circuits and all teams ">
-		<java classname="org.polepos.RunSeason" fork="true" >
+		<echo message="${polepos.debug}" />
+		<java classname="org.polepos.RunSeason" fork="true"  >
 			<classpath>
 				<pathelement location="bin" />
 				<fileset dir="lib">
@@ -57,6 +58,9 @@
 				</fileset>
 			</classpath>
 			<jvmarg value="-Xmx1g"/>
+			<sysproperty key="polepos.debug" value="${polepos.debug}" />
+			<sysproperty key="polepos.concurrency" value="${polepos.concurrency}" />
+
 		</java>
 	</target>
 

Modified: trunk/polepos/src/org/polepos/RunSeason.java
===================================================================
--- trunk/polepos/src/org/polepos/RunSeason.java	2011-03-03 14:54:59 UTC (rev 195)
+++ trunk/polepos/src/org/polepos/RunSeason.java	2011-03-07 14:07:04 UTC (rev 196)
@@ -42,6 +42,8 @@
 import org.polepos.teams.jpa.*;
 import org.polepos.teams.jvi.*;
 
+import com.db4o.foundation.*;
+
 /**
  * This is the Main class to run PolePosition. If JDO, JPA and JVI are
  * to be tested also, persistent classes have to be enhanced first.
@@ -59,17 +61,15 @@
 
 	@Override
 	public Circuit[] circuits() {
+		return ArraysP.concat(defaultCircuits(), concurrencyCircuits());
+	}
+	
+	private Circuit[] defaultCircuits(){
 		return new Circuit[] {
-				
 				new ReflectiveCircuitBase(Complex.class),
 				new ReflectiveCircuitBase(NestedLists.class),
 				new ReflectiveCircuitBase(InheritanceHierarchy.class),
 				new ReflectiveCircuitBase(FlatObject.class),
-				
-//				new ComplexConcurrency(),
-//				new QueryCentricConcurrency(),
-//				new InsertCentricConcurrency(),
-				
 //				new Trees(), 
 //				new NativeIds(),
 //				new Commits(),
@@ -78,12 +78,20 @@
 		};
 	}
 	
-	
+	private Circuit[] concurrencyCircuits() {
+		if(! Settings.isConcurrency()){
+			return new Circuit[] {};
+		}
+		return new Circuit[] {
+				new ComplexConcurrency(),
+				new QueryCentricConcurrency(),
+				new InsertCentricConcurrency(),
+		};
+	}
 
 	@Override
 	public Team[] teams() {
 		return new Team[] {
-				
  				new Db4oTeam(),
 				new JdoTeam(),
 //				new Db4oClientServerTeam(),
@@ -91,9 +99,8 @@
 				new HibernateTeam(),
 				
 //				new JpaTeam(),
-				
-				// new JviTeam(),
-				// new CobraTeam(),
+//				new JviTeam(),
+// 				new CobraTeam(),
 		};
 	}
 

Modified: trunk/polepos/src/org/polepos/Settings.java
===================================================================
--- trunk/polepos/src/org/polepos/Settings.java	2011-03-03 14:54:59 UTC (rev 195)
+++ trunk/polepos/src/org/polepos/Settings.java	2011-03-07 14:07:04 UTC (rev 196)
@@ -22,22 +22,34 @@
 
 public class Settings {
     
-    public static boolean DEBUG = false;
+    private static boolean DEBUG = false;
     
-    public static final String CIRCUIT = DEBUG ? "settings/DebugCircuits.properties" : "settings/Circuits.properties" ;
+    private static boolean CONCURRENCY = false;
     
+    public static final String CIRCUIT = isDebug() ? "settings/DebugCircuits.properties" : "settings/Circuits.properties" ;
+    
     public static final String JDBC = "settings/Jdbc.properties";
     
     public static final String JDO = "settings/Jdo.properties";
     
-    static{
-        
+    public static boolean isDebug(){
+		String debug = System.getProperty("polepos.debug");
+		if(debug != null){
+			return Boolean.parseBoolean(debug);
+		}
         String className = Settings.class.getName() ;
-        
         if(DEBUG){
             System.out.println(className + ".DEBUG is set to true.\n");
         }
-
+		return DEBUG;
     }
+	
+	public static boolean isConcurrency(){
+		String concurrency = System.getProperty("polepos.concurrency");
+		if(concurrency != null){
+			return Boolean.parseBoolean(concurrency);
+		}
+		return CONCURRENCY;
+	}
 
 }

Added: trunk/polepos/src/org/polepos/framework/ArraysP.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/ArraysP.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/framework/ArraysP.java	2011-03-07 14:07:04 UTC (rev 196)
@@ -0,0 +1,32 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.framework;
+
+public class ArraysP {
+	
+	public static Circuit[] concat(Circuit[] a, Circuit[] b){
+		Circuit [] result = new Circuit[a.length + b.length];
+		System.arraycopy(a, 0, result, 0, a.length);
+		System.arraycopy(b, 0, result, a.length, b.length);
+		return result;
+	}
+
+}


Property changes on: trunk/polepos/src/org/polepos/framework/ArraysP.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/framework/DriverBase.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/DriverBase.java	2011-03-03 14:54:59 UTC (rev 195)
+++ trunk/polepos/src/org/polepos/framework/DriverBase.java	2011-03-07 14:07:04 UTC (rev 196)
@@ -120,7 +120,7 @@
 				try {
 					method.invoke(DriverBase.this, (Object[]) null);
 				} catch (Exception e) {
-				    if(Settings.DEBUG){
+				    if(Settings.isDebug()){
 				    	throw new RuntimeException(e);
 				    }
 				    e.printStackTrace();
@@ -131,7 +131,7 @@
 				try{
 					return DriverBase.this.getClass().getDeclaredMethod(lap.name(), (Class[])null);
 				} catch (Exception e) {
-				    if(Settings.DEBUG){
+				    if(Settings.isDebug()){
 				    	throw new RuntimeException(e);
 				    }
 				    e.printStackTrace();

Modified: trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java	2011-03-03 14:54:59 UTC (rev 195)
+++ trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java	2011-03-07 14:07:04 UTC (rev 196)
@@ -132,7 +132,7 @@
 	}
 
 	private void handleException(Exception e) {
-		if(Settings.DEBUG){
+		if(Settings.isDebug()){
 			throw new RuntimeException(e);
 		}
 		e.printStackTrace();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polepos-devel] SF.net SVN: polepos:[197] trunk/polepos

[<car...@us...>]

Revision: 197
          http://polepos.svn.sourceforge.net/polepos/?rev=197&view=rev
Author:   carlrosenberger
Date:     2011-03-07 15:40:32 +0000 (Mon, 07 Mar 2011)

Log Message:
-----------
cr + pr: SQLite can now be run directly from the .jar.

Modified Paths:
--------------
    trunk/polepos/.classpath

Added Paths:
-----------
    trunk/polepos/lib/sqlite/sqlitejdbc-v056.jar

Removed Paths:
-------------
    trunk/polepos/lib/sqlite/sqlite_readme.txt
    trunk/polepos/lib/sqlite/sqlitejdbc-v056-native.jar
    trunk/polepos/lib/sqlite/sqlitejdbc.dll

Modified: trunk/polepos/.classpath
===================================================================
--- trunk/polepos/.classpath	2011-03-07 14:07:04 UTC (rev 196)
+++ trunk/polepos/.classpath	2011-03-07 15:40:32 UTC (rev 197)
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-management-1.0.2.jar"/>
-	<classpathentry kind="lib" path="lib/graph/poi-3.2-FINAL-20081019.jar"/>
-	<classpathentry kind="lib" path="lib/hibernate/hibernate3.jar"/>
-	<classpathentry kind="lib" path="lib/common/antlr-2.7.7.jar"/>
-	<classpathentry kind="lib" path="lib/common/antlr-3.1.1-runtime.jar"/>
-	<classpathentry kind="lib" path="lib/common/asm-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/common/asm-all-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/common/bcel.jar"/>
-	<classpathentry kind="lib" path="lib/common/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/common/commons-lang-2.1.jar"/>
-	<classpathentry kind="lib" path="lib/common/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/common/commons-pool-1.5.3.jar"/>
-	<classpathentry kind="lib" path="lib/common/dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="lib/common/ehcache-1.2.3.jar"/>
-	<classpathentry kind="lib" path="lib/common/sax2.jar"/>
-	<classpathentry kind="lib" path="lib/common/serp-1.13.1.jar"/>
-	<classpathentry kind="lib" path="lib/common/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="lib/common/xml-apis.jar"/>
-	<classpathentry kind="lib" path="lib/javadb/derby.jar"/>
-	<classpathentry kind="lib" path="lib/jms/geronimo-jms_1.1_spec-1.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/jta/geronimo-jta_1.1_spec-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/log4j/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="lib/openjpa/openjpa-2.0.0-beta.jar"/>
-	<classpathentry kind="lib" path="lib/postgresql/postgresql-8.3-604.jdbc4.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j/slf4j-api-1.5.10.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j/slf4j-log4j12-1.5.10.jar"/>
-	<classpathentry kind="lib" path="lib/vod/jvi80.jar"/>
-	<classpathentry kind="lib" path="lib/vod/pizza.jar"/>
-	<classpathentry kind="lib" path="lib/vod/vodjdo.jar"/>
-	<classpathentry kind="lib" path="lib/sqlite/sqlitejdbc-v056-native.jar"/>
-	<classpathentry kind="lib" path="lib/mysql/mysql-connector-java-5.1.12-bin.jar"/>
-	<classpathentry kind="lib" path="lib/common/commons-dbcp-1.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/jpa/geronimo-jpa_2.0_spec-1.0.jar"/>
-	<classpathentry kind="lib" path="lib/hsqldb/hsqldb.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-cache-2.1.0-release.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-core-2.1.0-release.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-enhancer-2.1.0-release.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-jpa-2.1.0-release.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-rdbms-2.1.0-release.jar"/>
-	<classpathentry kind="lib" path="lib/jdo/jdo-api-3.0.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-connectionpool-2.0.3-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/db4o/db4o-8.0.174.15231-all-java5.jar"/>
-	<classpathentry kind="lib" path="lib/common/javassist-3.12.0.GA.jar"/>
-	<classpathentry kind="lib" path="lib/common/slf4j-api-1.6.1.jar"/>
-	<classpathentry kind="lib" path="lib/graph/jcommon-1.0.16.jar"/>
-	<classpathentry kind="lib" path="lib/graph/jfreechart-1.0.13.jar" sourcepath="lib/graph/jfreechart-1.0.13-src.zip"/>
-	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="/ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.1.0/src/org.junit_3.8.1/junitsrc.zip"/>
-	<classpathentry kind="lib" path="lib/graph/gnujaxp.jar"/>
-	<classpathentry kind="lib" path="lib/graph/itext-1.2.jar"/>
-	<classpathentry kind="lib" path="lib/graph/velocity-dep-1.4.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/jpa/geronimo-jpa_2.0_spec-1.0-PFD2.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-management-1.0.2.jar"/>
+	<classpathentry kind="lib" path="lib/graph/poi-3.2-FINAL-20081019.jar"/>
+	<classpathentry kind="lib" path="lib/hibernate/hibernate3.jar"/>
+	<classpathentry kind="lib" path="lib/common/antlr-2.7.7.jar"/>
+	<classpathentry kind="lib" path="lib/common/antlr-3.1.1-runtime.jar"/>
+	<classpathentry kind="lib" path="lib/common/asm-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/common/asm-all-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/common/bcel.jar"/>
+	<classpathentry kind="lib" path="lib/common/commons-collections-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/common/commons-lang-2.1.jar"/>
+	<classpathentry kind="lib" path="lib/common/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/common/commons-pool-1.5.3.jar"/>
+	<classpathentry kind="lib" path="lib/common/dom4j-1.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/common/ehcache-1.2.3.jar"/>
+	<classpathentry kind="lib" path="lib/common/sax2.jar"/>
+	<classpathentry kind="lib" path="lib/common/serp-1.13.1.jar"/>
+	<classpathentry kind="lib" path="lib/common/xercesImpl.jar"/>
+	<classpathentry kind="lib" path="lib/common/xml-apis.jar"/>
+	<classpathentry kind="lib" path="lib/javadb/derby.jar"/>
+	<classpathentry kind="lib" path="lib/jms/geronimo-jms_1.1_spec-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/jta/geronimo-jta_1.1_spec-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/log4j/log4j-1.2.15.jar"/>
+	<classpathentry kind="lib" path="lib/openjpa/openjpa-2.0.0-beta.jar"/>
+	<classpathentry kind="lib" path="lib/postgresql/postgresql-8.3-604.jdbc4.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j/slf4j-api-1.5.10.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j/slf4j-log4j12-1.5.10.jar"/>
+	<classpathentry kind="lib" path="lib/vod/jvi80.jar"/>
+	<classpathentry kind="lib" path="lib/vod/pizza.jar"/>
+	<classpathentry kind="lib" path="lib/vod/vodjdo.jar"/>
+	<classpathentry kind="lib" path="lib/mysql/mysql-connector-java-5.1.12-bin.jar"/>
+	<classpathentry kind="lib" path="lib/common/commons-dbcp-1.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/jpa/geronimo-jpa_2.0_spec-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/hsqldb/hsqldb.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-cache-2.1.0-release.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-core-2.1.0-release.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-enhancer-2.1.0-release.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-jpa-2.1.0-release.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-rdbms-2.1.0-release.jar"/>
+	<classpathentry kind="lib" path="lib/jdo/jdo-api-3.0.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-connectionpool-2.0.3-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/db4o/db4o-8.0.174.15231-all-java5.jar"/>
+	<classpathentry kind="lib" path="lib/common/javassist-3.12.0.GA.jar"/>
+	<classpathentry kind="lib" path="lib/common/slf4j-api-1.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/graph/jcommon-1.0.16.jar"/>
+	<classpathentry kind="lib" path="lib/graph/jfreechart-1.0.13.jar" sourcepath="lib/graph/jfreechart-1.0.13-src.zip"/>
+	<classpathentry kind="lib" path="lib/sqlite/sqlitejdbc-v056.jar"/>
+	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="/ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.1.0/src/org.junit_3.8.1/junitsrc.zip"/>
+	<classpathentry kind="lib" path="lib/graph/gnujaxp.jar"/>
+	<classpathentry kind="lib" path="lib/graph/itext-1.2.jar"/>
+	<classpathentry kind="lib" path="lib/graph/velocity-dep-1.4.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/jpa/geronimo-jpa_2.0_spec-1.0-PFD2.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Deleted: trunk/polepos/lib/sqlite/sqlite_readme.txt
===================================================================
--- trunk/polepos/lib/sqlite/sqlite_readme.txt	2011-03-07 14:07:04 UTC (rev 196)
+++ trunk/polepos/lib/sqlite/sqlite_readme.txt	2011-03-07 15:40:32 UTC (rev 197)
@@ -1 +0,0 @@
-Need to copy sqlitejdbc.dll into system directory if you'd like to run SQLite team.
\ No newline at end of file

Deleted: trunk/polepos/lib/sqlite/sqlitejdbc-v056-native.jar
===================================================================
(Binary files differ)

Added: trunk/polepos/lib/sqlite/sqlitejdbc-v056.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/sqlite/sqlitejdbc-v056.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/polepos/lib/sqlite/sqlitejdbc.dll
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polepos-devel] SF.net SVN: polepos:[199] trunk/polepos

[<car...@us...>]

Revision: 199
          http://polepos.svn.sourceforge.net/polepos/?rev=199&view=rev
Author:   carlrosenberger
Date:     2011-03-08 12:42:04 +0000 (Tue, 08 Mar 2011)

Log Message:
-----------
cr + pr: Raised memory for Ant script to 1400m.

Modified Paths:
--------------
    trunk/polepos/build.xml
    trunk/polepos/src/org/polepos/teams/jdbc/FlatObjectJdbc.java

Modified: trunk/polepos/build.xml
===================================================================
--- trunk/polepos/build.xml	2011-03-07 16:20:00 UTC (rev 198)
+++ trunk/polepos/build.xml	2011-03-08 12:42:04 UTC (rev 199)
@@ -57,7 +57,7 @@
 					<include name="**/**/*.jar" />
 				</fileset>
 			</classpath>
-			<jvmarg value="-Xmx1g"/>
+			<jvmarg value="-Xmx1400m"/>
 			<sysproperty key="polepos.debug" value="${polepos.debug}" />
 			<sysproperty key="polepos.concurrency" value="${polepos.concurrency}" />
 

Modified: trunk/polepos/src/org/polepos/teams/jdbc/FlatObjectJdbc.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/FlatObjectJdbc.java	2011-03-07 16:20:00 UTC (rev 198)
+++ trunk/polepos/src/org/polepos/teams/jdbc/FlatObjectJdbc.java	2011-03-08 12:42:04 UTC (rev 199)
@@ -23,7 +23,6 @@
 
 import org.polepos.circuits.flatobject.*;
 import org.polepos.data.*;
-import org.polepos.framework.*;
 
 
 public class FlatObjectJdbc extends JdbcDriver implements FlatObject


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polepos-devel] SF.net SVN: polepos:[201] trunk/polepos

[<car...@us...>]

Revision: 201
          http://polepos.svn.sourceforge.net/polepos/?rev=201&view=rev
Author:   carlrosenberger
Date:     2011-03-09 14:33:48 +0000 (Wed, 09 Mar 2011)

Log Message:
-----------
cr + acv: Updated Datanucleus to latest 2.x versions that are available.
Turned on ehcache to be used as l2 cache for Datanucleus.

Modified Paths:
--------------
    trunk/polepos/.classpath
    trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java

Added Paths:
-----------
    trunk/polepos/lib/datanucleus/datanucleus-cache-2.1.2.jar
    trunk/polepos/lib/datanucleus/datanucleus-connectionpool-2.0.3.jar
    trunk/polepos/lib/datanucleus/datanucleus-core-2.2.2.jar
    trunk/polepos/lib/datanucleus/datanucleus-enhancer-2.1.3.jar
    trunk/polepos/lib/datanucleus/datanucleus-jpa-2.1.7.jar
    trunk/polepos/lib/datanucleus/datanucleus-rdbms-2.2.3.jar

Removed Paths:
-------------
    trunk/polepos/lib/datanucleus/datanucleus-cache-2.1.0-release.jar
    trunk/polepos/lib/datanucleus/datanucleus-connectionpool-2.0.3-SNAPSHOT.jar
    trunk/polepos/lib/datanucleus/datanucleus-core-2.1.0-release.jar
    trunk/polepos/lib/datanucleus/datanucleus-enhancer-2.1.0-release.jar
    trunk/polepos/lib/datanucleus/datanucleus-jpa-2.1.0-release.jar
    trunk/polepos/lib/datanucleus/datanucleus-management-1.0.2.jar
    trunk/polepos/lib/datanucleus/datanucleus-rdbms-2.1.0-release.jar

Modified: trunk/polepos/.classpath
===================================================================
--- trunk/polepos/.classpath	2011-03-08 13:27:03 UTC (rev 200)
+++ trunk/polepos/.classpath	2011-03-09 14:33:48 UTC (rev 201)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-management-1.0.2.jar"/>
 	<classpathentry kind="lib" path="lib/graph/poi-3.2-FINAL-20081019.jar"/>
 	<classpathentry kind="lib" path="lib/hibernate/hibernate3.jar"/>
 	<classpathentry kind="lib" path="lib/common/antlr-2.7.7.jar"/>
@@ -34,19 +33,19 @@
 	<classpathentry kind="lib" path="lib/common/commons-dbcp-1.2.1.jar"/>
 	<classpathentry kind="lib" path="lib/jpa/geronimo-jpa_2.0_spec-1.0.jar"/>
 	<classpathentry kind="lib" path="lib/hsqldb/hsqldb.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-cache-2.1.0-release.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-core-2.1.0-release.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-enhancer-2.1.0-release.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-jpa-2.1.0-release.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-rdbms-2.1.0-release.jar"/>
 	<classpathentry kind="lib" path="lib/jdo/jdo-api-3.0.jar"/>
-	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-connectionpool-2.0.3-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/db4o/db4o-8.0.174.15231-all-java5.jar"/>
 	<classpathentry kind="lib" path="lib/common/javassist-3.12.0.GA.jar"/>
 	<classpathentry kind="lib" path="lib/common/slf4j-api-1.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/graph/jcommon-1.0.16.jar"/>
 	<classpathentry kind="lib" path="lib/graph/jfreechart-1.0.13.jar" sourcepath="lib/graph/jfreechart-1.0.13-src.zip"/>
 	<classpathentry kind="lib" path="lib/sqlite/sqlitejdbc-v056.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-cache-2.1.2.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-connectionpool-2.0.3.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-core-2.2.2.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-enhancer-2.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-jpa-2.1.7.jar"/>
+	<classpathentry kind="lib" path="lib/datanucleus/datanucleus-rdbms-2.2.3.jar"/>
 	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="/ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.1.0/src/org.junit_3.8.1/junitsrc.zip"/>
 	<classpathentry kind="lib" path="lib/graph/gnujaxp.jar"/>
 	<classpathentry kind="lib" path="lib/graph/itext-1.2.jar"/>

Deleted: trunk/polepos/lib/datanucleus/datanucleus-cache-2.1.0-release.jar
===================================================================
(Binary files differ)

Added: trunk/polepos/lib/datanucleus/datanucleus-cache-2.1.2.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/datanucleus/datanucleus-cache-2.1.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/polepos/lib/datanucleus/datanucleus-connectionpool-2.0.3-SNAPSHOT.jar
===================================================================
(Binary files differ)

Added: trunk/polepos/lib/datanucleus/datanucleus-connectionpool-2.0.3.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/datanucleus/datanucleus-connectionpool-2.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/polepos/lib/datanucleus/datanucleus-core-2.1.0-release.jar
===================================================================
(Binary files differ)

Added: trunk/polepos/lib/datanucleus/datanucleus-core-2.2.2.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/datanucleus/datanucleus-core-2.2.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/polepos/lib/datanucleus/datanucleus-enhancer-2.1.0-release.jar
===================================================================
(Binary files differ)

Added: trunk/polepos/lib/datanucleus/datanucleus-enhancer-2.1.3.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/datanucleus/datanucleus-enhancer-2.1.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/polepos/lib/datanucleus/datanucleus-jpa-2.1.0-release.jar
===================================================================
(Binary files differ)

Added: trunk/polepos/lib/datanucleus/datanucleus-jpa-2.1.7.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/datanucleus/datanucleus-jpa-2.1.7.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/polepos/lib/datanucleus/datanucleus-management-1.0.2.jar
===================================================================
(Binary files differ)

Deleted: trunk/polepos/lib/datanucleus/datanucleus-rdbms-2.1.0-release.jar
===================================================================
(Binary files differ)

Added: trunk/polepos/lib/datanucleus/datanucleus-rdbms-2.2.3.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/datanucleus/datanucleus-rdbms-2.2.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java	2011-03-08 13:27:03 UTC (rev 200)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java	2011-03-09 14:33:48 UTC (rev 201)
@@ -164,7 +164,7 @@
 		properties.setProperty("datanucleus.autoStartMechanism","None");
 		
 		
-		// properties.setProperty("datanucleus.cache.level2.type","ehcache");
+		properties.setProperty("datanucleus.cache.level2.type","ehcache");
          
         
 		_persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, JDOHelper.class.getClassLoader());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polepos-devel] SF.net SVN: polepos:[233] trunk/polepos

[<car...@us...>]

Revision: 233
          http://polepos.svn.sourceforge.net/polepos/?rev=233&view=rev
Author:   carlrosenberger
Date:     2011-12-12 12:45:40 +0000 (Mon, 12 Dec 2011)
Log Message:
-----------
cr: VOD JPA is now running too. Changes to the rendering of the results. A long bar now always indicates a better result.

Modified Paths:
--------------
    trunk/polepos/.classpath
    trunk/polepos/build.xml
    trunk/polepos/settings/Jdo.properties
    trunk/polepos/settings/Jpa.properties
    trunk/polepos/src/META-INF/persistence.xml
    trunk/polepos/src/org/polepos/RunSeason.java
    trunk/polepos/src/org/polepos/enhance/AllEnhance.java
    trunk/polepos/src/org/polepos/enhance/VodEnhancer.java
    trunk/polepos/src/org/polepos/framework/VersionClassLoader.java
    trunk/polepos/src/org/polepos/reporters/CustomBarPDFReporter.java
    trunk/polepos/src/org/polepos/reporters/CustomBarRendererBase.java
    trunk/polepos/src/org/polepos/reporters/Graph.java
    trunk/polepos/src/org/polepos/reporters/PersistGraphReporter.java
    trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java
    trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java
    trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
    trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
    trunk/polepos/src/org/polepos/teams/jpa/JpaTeam.java
    trunk/polepos/src/org/polepos/teams/jpa/data/ComplexHolder2.java
    trunk/polepos/src/org/polepos/teams/jpa/data/InheritanceHierarchy2.java
    trunk/polepos/src/org/polepos/teams/jpa/data/JPB2.java
    trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedObject.java
    trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedPilot.java
    trunk/polepos/src/org/polepos/teams/jpa/data/JpaListHolder.java

Added Paths:
-----------
    trunk/polepos/lib/common/ant.jar
    trunk/polepos/lib/jpa/javax.persistence_2.0.0.jar
    trunk/polepos/lib/vod/antlr-3.3-complete.jar
    trunk/polepos/lib/vod/asm-all-4.0_RC1.jar
    trunk/polepos/lib/vod/jpa-agent.jar
    trunk/polepos/lib/vod/vodjpa.jar
    trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java
    trunk/polepos/src/org/polepos/reporters/RendererFactory.java
    trunk/polepos/src/org/polepos/teams/TeamFactory.java
    trunk/polepos/src/org/polepos/teams/jdo/VodJdoTeam.java
    trunk/polepos/src/org/polepos/teams/jdo/VodJdoTeamFactory.java
    trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java
    trunk/polepos/src/org/polepos/teams/jpa/VodJpaTeam.java
    trunk/polepos/src/org/polepos/teams/jpa/VodJpaTeamFactory.java

Removed Paths:
-------------
    trunk/polepos/lib/jpa/geronimo-jpa_2.0_spec-1.1.jar

Modified: trunk/polepos/.classpath
===================================================================
--- trunk/polepos/.classpath	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/.classpath	2011-12-12 12:45:40 UTC (rev 233)
@@ -20,7 +20,6 @@
 	<classpathentry kind="lib" path="lib/slf4j/slf4j-log4j12-1.5.10.jar"/>
 	<classpathentry kind="lib" path="lib/vod/jvi80.jar"/>
 	<classpathentry kind="lib" path="lib/vod/pizza.jar"/>
-	<classpathentry kind="lib" path="lib/vod/vodjdo.jar"/>
 	<classpathentry kind="lib" path="lib/hsqldb/hsqldb.jar"/>
 	<classpathentry kind="lib" path="lib/jdo/jdo-api-3.0.jar"/>
 	<classpathentry kind="lib" path="lib/db4o/db4o-8.0.174.15231-all-java5.jar"/>
@@ -29,6 +28,12 @@
 	<classpathentry kind="lib" path="lib/graph/jcommon-1.0.16.jar"/>
 	<classpathentry kind="lib" path="lib/graph/jfreechart-1.0.13.jar" sourcepath="lib/graph/jfreechart-1.0.13-src.zip"/>
 	<classpathentry kind="lib" path="lib/sqlite/sqlitejdbc-v056.jar"/>
+	<classpathentry kind="lib" path="lib/vod/vodjpa.jar" sourcepath="C:/Users/Carl/crosenbe_JPA/vobs/pmc_java/jpa"/>
+	<classpathentry kind="lib" path="lib/vod/jpa-agent.jar"/>
+	<classpathentry kind="lib" path="lib/jpa/javax.persistence_2.0.0.jar"/>
+	<classpathentry kind="lib" path="lib/vod/antlr-3.3-complete.jar"/>
+	<classpathentry kind="lib" path="lib/vod/asm-all-4.0_RC1.jar"/>
+	<classpathentry kind="lib" path="lib/common/ant.jar"/>
 	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="/ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.1.0/src/org.junit_3.8.1/junitsrc.zip"/>
 	<classpathentry kind="lib" path="lib/graph/gnujaxp.jar"/>
 	<classpathentry kind="lib" path="lib/graph/itext-1.2.jar"/>
@@ -37,7 +42,6 @@
 	<classpathentry kind="lib" path="lib/mysql/mysql-connector-java-5.1.16-bin.jar"/>
 	<classpathentry kind="lib" path="lib/postgresql/postgresql-9.0-801.jdbc4.jar"/>
 	<classpathentry kind="lib" path="lib/common/ehcache-core-2.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/jpa/geronimo-jpa_2.0_spec-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/jta/geronimo-jta_1.1_spec-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/openjpa/openjpa-2.1.0.jar"/>
 	<classpathentry kind="lib" path="lib/common/asm-3.3.jar"/>

Modified: trunk/polepos/build.xml
===================================================================
--- trunk/polepos/build.xml	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/build.xml	2011-12-12 12:45:40 UTC (rev 233)
@@ -1,49 +1,72 @@
 <project name="poleposition" default="race" basedir=".">
 
-    <property name="polepositionversion" value="0.40"/>
+    <property name="polepositionversion" value="0.50"/>
     <property name="polepos.concurrency" value="true"/>
 
     <property name="jdo" value="jdo"/>
-    <property name="jvi" value="jvi"/>
-    <property name="jpa" value="jpa"/>
-
-    <path id="poleposition_classpath">
+	<property name="vodjpa" value="vodjpa"/>
+<!--
+	<property name="jpa" value="jpa"/>
+	<property name="jvi" value="jvi"/>
+-->
+		
+    <path id="compilation_classpath">
         <fileset dir="lib">
             <include name="**/*.jar"/>
+        	<exclude name="**/vodjdo.jar" />
         </fileset>
         <fileset dir="../polepos.monitoring/dist">
             <include name="**/*.jar"/>
         </fileset>
         <pathelement location="bin"/>
     </path>
+	
+    <path id="runtime_classpath">
+        <fileset dir="lib">
+            <include name="**/*.jar"/>
+        	<exclude name="**/vodjdo.jar" />
+        </fileset>
+        <fileset dir="../polepos.monitoring/dist">
+            <include name="**/*.jar"/>
+        </fileset>
+        <pathelement location="bin"/>
+    </path>
 
 
+
     <target name="jdoenhance" description="runs the JDO enhancer" if="jdo">
         <java classname="org.polepos.enhance.JdoEnhance">
-            <classpath refid="poleposition_classpath"/>
+            <classpath refid="compilation_classpath"/>
         </java>
     </target>
 
     <target name="jpaenhance" description="runs the JPA enhancer" if="jpa">
         <java classname="org.polepos.enhance.JpaEnhance">
-            <classpath refid="poleposition_classpath"/>
+            <classpath refid="compilation_classpath"/>
         </java>
     </target>
+	
+    <target name="vodjpaenhance" description="runs the VOD JPA enhancer" if="vodjpa">
+        <java classname="org.polepos.enhance.VodJpaEnhance">
+            <classpath refid="compilation_classpath"/>
+        </java>
+    </target>
 
     <target name="jvienhance" description="runs the JVI enhancer" if="jvi">
         <java classname="com.versant.Enhance" fork="yes" failonerror="yes">
-            <classpath refid="poleposition_classpath"/>
+            <classpath refid="compilation_classpath"/>
             <arg line="-config src/config.jvi -in bin -out bin"/>
         </java>
     </target>
 
-    <target name="race" depends="clean,compile,jpaenhance,jdoenhance"
+    <target name="race" depends="clean,compile,jdoenhance, vodjpaenhance"
             description="runs with all circuits and all teams ">
         <echo message="${polepos.debug}"/>
-        <java classname="org.polepos.RunSeason" fork="true">
-            <classpath refid="poleposition_classpath">
+    	<java classname="org.polepos.RunSeason" fork="true">
+            <classpath refid="runtime_classpath">
             </classpath>
-            <jvmarg value="-Xmx1024m"/>
+            <jvmarg value="-Xmx1400m"/>
+        	<jvmarg value="-javaagent:lib/vod/jpa-agent.jar"/>
             <sysproperty key="polepos.debug" value="${polepos.debug}"/>
             <sysproperty key="polepos.concurrency" value="${polepos.concurrency}"/>
 
@@ -61,7 +84,7 @@
         </copy>
         <javac destdir="bin" debug="true">
             <src path="src"/>
-            <classpath refid="poleposition_classpath"/>
+            <classpath refid="compilation_classpath"/>
         </javac>
     </target>
 

Added: trunk/polepos/lib/common/ant.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/common/ant.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/polepos/lib/jpa/geronimo-jpa_2.0_spec-1.1.jar
===================================================================
(Binary files differ)

Added: trunk/polepos/lib/jpa/javax.persistence_2.0.0.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/jpa/javax.persistence_2.0.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/polepos/lib/vod/antlr-3.3-complete.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/vod/antlr-3.3-complete.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/polepos/lib/vod/asm-all-4.0_RC1.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/vod/asm-all-4.0_RC1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/polepos/lib/vod/jpa-agent.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/vod/jpa-agent.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/polepos/lib/vod/vodjpa.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/vod/vodjpa.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/polepos/settings/Jdo.properties
===================================================================
--- trunk/polepos/settings/Jdo.properties	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/settings/Jdo.properties	2011-12-12 12:45:40 UTC (rev 233)
@@ -42,5 +42,5 @@
 vod8.vendor=Versant
 vod8.name=VOD
 vod8.description=Versant Object Database
-vod8.version=8.0.1.6
+vod8.version=8.0.2
 vod8.color=0xCF432F

Modified: trunk/polepos/settings/Jpa.properties
===================================================================
--- trunk/polepos/settings/Jpa.properties	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/settings/Jpa.properties	2011-12-12 12:45:40 UTC (rev 233)
@@ -2,15 +2,27 @@
 #
 # JPA implementations to be run
 #
-#
 # jpa=datanucleus,openjpa
+jpa=vodjpa
 
-jpa=openjpa
-
-enhance=true
+enhance=false
 enhancer=openjpa
 
+
 #
+# vodjpa
+#
+vodjpa.factory=com.versant.jpa.core.VersantEntityManagerFactoryImpl
+vodjpa.vendor=Versant
+vodjpa.name=VersantJPA
+vodjpa.version=8.0.2
+vodjpa.description=Versant JPA  
+vodjpa.website=http://www.versant.com
+vodjpa.color=0x7AC5CD
+vodjpa.connecturl=dbbench@localhost
+
+
+#
 # datanucleus
 #
 datanucleus.factory=org.datanucleus.jpa.jpaPersistenceManagerFactory

Modified: trunk/polepos/src/META-INF/persistence.xml
===================================================================
--- trunk/polepos/src/META-INF/persistence.xml	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/META-INF/persistence.xml	2011-12-12 12:45:40 UTC (rev 233)
@@ -2,7 +2,40 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
-    http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
+    http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
+    
+    
+	<persistence-unit name="vodjpa">
+		<provider>com.versant.jpa.core.VersantPersistence</provider>
+        <class>org.polepos.teams.jpa.data.ComplexHolder0</class>
+        <class>org.polepos.teams.jpa.data.ComplexHolder1</class>
+        <class>org.polepos.teams.jpa.data.ComplexHolder2</class>
+        <class>org.polepos.teams.jpa.data.ComplexHolder3</class>
+        <class>org.polepos.teams.jpa.data.ComplexHolder4</class>
+        <class>org.polepos.teams.jpa.data.ListHolder</class>
+        <class>org.polepos.teams.jpa.data.InheritanceHierarchy0</class>
+        <class>org.polepos.teams.jpa.data.InheritanceHierarchy1</class>
+        <class>org.polepos.teams.jpa.data.InheritanceHierarchy2</class>
+        <class>org.polepos.teams.jpa.data.InheritanceHierarchy3</class>
+        <class>org.polepos.teams.jpa.data.InheritanceHierarchy4</class>
+        <class>org.polepos.teams.jpa.data.JpaIndexedObject</class>
+        <class>org.polepos.teams.jpa.data.JpaIndexedPilot</class>
+        <class>org.polepos.teams.jpa.data.JpaPilot</class>
+        <class>org.polepos.teams.jpa.data.JpaTree</class>
+        <class>org.polepos.teams.jpa.data.JPB0</class>
+        <class>org.polepos.teams.jpa.data.JPB1</class>
+        <class>org.polepos.teams.jpa.data.JPB2</class>
+        <class>org.polepos.teams.jpa.data.JPB3</class>
+        <class>org.polepos.teams.jpa.data.JPB4</class>
+        <class>org.polepos.teams.jpa.data.JpaLightObject</class>
+        <class>org.polepos.teams.jpa.data.JpaListHolder</class>
+        <class>org.polepos.teams.jpa.data.JPN1</class>
+        <properties>
+        	<property name="versant.connectionURL" value="dbbench@localhost" />
+        </properties>
+    </persistence-unit>
+    
+    
   <!--
     <persistence-unit name="datanucleus/mysql" transaction-type="RESOURCE_LOCAL">
         <provider>org.datanucleus.jpa.PersistenceProviderImpl</provider>
@@ -44,7 +77,7 @@
         </properties>
 
     </persistence-unit>
-    
+
     <persistence-unit name="datanucleus/postgresql" transaction-type="RESOURCE_LOCAL">
         <provider>org.datanucleus.jpa.PersistenceProviderImpl</provider>
         
@@ -87,7 +120,7 @@
     </persistence-unit>
     
    -->  
-   
+<!--   
     <persistence-unit name="openjpa/mysql">
         <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
         
@@ -117,8 +150,6 @@
         
         <properties>
 
-			<!-- Set up openjpa with Apache DBCP connection pooling -->
-
  			<property name="openjpa.ConnectionProperties" 
                 value="DriverClassName=com.mysql.jdbc.Driver,
                   Url=jdbc:mysql://localhost/dbbench, 
@@ -136,6 +167,7 @@
             
         </properties>
     </persistence-unit>
+-->    
     
     <!--
     <persistence-unit name="openjpa/postgresql">

Modified: trunk/polepos/src/org/polepos/RunSeason.java
===================================================================
--- trunk/polepos/src/org/polepos/RunSeason.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/RunSeason.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -61,7 +61,7 @@
 
 	@Override
 	public Circuit[] circuits() {
-		return ArraysP.concat(defaultCircuits(), concurrencyCircuits());
+		return ArraysP.concat(concurrencyCircuits(), defaultCircuits());
 	}
 	
 	private Circuit[] defaultCircuits(){
@@ -92,12 +92,17 @@
 	@Override
 	public Team[] teams() {
 		return new Team[] {
-				new Db4oTeam(),
-				new JdoTeam(),
-//				new Db4oClientServerTeam(),
+				VodJdoTeamFactory.newVodJdoTeam(),
+				VodJpaTeamFactory.newVodJpaTeam(),
+//				new JdoTeam(),
+//				new JpaTeam(true),
+//				new Db4oTeam(),
+				
+				new Db4oClientServerTeam(),
 				new JdbcTeam(),
 				new HibernateTeam(),
-				new JpaTeam(),
+				
+//				new JpaTeam(),
 //				new MongoDBTeam(),
 //				new JviTeam(),
 		};
@@ -107,5 +112,6 @@
 	protected Reporter[] reporters() {
 		return DefaultReporterFactory.defaultReporters();
 	}
+	
 
 }

Modified: trunk/polepos/src/org/polepos/enhance/AllEnhance.java
===================================================================
--- trunk/polepos/src/org/polepos/enhance/AllEnhance.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/enhance/AllEnhance.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -29,7 +29,9 @@
 		
 //		new JviEnhance().runWithoutSystemExit();
 		
-		JpaEnhance.main(null);
+		VodJpaEnhance.main(null);
+		
+		// JpaEnhance.main(null);
 	}
 
 }

Modified: trunk/polepos/src/org/polepos/enhance/VodEnhancer.java
===================================================================
--- trunk/polepos/src/org/polepos/enhance/VodEnhancer.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/enhance/VodEnhancer.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -4,21 +4,21 @@
 
 import java.io.*;
 
-import com.versant.core.jdo.tools.enhancer.*;
+// import com.versant.core.jdo.tools.enhancer.*;
 
 public class VodEnhancer {
 	
 	public static void main(String[] args) throws Exception {
-		String propertiesFilePath = "settings/versant.properties";
-		String outputDir = "bin";
-		
-		Enhancer enhancer = new Enhancer();
-		enhancer.setPropertiesFile(new File(propertiesFilePath));
-		
-		System.out.println("Enhancing to: " + new File(outputDir).getAbsolutePath());
-		
-		enhancer.setOutputDir(new File(outputDir));
-		enhancer.enhance();
+//		String propertiesFilePath = "settings/versant.properties";
+//		String outputDir = "bin";
+//		
+//		Enhancer enhancer = new Enhancer();
+//		enhancer.setPropertiesFile(new File(propertiesFilePath));
+//		
+//		System.out.println("Enhancing to: " + new File(outputDir).getAbsolutePath());
+//		
+//		enhancer.setOutputDir(new File(outputDir));
+//		enhancer.enhance();
 	}
 
 }

Added: trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java
===================================================================
--- trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -0,0 +1,46 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.enhance;
+
+import java.io.*;
+
+import org.apache.tools.ant.*;
+import org.apache.tools.ant.types.*;
+
+import com.versant.jpa.enhancer.ant.*;
+
+public class VodJpaEnhance {
+	
+	public static void main(String[] args) {
+		Project project = new Project();
+		EnhancerTask enhancerTask = new EnhancerTask();
+		enhancerTask.setProject(project);
+		enhancerTask.setInheritsClasspath(true);
+		enhancerTask.setDestdir("bin");
+		FileSet fs = new FileSet();
+		fs.setProject(project);
+		fs.setDir(new File("bin"));
+		fs.createInclude().setName("**/*.class");
+		enhancerTask.addFileSet(fs);
+		enhancerTask.execute();
+	}
+
+}


Property changes on: trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/framework/VersionClassLoader.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/VersionClassLoader.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/framework/VersionClassLoader.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -49,6 +49,7 @@
 
     protected Class<?> loadClass(String name,boolean resolve) throws ClassNotFoundException {
         try {
+        	// System.out.println(name + " ... loaded from VersionClassLoader");
             if(cache.containsKey(name)) {
                 return cache.get(name);
             }

Modified: trunk/polepos/src/org/polepos/reporters/CustomBarPDFReporter.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/CustomBarPDFReporter.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/reporters/CustomBarPDFReporter.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -71,7 +71,7 @@
             pdfData().add(render(graph, new OneArgFunction<Graph, ChartRenderer>() {
                 @Override
                 public ChartRenderer invoke(Graph graph) {
-                    return newRenderer(graph);
+                	return RendererFactory.newRenderer(graph);
                 }
             }));
 
@@ -113,18 +113,6 @@
         return new ImgTemplate(tp);
     }
 
-    private CustomBarRendererBase newRenderer(Graph graph) {
-        if (graph.circuit().isFixedTime()) {
-            if (Settings.LOGARITHMIC) {
-                return new LogarithmicFixedTimeCustomBarRenderer(graph);
-            }
-            return new LinearFixedTimeCustomBarRenderer(graph);
-        }
-        if (Settings.LOGARITHMIC) {
-            return new LogarithmicTimedLapsCustomBarRenderer(graph);
-        }
-        return new LinearTimedLapsCustomBarRenderer(graph);
-    }
 
     @Override
     protected void renderTableAndGraph(int type, Graph graph, String unitsLegend) throws BadElementException {

Modified: trunk/polepos/src/org/polepos/reporters/CustomBarRendererBase.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/CustomBarRendererBase.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/reporters/CustomBarRendererBase.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -97,16 +97,14 @@
 		
 		int circuitNo = 5;
 		ObjectSet<Graph> result = db.query(Graph.class);
-		// Graph graph = result.iterator().next();
-		Graph graph = result.get(circuitNo);
+		Graph graph = result.iterator().next();
+		// Graph graph = result.get(circuitNo);
 		
 		
 		db.activate(graph, Integer.MAX_VALUE);
 		db.close();
 		
-		
-		// final CustomBarRendererBase renderer = (graph.circuit().isFixedTime() ? new FixedTimeCustomBarRenderer(graph) : new LogarithmicTimedLapsCustomBarRenderer(graph));
-		final CustomBarRendererBase renderer = (graph.circuit().isFixedTime() ? new LinearFixedTimeCustomBarRenderer(graph) : new LinearTimedLapsCustomBarRenderer(graph));
+		final CustomBarRendererBase renderer = RendererFactory.newRenderer(graph);
 
 		JFrame w = new JFrame("Polepos preview");
 		JPanel contentPane = new JPanel()

Modified: trunk/polepos/src/org/polepos/reporters/Graph.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/Graph.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/reporters/Graph.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -28,6 +28,12 @@
 
 
 public class Graph {
+	
+	public static interface ResultProcessor {
+		
+		void process(TurnCombination turnCombination, Result result);
+		
+	}
     
     private final List<TeamCar>teamCars= new ArrayList<TeamCar>();
 	private final List<TurnSetup> setups=new ArrayList<TurnSetup>();
@@ -43,6 +49,16 @@
         this.circuit = circuit;
         this.lap = lap;
     }
+    
+    Iterable<Result> resultValues(){
+    	return results.values();
+    }
+    
+    public void traverseResults(ResultProcessor processor){
+    	for(Map.Entry<TurnCombination, Result> entry : results.entrySet()){
+    		processor.process(entry.getKey(), entry.getValue());
+    	}
+    }
 
     public void addResult(TeamCar teamCar, Result result) {
         TurnSetup setup = result.getSetup();

Modified: trunk/polepos/src/org/polepos/reporters/PersistGraphReporter.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/PersistGraphReporter.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/reporters/PersistGraphReporter.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -41,7 +41,7 @@
     private void persist(Map<CircuitLap, Graph> graphs) {
 		new File("graph.db4o").delete();
 		EmbeddedObjectContainer db = Db4oEmbedded.openFile("graph.db4o");
-		db.store(new PersistentGraphs(graphs));
+		// db.store(new PersistentGraphs(graphs));
 		db.commit();
 		db.close();
 	}

Added: trunk/polepos/src/org/polepos/reporters/RendererFactory.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/RendererFactory.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/reporters/RendererFactory.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -0,0 +1,75 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.reporters;
+
+import java.util.*;
+
+import org.polepos.*;
+import org.polepos.framework.*;
+import org.polepos.reporters.CustomBarRendererBase.*;
+import org.polepos.reporters.Graph.*;
+
+public class RendererFactory {
+	
+	private static final double SCALE_FACTOR = 100;
+	
+    public static CustomBarRendererBase newRenderer(Graph graph) {
+        if (graph.circuit().isFixedTime()) {
+            if (Settings.LOGARITHMIC) {
+                return new LogarithmicFixedTimeCustomBarRenderer(graph);
+            }
+            return new LinearFixedTimeCustomBarRenderer(graph);
+        }
+        if (Settings.LOGARITHMIC) {
+            return new LogarithmicTimedLapsCustomBarRenderer(graph);
+        }
+        // return new LinearTimedLapsCustomBarRenderer(graph);
+        graph = toFixedTime(graph);
+        return new LinearFixedTimeCustomBarRenderer(graph);
+    }
+
+	private static Graph toFixedTime(final Graph oldGraph) {
+		final Graph newGraph = new Graph(oldGraph.circuit(), oldGraph.lap());
+		final long slowest = findSlowest(oldGraph);
+		oldGraph.traverseResults(new ResultProcessor() {
+			@Override
+			public void process(TurnCombination turnCombination, Result result) {
+				TimedLapsResult timedLapsResult = (TimedLapsResult) result;
+				long time = timedLapsResult.getTime();
+				double factor = (double)slowest / (double)time;
+				long iterations = (long)(factor * SCALE_FACTOR);
+				FixedTimeResult fixedTimeResult = new FixedTimeResult(oldGraph.circuit(),oldGraph.lap(), result.getTeam(), result.getSetup(), result.getLoadMonitoring(), result.getIndex(), iterations);
+				newGraph.addResult(turnCombination.teamCar, fixedTimeResult);
+			}
+		});
+		return newGraph;
+	}
+
+	private static long findSlowest(Graph oldGraph) {
+		long slowest = 0;
+		for(Result result : oldGraph.resultValues()){
+			TimedLapsResult timedLapsResult = (TimedLapsResult) result;
+			slowest = Math.max(slowest, timedLapsResult.getTime());
+		}
+		return slowest;
+	}
+
+}


Property changes on: trunk/polepos/src/org/polepos/reporters/RendererFactory.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java
===================================================================
--- trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -37,7 +37,6 @@
 			"0x127ABF",
 			"0x44BDE0",
 			"0xFFCA07",
-
 	};
 	
 	private int currentColor;

Added: trunk/polepos/src/org/polepos/teams/TeamFactory.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/TeamFactory.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/teams/TeamFactory.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -0,0 +1,100 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.teams;
+
+import java.io.*;
+import java.net.*;
+
+import javax.jms.IllegalStateException;
+
+import org.polepos.framework.*;
+
+public class TeamFactory {
+	
+	private static String _workspace;
+	
+	protected static Team newTeam(String jar, String folder, String teamName, String...prefixes) {
+		try {
+			File file = new File(folder, jar);
+			if(! file.exists()){
+				throw new IllegalStateException(jar + " not found");
+			}
+			URL jarUrl = file.toURL();
+			
+            File[] projectPaths = projectPaths();
+            URL[] urls = new URL[projectPaths.length + 1];
+            for (int projectIdx = 0; projectIdx < projectPaths.length; projectIdx++) {
+				urls[projectIdx] = new File(projectPaths[projectIdx], "bin").toURI().toURL();
+			}
+            urls[urls.length - 1] = jarUrl;
+            
+            ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+			ClassLoader loader=new VersionClassLoader(urls, prefixes, contextClassLoader);
+			try{
+				Thread.currentThread().setContextClassLoader(loader);
+				Class<?> clazz = loader.loadClass(teamName);
+				Team team = (Team) clazz.newInstance();
+				return team;
+			}finally{
+				Thread.currentThread().setContextClassLoader(contextClassLoader);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+	}
+	
+    protected static File[] libPaths() {
+    	File[] projectPaths = projectPaths();
+    	File[] libPaths = new File[projectPaths.length];
+    	for (int pathIdx = 0; pathIdx < projectPaths.length; pathIdx++) {
+			libPaths[pathIdx] = new File(projectPaths[pathIdx], "lib");
+		}
+    	return libPaths;
+    }
+
+    protected  static File[] projectPaths() {
+    	return new File[]{ workspaceFile("polepos")};
+    }
+    
+    protected static File workspaceFile(String path) {
+    	return new File(workspace(), path);
+    }
+
+    protected static void guessWorkSpace() {
+        File absoluteFile = new File(new File("lib").getAbsolutePath());
+        _workspace = absoluteFile.getParentFile().getParentFile().getAbsolutePath();
+        System.out.println("Guessed workspace:\n" + _workspace + "\n");
+    }
+    
+    protected static String workspace() {
+    	if(_workspace == null) {
+    	    _workspace = System.getProperty("polepos.dir");
+    	    if (_workspace == null) {
+    	        guessWorkSpace();
+    	    }
+    	}
+    	return _workspace;
+    }
+
+
+
+}


Property changes on: trunk/polepos/src/org/polepos/teams/TeamFactory.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -35,7 +35,8 @@
 	public HibernateTeam() {
 		String[] dbs = Jdbc.settings().getHibernateTypes();
 		_cars = new Car[dbs.length];
-		String[] colors = new String[]{"0x2B439C", "0x44BDE0", "0x127ABF"};
+		
+		String[] colors = new String[]{"0x2B439C", "0x8A2BE2", "0x127ABF"};
 		for (int i = 0; i < dbs.length; i++) {
 			_cars[i] = new HibernateCar(this, dbs[i], i>=colors.length ? "0x000000" : colors[i]);
 		}

Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -51,7 +51,7 @@
     
     private String _name; 
 
-    JdoCar(Team team, String name, String dbName, String color) {
+    public JdoCar(Team team, String name, String dbName, String color) {
     	super(team, color);
 
         _jdoName = name;
@@ -151,7 +151,7 @@
 		properties.setProperty("datanucleus.autoStartMechanism","None");
 		properties.setProperty("datanucleus.cache.level2.type","ehcache");
 
-		_persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, JDOHelper.class.getClassLoader());
+		_persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, Thread.currentThread().getContextClassLoader());
 		
 		// Datanucleus Schema create
 		if(_persistenceManagerFactory instanceof JDOPersistenceManagerFactory){
@@ -203,7 +203,7 @@
         
         properties.setProperty("datanucleus.autoCreateSchema", "false");
 
-        _persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, JDOHelper.class.getClassLoader());
+        _persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, Thread.currentThread().getContextClassLoader());
         
     }
 

Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -57,10 +57,12 @@
 
 public class JdoTeam extends Team{
     
-	private final Car[] mCars;
-    
-    public JdoTeam() {
-        
+	protected Car[] mCars;
+	
+	protected JdoTeam(boolean initialize){
+		if(! initialize){
+			return;
+		}
         String[] impls = Jdo.settings().getJdoImplementations();
         
         if(impls == null){
@@ -94,7 +96,11 @@
             mCars = new Car[ cars.size() ];
             cars.toArray(mCars);
         }
-        
+		
+	}
+    
+    public JdoTeam() {
+    	this(true);
     }
     
 	

Added: trunk/polepos/src/org/polepos/teams/jdo/VodJdoTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/VodJdoTeam.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/teams/jdo/VodJdoTeam.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -0,0 +1,51 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.teams.jdo;
+
+import org.polepos.framework.*;
+
+public class VodJdoTeam extends JdoTeam {
+	
+	private transient ClassLoader _standardClassLoader;
+	
+	private transient ClassLoader _versionClassLoader;
+
+	public VodJdoTeam() {
+		super(false);
+		_versionClassLoader = getClass().getClassLoader();
+		String name = "vod8";
+		mCars = new Car[]{new JdoCar(this, name, null, Jdo.settings().color(name))};
+	}
+	
+	@Override
+	public void setUp() {
+		_standardClassLoader = Thread.currentThread().getContextClassLoader();
+		Thread.currentThread().setContextClassLoader(_versionClassLoader);
+		super.setUp();
+	}
+	
+	@Override
+	protected void tearDown() {
+		super.tearDown();
+		Thread.currentThread().setContextClassLoader(_standardClassLoader);
+	}
+
+}


Property changes on: trunk/polepos/src/org/polepos/teams/jdo/VodJdoTeam.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/polepos/src/org/polepos/teams/jdo/VodJdoTeamFactory.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/VodJdoTeamFactory.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/teams/jdo/VodJdoTeamFactory.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -0,0 +1,39 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.teams.jdo;
+
+import org.polepos.framework.*;
+import org.polepos.teams.*;
+
+/**
+ * VOD JDO and VOD JPA are not compatible to run in the same ClassLoader
+ * space. That's why we use a special classloader for VOD JDO that knows
+ * it's vodjdo.jar. 
+ *
+ */
+public class VodJdoTeamFactory extends TeamFactory{
+	
+	public static Team newVodJdoTeam(){
+		return newTeam("vodjdo.jar", "lib/vod", "org.polepos.teams.jdo.VodJdoTeam", "com.versant", "org.polepos.teams.jdo");
+	}
+
+	
+}


Property changes on: trunk/polepos/src/org/polepos/teams/jdo/VodJdoTeamFactory.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/teams/jpa/JpaTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/JpaTeam.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/teams/jpa/JpaTeam.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -19,8 +19,8 @@
 
 package org.polepos.teams.jpa;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.io.*;
+import java.util.*;
 
 import javax.persistence.*;
 
@@ -45,9 +45,27 @@
  */
 public class JpaTeam extends Team{
     
-	private final Car[] mCars;
+	protected Car[] mCars;
+	
+	final Map<String, JpaCarFactory> factories = new HashMap<String, JpaCarFactory>();
+	
+	public JpaTeam() {
+		this(true);
+	}
     
-    public JpaTeam() {
+    public JpaTeam(boolean initialize) {
+    	
+    	if(! initialize){
+    		return;
+    	}
+    	
+    	factories.put("vodjpa", new JpaCarFactory() {
+			@Override
+			public JpaCar newInstance(JpaTeam team, String name, String dbName, String color) throws IOException {
+				return new VodJpaCar(team, name, dbName, color);
+			}
+		});
+    	
         
         String[] impls = Jpa.settings().getJpaImplementations();
         
@@ -72,7 +90,12 @@
                     }
                 }else{
                     try {
-                        cars.add(new JpaCar(this, impl, null, Jpa.settings().color(impl)));
+                    	JpaCarFactory jpaCarFactory = factories.get(impl);
+                    	if(jpaCarFactory != null){
+                    		cars.add(jpaCarFactory.newInstance(this, impl, null, Jpa.settings().color(impl)));
+                    	} else {
+                    		cars.add(new JpaCar(this, impl, null, Jpa.settings().color(impl)));
+                    	}
                     } catch (Exception e) {
                         e.printStackTrace();
                     } 
@@ -128,22 +151,31 @@
     }
     
     public void setUp() {
-		for(int i = 0; i < mCars.length;i++){		
-			EntityManager em = ((JpaCar)mCars[i]).getEntityManager();
-			delete(em, ComplexHolder0.class);
-			delete(em, InheritanceHierarchy0.class);
-			delete(em, JpaIndexedObject.class);
-			delete(em, ListHolder.class);
-			delete(em, JPB0.class);
-			delete(em, JpaIndexedPilot.class);
-			delete(em, JpaPilot.class);
-			delete(em, JpaTree.class);
-			delete(em, JpaLightObject.class);
-			delete(em, JpaListHolder.class);
-			delete(em, JPN1.class);
+		for(int i = 0; i < mCars.length;i++){
+			JpaCar jpaCar = (JpaCar)mCars[i];
+			if(jpaCar.canRecreateDatabase()){
+				jpaCar.recreateDatabase();
+			} else {
+				deleteAllPersistentClasses(jpaCar);
+			}
 		}
-		
 	}
+
+
+	private void deleteAllPersistentClasses(JpaCar jpaCar) {
+		EntityManager em = jpaCar.getEntityManager();
+		delete(em, ComplexHolder0.class);
+		delete(em, InheritanceHierarchy0.class);
+		delete(em, JpaIndexedObject.class);
+		delete(em, ListHolder.class);
+		delete(em, JPB0.class);
+		delete(em, JpaIndexedPilot.class);
+		delete(em, JpaPilot.class);
+		delete(em, JpaTree.class);
+		delete(em, JpaLightObject.class);
+		delete(em, JpaListHolder.class);
+		delete(em, JPN1.class);
+	}
     
     private void delete(EntityManager em, Class clazz){
 	    em.getTransaction().begin();

Added: trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -0,0 +1,54 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.teams.jpa;
+
+import java.io.*;
+
+import org.polepos.framework.*;
+
+import com.versant.admin.*;
+
+public class VodJpaCar extends JpaCar{
+
+	private String _connectUrl;
+
+	public VodJpaCar(Team team, String name, String dbName, String color) throws IOException  {
+		super(team, name, dbName, color);
+		_connectUrl = Jpa.settings().getConnectUrl(name);
+	}
+	
+	@Override
+	public boolean canRecreateDatabase() {
+		return true;
+	}
+	
+	@Override
+	public void recreateDatabase() {
+		ServerAdministration.removeDatabase(_connectUrl);
+		ServerAdministration.createDatabase(_connectUrl);
+		try {
+			reinitialize();
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+}


Property changes on: trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/polepos/src/org/polepos/teams/jpa/VodJpaTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/VodJpaTeam.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/teams/jpa/VodJpaTeam.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -0,0 +1,53 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.teams.jpa;
+
+import java.io.*;
+
+import org.polepos.framework.*;
+
+public class VodJpaTeam extends JpaTeam {
+	
+	private transient ClassLoader _standardClassLoader;
+	
+	private transient ClassLoader _versionClassLoader;
+
+	public VodJpaTeam() throws IOException {
+		super(false);
+		_versionClassLoader = getClass().getClassLoader();
+		String name = "vodjpa";
+		mCars = new Car[]{new VodJpaCar(this, name, null, Jpa.settings().color(name))};
+	}
+	
+	@Override
+	public void setUp() {
+		_standardClassLoader = Thread.currentThread().getContextClassLoader();
+		Thread.currentThread().setContextClassLoader(_versionClassLoader);
+		super.setUp();
+	}
+	
+	@Override
+	protected void tearDown() {
+		super.tearDown();
+		Thread.currentThread().setContextClassLoader(_standardClassLoader);
+	}
+
+}


Property changes on: trunk/polepos/src/org/polepos/teams/jpa/VodJpaTeam.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/polepos/src/org/polepos/teams/jpa/VodJpaTeamFactory.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/VodJpaTeamFactory.java	                        (rev 0)
+++ trunk/polepos/src/org/polepos/teams/jpa/VodJpaTeamFactory.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -0,0 +1,38 @@
+/* 
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA  02111-1307, USA. */
+
+
+package org.polepos.teams.jpa;
+
+import org.polepos.framework.*;
+import org.polepos.teams.*;
+
+/**
+ * VOD JDO and VOD JPA are not compatible to run in the same ClassLoader
+ * space. That's why we use a special classloader for VOD JDO that knows
+ * it's vodjdo.jar. 
+ *
+ */
+public class VodJpaTeamFactory extends TeamFactory{
+	
+	public static Team newVodJpaTeam(){
+		return newTeam("vodjpa.jar", "lib/vod", "org.polepos.teams.jpa.VodJpaTeam", "com.versant", "org.polepos.teams.jpa");
+	}
+	
+}


Property changes on: trunk/polepos/src/org/polepos/teams/jpa/VodJpaTeamFactory.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/polepos/src/org/polepos/teams/jpa/data/ComplexHolder2.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/data/ComplexHolder2.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/teams/jpa/data/ComplexHolder2.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -22,12 +22,11 @@
 
 import javax.persistence.Entity;
 
-import org.apache.openjpa.persistence.jdbc.Index;
-
 @Entity
+...@co...dex(name="ii2", attributes={"i2"})
 public class ComplexHolder2 extends ComplexHolder1 {
 	
-    @Index
+    @org.apache.openjpa.persistence.jdbc.Index
 	public int i2;
 	
 	public int getI2() {

Modified: trunk/polepos/src/org/polepos/teams/jpa/data/InheritanceHierarchy2.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/data/InheritanceHierarchy2.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/teams/jpa/data/InheritanceHierarchy2.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -24,9 +24,10 @@
 import org.apache.openjpa.persistence.jdbc.Index;
 
 @Entity
+...@co...dex(name="iihi2", attributes={"i2"})
 public class InheritanceHierarchy2 extends InheritanceHierarchy1{
     
-    @Index
+	@org.apache.openjpa.persistence.jdbc.Index
     private int i2;  // index this one for queries
     
     public InheritanceHierarchy2(){

Modified: trunk/polepos/src/org/polepos/teams/jpa/data/JPB2.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/data/JPB2.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/teams/jpa/data/JPB2.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -19,17 +19,16 @@
 
 package org.polepos.teams.jpa.data;
 
-import javax.persistence.Entity;
+import javax.persistence.*;
 
-import org.apache.openjpa.persistence.jdbc.Index;
-
 /**
  * @author Christian Ernst
  */
+...@co...dex(name="ib2", attributes={"b2"})
 @Entity
 public class JPB2 extends JPB1{
     
-	@Index
+	@org.apache.openjpa.persistence.jdbc.Index
     private int b2;  // index this one for queries
     
     public JPB2(){

Modified: trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedObject.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedObject.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedObject.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -20,26 +20,26 @@
 
 package org.polepos.teams.jpa.data;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
-import org.apache.openjpa.persistence.jdbc.Index;
-import org.polepos.data.IndexedObject;
-import org.polepos.framework.CheckSummable;
+import org.polepos.data.*;
+import org.polepos.framework.*;
 
 @Entity
+...@co...dexes({
+	@com.versant.jpa.annotations.Index(name="i_int", attributes={"_int"}),
+	@com.versant.jpa.annotations.Index(name="i_string", attributes={"_string"})
+})
 public class JpaIndexedObject implements CheckSummable{
 	
     @Id
     @GeneratedValue(strategy=GenerationType.AUTO)
     private long oid;
     
-    @Index
+    @org.apache.openjpa.persistence.jdbc.Index
 	public int _int;
 	
-    @Index
+    @org.apache.openjpa.persistence.jdbc.Index
 	public String _string;
 	
 	public JpaIndexedObject(){

Modified: trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedPilot.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedPilot.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedPilot.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -21,7 +21,6 @@
 
 import javax.persistence.*;
 
-import org.apache.openjpa.persistence.jdbc.*;
 import org.polepos.framework.*;
 
 
@@ -29,17 +28,21 @@
  * @author Christian Ernst
  */
 @Entity
+...@co...dexes({
+	@com.versant.jpa.annotations.Index(name="iName", attributes={"mName"}),
+	@com.versant.jpa.annotations.Index(name="iLicenseID", attributes={"mLicenseID"})
+})
 public class JpaIndexedPilot implements CheckSummable
 {
     @Id
     @GeneratedValue(strategy=GenerationType.AUTO)
     private long oid;
     
-    @Index
+    @org.apache.openjpa.persistence.jdbc.Index
 	private		String	mName;
 	private		String	mFirstName;
 	private		int		mPoints;
-	@Index
+	@org.apache.openjpa.persistence.jdbc.Index
 	private		int		mLicenseID;
 
 	

Modified: trunk/polepos/src/org/polepos/teams/jpa/data/JpaListHolder.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/data/JpaListHolder.java	2011-11-09 17:13:52 UTC (rev 232)
+++ trunk/polepos/src/org/polepos/teams/jpa/data/JpaListHolder.java	2011-12-12 12:45:40 UTC (rev 233)
@@ -5,12 +5,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
+import javax.persistence.*;
 
 import org.polepos.framework.CheckSummable;
 
@@ -24,8 +19,6 @@
     @GeneratedValue(strategy=GenerationType.AUTO)
     private long oid;
     
-    @Basic
-    @Lob
     public List<Integer> list;
     
     public JpaListHolder(){

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polepos-devel] SF.net SVN: polepos:[236] trunk/polepos

[<car...@us...>]

Revision: 236
          http://polepos.svn.sourceforge.net/polepos/?rev=236&view=rev
Author:   carlrosenberger
Date:     2012-07-15 12:08:23 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
cr: Updated VOD to the latest version.

Modified Paths:
--------------
    trunk/polepos/.classpath
    trunk/polepos/build.xml
    trunk/polepos/lib/vod/jpa-agent.jar
    trunk/polepos/lib/vod/vodjdo.jar
    trunk/polepos/lib/vod/vodjpa.jar
    trunk/polepos/settings/Jdbc.properties
    trunk/polepos/settings/Jdo.properties
    trunk/polepos/src/org/polepos/RunSeason.java
    trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java
    trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
    trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
    trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java
    trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java
    trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java

Added Paths:
-----------
    trunk/polepos/lib/vod/asm-all-4.0.jar
    trunk/polepos/lib/vod/commons-cli-1.1.jar

Removed Paths:
-------------
    trunk/polepos/lib/vod/asm-all-4.0_RC1.jar

Modified: trunk/polepos/.classpath
===================================================================
--- trunk/polepos/.classpath	2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/.classpath	2012-07-15 12:08:23 UTC (rev 236)
@@ -32,8 +32,9 @@
 	<classpathentry kind="lib" path="lib/vod/jpa-agent.jar"/>
 	<classpathentry kind="lib" path="lib/jpa/javax.persistence_2.0.0.jar"/>
 	<classpathentry kind="lib" path="lib/vod/antlr-3.3-complete.jar"/>
-	<classpathentry kind="lib" path="lib/vod/asm-all-4.0_RC1.jar"/>
 	<classpathentry kind="lib" path="lib/common/ant.jar"/>
+	<classpathentry kind="lib" path="lib/vod/asm-all-4.0.jar"/>
+	<classpathentry kind="lib" path="lib/vod/commons-cli-1.1.jar"/>
 	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="/ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.1.0/src/org.junit_3.8.1/junitsrc.zip"/>
 	<classpathentry kind="lib" path="lib/graph/gnujaxp.jar"/>
 	<classpathentry kind="lib" path="lib/graph/itext-1.2.jar"/>

Modified: trunk/polepos/build.xml
===================================================================
--- trunk/polepos/build.xml	2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/build.xml	2012-07-15 12:08:23 UTC (rev 236)
@@ -1,6 +1,8 @@
 <project name="poleposition" default="race" basedir=".">
 
-    <property name="polepositionversion" value="0.50"/>
+    <property name="polepositionversion" value="0.60"/>
+	
+    <property name="polepos.debug" value="false"/>
     <property name="polepos.concurrency" value="true"/>
 
     <property name="jdo" value="jdo"/>
@@ -9,6 +11,31 @@
 	<property name="jpa" value="jpa"/>
 	<property name="jvi" value="jvi"/>
 -->
+	
+    <path id="jdo_compilation_classpath">
+        <fileset dir="lib">
+            <include name="**/*.jar"/>
+        	<exclude name="**/vodjdo.jar" />
+        	<exclude name="**/asm-all-4.0.jar" />
+        </fileset>
+        <fileset dir="../polepos.monitoring/dist">
+            <include name="**/*.jar"/>
+        </fileset>
+        <pathelement location="bin"/>
+    </path>
+	
+    <path id="vod_jpa_compilation_classpath">
+        <fileset dir="lib">
+            <include name="**/*.jar"/>
+        	<exclude name="**/vodjdo.jar" />
+        	<exclude name="**/asm-3.3.jar" />
+        </fileset>
+        <fileset dir="../polepos.monitoring/dist">
+            <include name="**/*.jar"/>
+        </fileset>
+        <pathelement location="bin"/>
+    </path>
+
 		
     <path id="compilation_classpath">
         <fileset dir="lib">
@@ -25,6 +52,7 @@
         <fileset dir="lib">
             <include name="**/*.jar"/>
         	<exclude name="**/vodjdo.jar" />
+        	<exclude name="**/vodjpa.jar" />
         </fileset>
         <fileset dir="../polepos.monitoring/dist">
             <include name="**/*.jar"/>
@@ -32,11 +60,9 @@
         <pathelement location="bin"/>
     </path>
 
-
-
     <target name="jdoenhance" description="runs the JDO enhancer" if="jdo">
         <java classname="org.polepos.enhance.JdoEnhance">
-            <classpath refid="compilation_classpath"/>
+            <classpath refid="jdo_compilation_classpath"/>
         </java>
     </target>
 
@@ -48,7 +74,7 @@
 	
     <target name="vodjpaenhance" description="runs the VOD JPA enhancer" if="vodjpa">
         <java classname="org.polepos.enhance.VodJpaEnhance">
-            <classpath refid="compilation_classpath"/>
+            <classpath refid="vod_jpa_compilation_classpath"/>
         </java>
     </target>
 
@@ -61,12 +87,11 @@
 
     <target name="race" depends="clean,compile,jdoenhance, vodjpaenhance"
             description="runs with all circuits and all teams ">
-        <echo message="${polepos.debug}"/>
+        <echo message="polepos.debug is set to ${polepos.debug}"/>
     	<java classname="org.polepos.RunSeason" fork="true">
             <classpath refid="runtime_classpath">
             </classpath>
             <jvmarg value="-Xmx1400m"/>
-        	<jvmarg value="-javaagent:lib/vod/jpa-agent.jar"/>
             <sysproperty key="polepos.debug" value="${polepos.debug}"/>
             <sysproperty key="polepos.concurrency" value="${polepos.concurrency}"/>
 

Added: trunk/polepos/lib/vod/asm-all-4.0.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/vod/asm-all-4.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/polepos/lib/vod/asm-all-4.0_RC1.jar
===================================================================
(Binary files differ)

Added: trunk/polepos/lib/vod/commons-cli-1.1.jar
===================================================================
(Binary files differ)


Property changes on: trunk/polepos/lib/vod/commons-cli-1.1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/polepos/lib/vod/jpa-agent.jar
===================================================================
(Binary files differ)

Modified: trunk/polepos/lib/vod/vodjdo.jar
===================================================================
(Binary files differ)

Modified: trunk/polepos/lib/vod/vodjpa.jar
===================================================================
(Binary files differ)

Modified: trunk/polepos/settings/Jdbc.properties
===================================================================
--- trunk/polepos/settings/Jdbc.properties	2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/settings/Jdbc.properties	2012-07-15 12:08:23 UTC (rev 236)
@@ -10,10 +10,10 @@
 # jdbc=sqlite,javadb,hsqldb
 #
 # Client/Server
-# jdbc=mysql,postgresql
+jdbc=mysql,postgresql
 #
 # All
-jdbc=mysql,postgresql,sqlite,javadb,hsqldb
+# jdbc=mysql,postgresql,sqlite,javadb,hsqldb
 
 
 #
@@ -24,7 +24,7 @@
 #
 # Client/Server 
 # hibernate=mysql,postgresql
-hibernate=hsqldb,mysql
+hibernate=mysql
  
 
 

Modified: trunk/polepos/settings/Jdo.properties
===================================================================
--- trunk/polepos/settings/Jdo.properties	2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/settings/Jdo.properties	2012-07-15 12:08:23 UTC (rev 236)
@@ -13,6 +13,7 @@
 
 enhance=true
 enhancer=datanucleus
+# enhancer=vod
 
 #
 # datanucleus

Modified: trunk/polepos/src/org/polepos/RunSeason.java
===================================================================
--- trunk/polepos/src/org/polepos/RunSeason.java	2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/RunSeason.java	2012-07-15 12:08:23 UTC (rev 236)
@@ -94,16 +94,17 @@
 		return new Team[] {
 				VodJdoTeamFactory.newVodJdoTeam(),
 				VodJpaTeamFactory.newVodJpaTeam(),
+				
 //				new JdoTeam(),
 //				new JpaTeam(true),
-//				new Db4oTeam(),
 				
+// 				new Db4oTeam(),
 				new Db4oClientServerTeam(),
+				
 				new JdbcTeam(),
 				new HibernateTeam(),
+				new MongoDBTeam(),
 				
-//				new JpaTeam(),
-//				new MongoDBTeam(),
 //				new JviTeam(),
 		};
 	}

Modified: trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java
===================================================================
--- trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java	2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java	2012-07-15 12:08:23 UTC (rev 236)
@@ -20,27 +20,44 @@
 
 package org.polepos.enhance;
 
-import java.io.*;
+import java.net.*;
 
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.types.*;
+import com.versant.jpa.enhancer.main.*;
 
-import com.versant.jpa.enhancer.ant.*;
-
 public class VodJpaEnhance {
 	
 	public static void main(String[] args) {
-		Project project = new Project();
-		EnhancerTask enhancerTask = new EnhancerTask();
-		enhancerTask.setProject(project);
-		enhancerTask.setInheritsClasspath(true);
-		enhancerTask.setDestdir("bin");
-		FileSet fs = new FileSet();
-		fs.setProject(project);
-		fs.setDir(new File("bin"));
-		fs.createInclude().setName("**/*.class");
-		enhancerTask.addFileSet(fs);
-		enhancerTask.execute();
+		
+        args = new String[]{
+                "-b",
+                "bin",
+                "-d",
+                "bin",
+                "-l"
+        };
+        try {
+            EnhancerMain.main(args);
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
+        
+        // The following is the Ant task way. Specifying a persistence unit doesn't seem to work.
+		
+//		Project project = new Project();
+//		EnhancerTask enhancerTask = new EnhancerTask();
+//		enhancerTask.setProject(project);
+//		enhancerTask.setInheritsClasspath(true);
+//		// enhancerTask.setPersistenceUnit("vodjpa");
+//		File destdir = new File("bin");
+//		System.out.println(destdir.getAbsolutePath());
+//		enhancerTask.setDestdir(destdir);
+//		FileSet fs = new FileSet();
+//		fs.setProject(project);
+//		fs.setDir(destdir);
+//		fs.createInclude().setName("**/*.class");
+//		fs.createInclude().setName("**/*.xml");
+//		enhancerTask.addFileSet(fs);
+//		enhancerTask.execute();
 	}
 
 }

Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java	2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java	2012-07-15 12:08:23 UTC (rev 236)
@@ -200,14 +200,19 @@
 		((JdoTeam)team()).deleteAll(pm);
         pm.close();
         _persistenceManagerFactory.close();
+        _persistenceManagerFactory = null;
         
         properties.setProperty("datanucleus.autoCreateSchema", "false");
 
-        _persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, Thread.currentThread().getContextClassLoader());
         
+        
     }
 
     public PersistenceManager getPersistenceManager() {
+    	if(_persistenceManagerFactory == null){
+    		_persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, Thread.currentThread().getContextClassLoader());
+    	}
+    	
         PersistenceManager pm = _persistenceManagerFactory.getPersistenceManager();
         if(! "hsqldb".equals(_dbName)){
         	return pm;
@@ -240,5 +245,12 @@
         
         return _name;
     }
+    
+    public void tearDown(){
+    	if(_persistenceManagerFactory != null){
+    		_persistenceManagerFactory.close();
+    		_persistenceManagerFactory = null;
+    	}
+    }
 
 }

Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java	2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java	2012-07-15 12:08:23 UTC (rev 236)
@@ -155,6 +155,14 @@
 		    pm.close();
 		}
 	}
+	
+	@Override
+	protected void tearDown() {
+		for(int i = 0; i < mCars.length;i++){		
+		    JdoCar jdoCar = (JdoCar)mCars[i];
+		    jdoCar.tearDown();
+		}
+	}
 
 
 	public void deleteAll(PersistenceManager pm) {

Modified: trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java	2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java	2012-07-15 12:08:23 UTC (rev 236)
@@ -35,7 +35,7 @@
  */
 public class JpaCar extends Car {
 
-    private transient EntityManagerFactory mFactory;
+    protected transient EntityManagerFactory _emf;
 
     private final String              _dbName;
     private final String              _name;
@@ -60,15 +60,15 @@
     private void initialize() throws IOException {
 	    Properties props = new Properties();
 	    try {
-			mFactory = Persistence.createEntityManagerFactory(persistenceUnitName(),props);
+			_emf = Persistence.createEntityManagerFactory(persistenceUnitName(),props);
 		} catch (PersistenceException e) {
 			e.printStackTrace();
 		} 
     }
     
     protected void reinitialize() throws IOException{
-    	if(mFactory != null){
-    		mFactory.close();
+    	if(_emf != null){
+    		_emf.close();
     	}
     	initialize();
     }
@@ -84,7 +84,7 @@
      *
      */
     public EntityManager getEntityManager() {
-        return mFactory.createEntityManager();
+        return _emf.createEntityManager();
     }
 
     @Override

Modified: trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java	2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java	2012-07-15 12:08:23 UTC (rev 236)
@@ -42,6 +42,10 @@
 	
 	@Override
 	public void recreateDatabase() {
+		if(_emf != null){
+			_emf.close();
+			_emf = null;
+		}
 		ServerAdministration.removeDatabase(_connectUrl);
 		ServerAdministration.createDatabase(_connectUrl);
 		try {

Modified: trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java	2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java	2012-07-15 12:08:23 UTC (rev 236)
@@ -35,7 +35,7 @@
 
     @Override
     public String name() {
-        return "1.8.2";
+        return "2.0.6";
     }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.