You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(21) |
Jun
(6) |
Jul
|
Aug
|
Sep
(1) |
Oct
(13) |
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(4) |
Feb
(8) |
Mar
|
Apr
(3) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(5) |
Dec
|
| 2009 |
Jan
|
Feb
(4) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
(5) |
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(5) |
Jun
(33) |
Jul
(1) |
Aug
|
Sep
|
Oct
(4) |
Nov
(12) |
Dec
(16) |
| 2011 |
Jan
(2) |
Feb
(18) |
Mar
(14) |
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
(5) |
Nov
|
Dec
(1) |
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <car...@us...> - 2012-07-15 12:08:30
|
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.
|
|
From: <car...@us...> - 2012-01-25 16:43:08
|
Revision: 235
http://polepos.svn.sourceforge.net/polepos/?rev=235&view=rev
Author: carlrosenberger
Date: 2012-01-25 16:42:57 +0000 (Wed, 25 Jan 2012)
Log Message:
-----------
cr + pr: removing code rendering for now. Now the order of the configuration is kept for rendering.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/reporters/Graph.java
trunk/polepos/src/org/polepos/reporters/PDFReporterBase.java
trunk/polepos/src/org/polepos/reporters/RenderingReporter.java
Modified: trunk/polepos/src/org/polepos/reporters/Graph.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/Graph.java 2012-01-06 17:39:47 UTC (rev 234)
+++ trunk/polepos/src/org/polepos/reporters/Graph.java 2012-01-25 16:42:57 UTC (rev 235)
@@ -37,7 +37,7 @@
private final List<TeamCar>teamCars= new ArrayList<TeamCar>();
private final List<TurnSetup> setups=new ArrayList<TurnSetup>();
- private final Map<TurnCombination,Result> results=new HashMap<TurnCombination,Result>();
+ private final Map<TurnCombination,Result> results=new LinkedHashMap<TurnCombination,Result>();
private final Circuit circuit;
private final Lap lap;
Modified: trunk/polepos/src/org/polepos/reporters/PDFReporterBase.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/PDFReporterBase.java 2012-01-06 17:39:47 UTC (rev 234)
+++ trunk/polepos/src/org/polepos/reporters/PDFReporterBase.java 2012-01-25 16:42:57 UTC (rev 235)
@@ -206,7 +206,8 @@
para.add(new Chunk(lap.name()+ "\n",bigFont));
_pdfData.add(para);
- renderCode(lap);
+ // Don't render code for now, it's not included for all the laps.
+ // renderCode(lap);
}
private void renderCode(Lap lap) {
Modified: trunk/polepos/src/org/polepos/reporters/RenderingReporter.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/RenderingReporter.java 2012-01-06 17:39:47 UTC (rev 234)
+++ trunk/polepos/src/org/polepos/reporters/RenderingReporter.java 2012-01-25 16:42:57 UTC (rev 235)
@@ -173,30 +173,27 @@
return dataset;
}
-
-
protected static String legend(TurnSetup setup) {
String legend = "";
boolean first = true;
int count = 0;
for (SetupProperty sp : setup.properties()) {
+ String name = sp.name();
+ if (name.equals("commitinterval")) {
+ continue;
+ }
if (!first) {
legend += ", ";
}
- String name = sp.name();
- if (!name.equals("commitinterval")) {
- legend += name + "=" + sp.value();
- first = false;
- }
+ legend += name + "=" + sp.value();
+ first = false;
count++;
if(count >= MAX_PROPERTIES_TO_DISPLAY){
return legend;
}
}
-
return legend;
}
-
double logarithmicMagnitudeGraphValue(double average, double time, boolean bestOnTop){
if(average == time){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2012-01-06 17:39:53
|
Revision: 234
http://polepos.svn.sourceforge.net/polepos/?rev=234&view=rev
Author: carlrosenberger
Date: 2012-01-06 17:39:47 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
cr + acv: Keeping the order of the laps as they were executed.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/reporters/GraphReporter.java
Modified: trunk/polepos/src/org/polepos/reporters/GraphReporter.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/GraphReporter.java 2011-12-12 12:45:40 UTC (rev 233)
+++ trunk/polepos/src/org/polepos/reporters/GraphReporter.java 2012-01-06 17:39:47 UTC (rev 234)
@@ -26,7 +26,7 @@
import java.util.Map;
public abstract class GraphReporter extends ReporterBase {
-
+
protected Map<CircuitLap,Graph> mGraphs= new LinkedHashMap<CircuitLap,Graph>();
private java.util.List<Circuit> mCircuits= new ArrayList <Circuit>();
public static int timeIndex = 0;
@@ -90,8 +90,8 @@
@Override
public void endSeason() {
if(mGraphs != null){
- for (Graph graph : mGraphs.values()) {
- report(graph);
+ for (CircuitLap circuitLap : mGraphs.keySet()) {
+ report(mGraphs.get(circuitLap));
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-12-12 12:45:53
|
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.
|
|
From: <car...@us...> - 2011-10-19 15:18:55
|
Revision: 228
http://polepos.svn.sourceforge.net/polepos/?rev=228&view=rev
Author: carlrosenberger
Date: 2011-10-19 15:18:44 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
cr: Optimized JPA queries not to be recreated each time the parameter changes.
Using rollback() instead of commit() now for all query and read operations.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/teams/jpa/ComplexJpa.java
trunk/polepos/src/org/polepos/teams/jpa/FlatObjectJpa.java
trunk/polepos/src/org/polepos/teams/jpa/InheritanceHierarchyJpa.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/jpa/NativeIdsJpa.java
trunk/polepos/src/org/polepos/teams/jpa/NestedListsJpa.java
Added Paths:
-----------
trunk/polepos/src/org/polepos/teams/jpa/JpaCarFactory.java
Modified: trunk/polepos/src/org/polepos/teams/jpa/ComplexJpa.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/ComplexJpa.java 2011-10-18 15:39:05 UTC (rev 227)
+++ trunk/polepos/src/org/polepos/teams/jpa/ComplexJpa.java 2011-10-19 15:18:44 UTC (rev 228)
@@ -59,7 +59,7 @@
begin();
ComplexHolder0 holder = read(_rootId);
addToCheckSum(holder);
- commit();
+ rollback();
}
public ComplexHolder0 read(Object id) {
@@ -73,11 +73,11 @@
int firstInt = objects() * objects() + objects();
int lastInt = firstInt + (objects() * objects() * objects()) - 1;
int currentInt = firstInt;
+ String filter = "this.i2 = :param";
+ Query query = db().createQuery(
+ "SELECT this FROM " + ComplexHolder2.class.getSimpleName()
+ + " this WHERE " + filter);
for (int run = 0; run < selectCount; run++) {
- String filter = "this.i2 = :param";
- Query query = db().createQuery(
- "SELECT this FROM " + ComplexHolder2.class.getSimpleName()
- + " this WHERE " + filter);
query.setParameter("param", currentInt);
Collection result = (Collection) query.getResultList();
Iterator it = result.iterator();
@@ -102,7 +102,7 @@
currentInt = firstInt;
}
}
- commit();
+ rollback();
}
@Override
Modified: trunk/polepos/src/org/polepos/teams/jpa/FlatObjectJpa.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/FlatObjectJpa.java 2011-10-18 15:39:05 UTC (rev 227)
+++ trunk/polepos/src/org/polepos/teams/jpa/FlatObjectJpa.java 2011-10-19 15:18:44 UTC (rev 228)
@@ -51,36 +51,36 @@
begin();
initializeTestId(setup().getSelectCount());
String filter = "this._string = :param";
+ Query query = db().createQuery(
+ "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
+ + " this WHERE " + filter);
while (hasMoreTestIds()) {
- Query query = db().createQuery(
- "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
- + " this WHERE " + filter);
doQuery(query, IndexedObject.queryString(nextTestId()));
}
- commit();
+ rollback();
}
public void queryIndexedInt() {
begin();
initializeTestId(setup().getSelectCount());
String filter = "this._int = :param";
+ Query query = db().createQuery(
+ "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
+ + " this WHERE " + filter);
while (hasMoreTestIds()) {
- Query query = db().createQuery(
- "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
- + " this WHERE " + filter);
doQuery(query, nextTestId());
}
- commit();
+ rollback();
}
public void update() {
begin();
String filter = "this._int = :param";
initializeTestId(setup().getUpdateCount());
+ Query query = db().createQuery(
+ "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
+ + " this WHERE " + filter);
while (hasMoreTestIds()) {
- Query query = db().createQuery(
- "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
- + " this WHERE " + filter);
query.setParameter("param", nextTestId());
Collection result = (Collection) query.getResultList();
JpaIndexedObject indexedObject = (JpaIndexedObject) result
@@ -95,10 +95,10 @@
begin();
String filter = "this._int = :param";
initializeTestId(setup().getUpdateCount());
+ Query query = db().createQuery(
+ "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
+ + " this WHERE " + filter);
while (hasMoreTestIds()) {
- Query query = db().createQuery(
- "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
- + " this WHERE " + filter);
query.setParameter("param", nextTestId());
Collection result = (Collection) query.getResultList();
JpaIndexedObject indexedObject = (JpaIndexedObject) result
Modified: trunk/polepos/src/org/polepos/teams/jpa/InheritanceHierarchyJpa.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/InheritanceHierarchyJpa.java 2011-10-18 15:39:05 UTC (rev 227)
+++ trunk/polepos/src/org/polepos/teams/jpa/InheritanceHierarchyJpa.java 2011-10-19 15:18:44 UTC (rev 228)
@@ -45,23 +45,23 @@
@Override
public void read(){
- begin();
+ begin();
readExtent(InheritanceHierarchy4.class);
- commit();
+ rollback();
}
@Override
public void query(){
- begin();
+ begin();
int count = setup().getSelectCount();
String filter = "this.i2 = :param";
+ Query query = db().createQuery(
+ "SELECT this FROM " + InheritanceHierarchy4.class.getSimpleName()
+ + " this WHERE " + filter);
for (int i = 1; i <= count; i++) {
- Query query = db().createQuery(
- "SELECT this FROM " + InheritanceHierarchy4.class.getSimpleName()
- + " this WHERE " + filter);
doQuery(query, i);
}
- commit();
+ rollback();
}
@Override
Modified: trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java 2011-10-18 15:39:05 UTC (rev 227)
+++ trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java 2011-10-19 15:18:44 UTC (rev 228)
@@ -65,6 +65,13 @@
e.printStackTrace();
}
}
+
+ protected void reinitialize() throws IOException{
+ if(mFactory != null){
+ mFactory.close();
+ }
+ initialize();
+ }
private String persistenceUnitName() {
if(_dbName == null){
@@ -82,13 +89,21 @@
@Override
public String name() {
-
if(isSQL()){
return Jpa.settings().getName(_name) + "/" +Jdbc.settings().getName(_dbName)+"-"+Jdbc.settings().getVersion(_dbName);
}
return Jpa.settings().getVendor(_name) + "/" + Jpa.settings().getName(_name)+"-"+Jpa.settings().getVersion(_name);
-
}
+
+ public boolean canRecreateDatabase(){
+ return false;
+ }
+
+ public void recreateDatabase(){
+ // do nothing, override in specific implementations
+ }
+
+
}
Added: trunk/polepos/src/org/polepos/teams/jpa/JpaCarFactory.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/JpaCarFactory.java (rev 0)
+++ trunk/polepos/src/org/polepos/teams/jpa/JpaCarFactory.java 2011-10-19 15:18:44 UTC (rev 228)
@@ -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.teams.jpa;
+
+import java.io.*;
+
+public interface JpaCarFactory {
+
+ JpaCar newInstance(JpaTeam team, String name, String dbName, String color) throws IOException ;
+
+}
Property changes on: trunk/polepos/src/org/polepos/teams/jpa/JpaCarFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/polepos/src/org/polepos/teams/jpa/JpaDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/JpaDriver.java 2011-10-18 15:39:05 UTC (rev 227)
+++ trunk/polepos/src/org/polepos/teams/jpa/JpaDriver.java 2011-10-19 15:18:44 UTC (rev 228)
@@ -65,6 +65,10 @@
db().getTransaction().commit();
}
+ public void rollback(){
+ db().getTransaction().rollback();
+ }
+
public void store(Object obj){
db().persist(obj);
}
Modified: trunk/polepos/src/org/polepos/teams/jpa/NativeIdsJpa.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/NativeIdsJpa.java 2011-10-18 15:39:05 UTC (rev 227)
+++ trunk/polepos/src/org/polepos/teams/jpa/NativeIdsJpa.java 2011-10-19 15:18:44 UTC (rev 228)
@@ -49,7 +49,7 @@
addToCheckSum(pilot.getPoints());
}
}
- commit();
+ rollback();
}
private void storePilot(int idx) {
Modified: trunk/polepos/src/org/polepos/teams/jpa/NestedListsJpa.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/NestedListsJpa.java 2011-10-18 15:39:05 UTC (rev 227)
+++ trunk/polepos/src/org/polepos/teams/jpa/NestedListsJpa.java 2011-10-19 15:18:44 UTC (rev 228)
@@ -22,12 +22,11 @@
import java.util.*;
-import javax.persistence.Query;
+import javax.persistence.*;
import org.polepos.circuits.nestedlists.*;
import org.polepos.framework.*;
-import org.polepos.teams.jpa.data.ListHolder;
-import org.polepos.teams.jpa.data.InheritanceHierarchy4;
+import org.polepos.teams.jpa.data.*;
/**
* @author Christian Ernst
@@ -50,7 +49,7 @@
addToCheckSum(listHolder);
}
});
- commit();
+ rollback();
}
private ListHolder root() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-10-18 15:39:12
|
Revision: 227
http://polepos.svn.sourceforge.net/polepos/?rev=227&view=rev
Author: carlrosenberger
Date: 2011-10-18 15:39:05 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
cr + pr: Using class.getSimpleName() in JPA queries.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/teams/jpa/ComplexJpa.java
trunk/polepos/src/org/polepos/teams/jpa/FlatObjectJpa.java
trunk/polepos/src/org/polepos/teams/jpa/InheritanceHierarchyJpa.java
trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java
trunk/polepos/src/org/polepos/teams/jpa/JpaTeam.java
trunk/polepos/src/org/polepos/teams/jpa/NestedListsJpa.java
trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedPilot.java
Modified: trunk/polepos/src/org/polepos/teams/jpa/ComplexJpa.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/ComplexJpa.java 2011-10-18 12:22:46 UTC (rev 226)
+++ trunk/polepos/src/org/polepos/teams/jpa/ComplexJpa.java 2011-10-18 15:39:05 UTC (rev 227)
@@ -76,7 +76,7 @@
for (int run = 0; run < selectCount; run++) {
String filter = "this.i2 = :param";
Query query = db().createQuery(
- "SELECT this FROM " + ComplexHolder2.class.getName()
+ "SELECT this FROM " + ComplexHolder2.class.getSimpleName()
+ " this WHERE " + filter);
query.setParameter("param", currentInt);
Collection result = (Collection) query.getResultList();
Modified: trunk/polepos/src/org/polepos/teams/jpa/FlatObjectJpa.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/FlatObjectJpa.java 2011-10-18 12:22:46 UTC (rev 226)
+++ trunk/polepos/src/org/polepos/teams/jpa/FlatObjectJpa.java 2011-10-18 15:39:05 UTC (rev 227)
@@ -53,7 +53,7 @@
String filter = "this._string = :param";
while (hasMoreTestIds()) {
Query query = db().createQuery(
- "SELECT this FROM " + JpaIndexedObject.class.getName()
+ "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
+ " this WHERE " + filter);
doQuery(query, IndexedObject.queryString(nextTestId()));
}
@@ -66,7 +66,7 @@
String filter = "this._int = :param";
while (hasMoreTestIds()) {
Query query = db().createQuery(
- "SELECT this FROM " + JpaIndexedObject.class.getName()
+ "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
+ " this WHERE " + filter);
doQuery(query, nextTestId());
}
@@ -79,7 +79,7 @@
initializeTestId(setup().getUpdateCount());
while (hasMoreTestIds()) {
Query query = db().createQuery(
- "SELECT this FROM " + JpaIndexedObject.class.getName()
+ "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
+ " this WHERE " + filter);
query.setParameter("param", nextTestId());
Collection result = (Collection) query.getResultList();
@@ -97,7 +97,7 @@
initializeTestId(setup().getUpdateCount());
while (hasMoreTestIds()) {
Query query = db().createQuery(
- "SELECT this FROM " + JpaIndexedObject.class.getName()
+ "SELECT this FROM " + JpaIndexedObject.class.getSimpleName()
+ " this WHERE " + filter);
query.setParameter("param", nextTestId());
Collection result = (Collection) query.getResultList();
Modified: trunk/polepos/src/org/polepos/teams/jpa/InheritanceHierarchyJpa.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/InheritanceHierarchyJpa.java 2011-10-18 12:22:46 UTC (rev 226)
+++ trunk/polepos/src/org/polepos/teams/jpa/InheritanceHierarchyJpa.java 2011-10-18 15:39:05 UTC (rev 227)
@@ -57,7 +57,7 @@
String filter = "this.i2 = :param";
for (int i = 1; i <= count; i++) {
Query query = db().createQuery(
- "SELECT this FROM " + InheritanceHierarchy4.class.getName()
+ "SELECT this FROM " + InheritanceHierarchy4.class.getSimpleName()
+ " this WHERE " + filter);
doQuery(query, i);
}
@@ -68,7 +68,7 @@
public void delete(){
begin();
Query query = db().createQuery(
- "SELECT this FROM " + InheritanceHierarchy4.class.getName()
+ "SELECT this FROM " + InheritanceHierarchy4.class.getSimpleName()
+ " this");
Iterator it = query.getResultList().iterator();
while(it.hasNext()){
Modified: trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java 2011-10-18 12:22:46 UTC (rev 226)
+++ trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java 2011-10-18 15:39:05 UTC (rev 227)
@@ -35,7 +35,7 @@
*/
public class JpaCar extends Car {
- private EntityManagerFactory mFactory;
+ private transient EntityManagerFactory mFactory;
private final String _dbName;
private final String _name;
@@ -58,17 +58,21 @@
}
private void initialize() throws IOException {
-
- Properties props = new Properties();
-
- try {
- mFactory = Persistence.createEntityManagerFactory(_name+"/"+_dbName,props);
- } catch (PersistenceException e) {
- e.printStackTrace();
- }
-
+ Properties props = new Properties();
+ try {
+ mFactory = Persistence.createEntityManagerFactory(persistenceUnitName(),props);
+ } catch (PersistenceException e) {
+ e.printStackTrace();
+ }
}
+ private String persistenceUnitName() {
+ if(_dbName == null){
+ return _name;
+ }
+ return _name+"/"+_dbName;
+ }
+
/**
*
*/
Modified: trunk/polepos/src/org/polepos/teams/jpa/JpaTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/JpaTeam.java 2011-10-18 12:22:46 UTC (rev 226)
+++ trunk/polepos/src/org/polepos/teams/jpa/JpaTeam.java 2011-10-18 15:39:05 UTC (rev 227)
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.EntityManager;
+import javax.persistence.*;
import org.polepos.circuits.arraylists.ListHolder;
import org.polepos.framework.Car;
@@ -129,55 +129,38 @@
public void setUp() {
for(int i = 0; i < mCars.length;i++){
-
EntityManager em = ((JpaCar)mCars[i]).getEntityManager();
-
- em.getTransaction().begin();
- em.createQuery("delete from "+ ComplexHolder0.class.getSimpleName() + " this ").executeUpdate();
- em.getTransaction().commit();
-
- em.getTransaction().begin();
- em.createQuery("delete from "+ InheritanceHierarchy0.class.getSimpleName() + " this ").executeUpdate();
- em.getTransaction().commit();
-
- em.getTransaction().begin();
- em.createQuery("delete from "+ JpaIndexedObject.class.getSimpleName() + " this ").executeUpdate();
- em.getTransaction().commit();
-
- em.getTransaction().begin();
- em.createQuery("delete from "+ ListHolder.class.getSimpleName() + " this ").executeUpdate();
- em.getTransaction().commit();
-
- em.getTransaction().begin();
- em.createQuery("delete from "+ JPB0.class.getSimpleName() + " this ").executeUpdate();
- em.getTransaction().commit();
-
- em.getTransaction().begin();
- em.createQuery("delete from "+ JpaIndexedPilot.class.getSimpleName() + " this ").executeUpdate();
- em.getTransaction().commit();
-
- em.getTransaction().begin();
- em.createQuery("delete from "+ JpaPilot.class.getSimpleName() + " this ").executeUpdate();
- em.getTransaction().commit();
-
- em.getTransaction().begin();
- em.createQuery("delete from "+ JpaTree.class.getSimpleName() + " this ").executeUpdate();
- em.getTransaction().commit();
-
- em.getTransaction().begin();
- em.createQuery("delete from "+ JpaLightObject.class.getSimpleName() + " this ").executeUpdate();
- em.getTransaction().commit();
-
- em.getTransaction().begin();
- em.createQuery("delete from "+ JpaListHolder.class.getSimpleName() + " this ").executeUpdate();
- em.getTransaction().commit();
-
- em.getTransaction().begin();
- em.createQuery("delete from "+ JPN1.class.getSimpleName() + " this ").executeUpdate();
- em.getTransaction().commit();
-
+ 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();
+ Query query = em.createQuery("select o from "+ clazz.getSimpleName() + " o");
+ List resultList = query.getResultList();
+ for (Object object : resultList) {
+ em.remove(object);
+ }
+ em.getTransaction().commit();
+ // delete queries don't work in VOD JPA yet. Use the following when they are implemented:
+
+// em.getTransaction().begin();
+// em.createQuery("delete from "+ clazz.getSimpleName() + " this ").executeUpdate();
+// em.getTransaction().commit();
+
+ }
+
}
Modified: trunk/polepos/src/org/polepos/teams/jpa/NestedListsJpa.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/NestedListsJpa.java 2011-10-18 12:22:46 UTC (rev 226)
+++ trunk/polepos/src/org/polepos/teams/jpa/NestedListsJpa.java 2011-10-18 15:39:05 UTC (rev 227)
@@ -57,7 +57,7 @@
String filter = " this._name = '" + ListHolder.ROOT_NAME + "'";
Query query = db().createQuery(
- "SELECT this FROM " + ListHolder.class.getName()
+ "SELECT this FROM " + ListHolder.class.getSimpleName()
+ " this WHERE " + filter);
Collection<ListHolder> result = (Collection<ListHolder>)query.getResultList();
if(result.size() != 1){
Modified: trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedPilot.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedPilot.java 2011-10-18 12:22:46 UTC (rev 226)
+++ trunk/polepos/src/org/polepos/teams/jpa/data/JpaIndexedPilot.java 2011-10-18 15:39:05 UTC (rev 227)
@@ -19,14 +19,12 @@
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.framework.CheckSummable;
+import org.apache.openjpa.persistence.jdbc.*;
+import org.polepos.framework.*;
+
/**
* @author Christian Ernst
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-10-18 12:22:52
|
Revision: 226
http://polepos.svn.sourceforge.net/polepos/?rev=226&view=rev
Author: carlrosenberger
Date: 2011-10-18 12:22:46 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
cr: Adjusted index.html
Modified Paths:
--------------
trunk/polepos/doc/index.html
Modified: trunk/polepos/doc/index.html
===================================================================
--- trunk/polepos/doc/index.html 2011-10-18 12:21:51 UTC (rev 225)
+++ trunk/polepos/doc/index.html 2011-10-18 12:22:46 UTC (rev 226)
@@ -115,7 +115,7 @@
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,
+ The use of O-R mapping technology like Hibernate,
Datanucleus or OpenJPA has a
negative impact on performance. O-R mapping advocates may tell you that
caching will bring you back performance. Do not
@@ -133,6 +133,9 @@
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>
+ <li>NoSQL technologies outperform ORM mappers.</li>
+ <li>Within NoSQL MongoDb does great until you start to introduce concurrency at which point it
+ begins to fall in performance compared to other solutions.</li>
</ul>
<hr>
<a name="download"></a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-10-18 12:21:57
|
Revision: 225
http://polepos.svn.sourceforge.net/polepos/?rev=225&view=rev
Author: carlrosenberger
Date: 2011-10-18 12:21:51 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
cr: Datanucleus is no longer run since it hangs.
Modified Paths:
--------------
trunk/polepos/settings/Jdo.properties
Modified: trunk/polepos/settings/Jdo.properties
===================================================================
--- trunk/polepos/settings/Jdo.properties 2011-10-18 12:21:03 UTC (rev 224)
+++ trunk/polepos/settings/Jdo.properties 2011-10-18 12:21:51 UTC (rev 225)
@@ -6,9 +6,11 @@
# jdo=datanucleus
#
# All
-jdo=vod8,datanucleus
+# jdo=vod8,datanucleus
+jdo=vod8
+
enhance=true
enhancer=datanucleus
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-10-18 12:21:13
|
Revision: 224
http://polepos.svn.sourceforge.net/polepos/?rev=224&view=rev
Author: carlrosenberger
Date: 2011-10-18 12:21:03 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
cr: short description for MongoDB, delete all batched for JDO
Modified Paths:
--------------
trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java 2011-10-12 16:04:33 UTC (rev 223)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java 2011-10-18 12:21:03 UTC (rev 224)
@@ -188,7 +188,7 @@
//checkExtentSize(pm, clazz,"");
// 1. try Query.deletePersistentAll()
- deletePersistentAll(pm,clazz);
+ // deletePersistentAll(pm,clazz);
//2. try PersistenceManager.delete(Extent.iterator().next()) with batches
deleteAllBatched(pm, clazz);
Modified: trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java 2011-10-12 16:04:33 UTC (rev 223)
+++ trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java 2011-10-18 12:21:03 UTC (rev 224)
@@ -35,7 +35,7 @@
@Override
public String name() {
- return "1.8.2 with Java driver 2.6.3";
+ return "1.8.2";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-07-19 12:00:23
|
Revision: 212
http://polepos.svn.sourceforge.net/polepos/?rev=212&view=rev
Author: carlrosenberger
Date: 2011-07-19 12:00:17 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
cr: Fixed how far bars and legend extend to the right.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java
Modified: trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java 2011-07-19 11:28:51 UTC (rev 211)
+++ trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java 2011-07-19 12:00:17 UTC (rev 212)
@@ -63,7 +63,7 @@
@Override
double maxBarWidthWithLegend() {
- return maxBarWidth(); // - textWidth(" iterations") -1;
+ return maxBarWidth() - textWidth("" + graph.best) -1;
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-07-19 11:29:02
|
Revision: 211
http://polepos.svn.sourceforge.net/polepos/?rev=211&view=rev
Author: carlrosenberger
Date: 2011-07-19 11:28:51 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
cr: Fixed numbers to be on the right.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java
Modified: trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java 2011-07-18 16:51:14 UTC (rev 210)
+++ trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java 2011-07-19 11:28:51 UTC (rev 211)
@@ -37,8 +37,7 @@
@Override
protected String legendOnRightOfBar(TeamData teamData) {
- return "";
- // return " iterations";
+ return "" + teamData.val ;
}
@Override
@@ -59,7 +58,7 @@
@Override
protected String legendInsideBar(TeamData teamData) {
- return "" + teamData.val ;
+ return "";
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-07-18 16:51:21
|
Revision: 210
http://polepos.svn.sourceforge.net/polepos/?rev=210&view=rev
Author: carlrosenberger
Date: 2011-07-18 16:51:14 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
cr + frm: Support for linear graphs. New variable LOGARITHMIC in Settings to get back old behaviour.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/Settings.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
Added Paths:
-----------
trunk/polepos/src/org/polepos/reporters/FixedTimeCustomBarRendererBase.java
trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java
trunk/polepos/src/org/polepos/reporters/LinearTimedLapsCustomBarRenderer.java
trunk/polepos/src/org/polepos/reporters/LogarithmicFixedTimeCustomBarRenderer.java
trunk/polepos/src/org/polepos/reporters/LogarithmicTimedLapsCustomBarRenderer.java
trunk/polepos/src/org/polepos/reporters/TimedLapsCustomBarRendererBase.java
Removed Paths:
-------------
trunk/polepos/src/org/polepos/reporters/FixedTimeCustomBarRenderer.java
trunk/polepos/src/org/polepos/reporters/TimedLapsCustomBarRenderer.java
Modified: trunk/polepos/src/org/polepos/Settings.java
===================================================================
--- trunk/polepos/src/org/polepos/Settings.java 2011-07-15 16:00:32 UTC (rev 209)
+++ trunk/polepos/src/org/polepos/Settings.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -24,8 +24,10 @@
private static boolean DEBUG = false;
- private static boolean CONCURRENCY = false;
+ private static boolean CONCURRENCY = true;
+ public static boolean LOGARITHMIC = false;
+
public static final String CIRCUIT = isDebug() ? "settings/DebugCircuits.properties" : "settings/Circuits.properties" ;
public static final String JDBC = "settings/Jdbc.properties";
Modified: trunk/polepos/src/org/polepos/reporters/CustomBarPDFReporter.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/CustomBarPDFReporter.java 2011-07-15 16:00:32 UTC (rev 209)
+++ trunk/polepos/src/org/polepos/reporters/CustomBarPDFReporter.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -22,6 +22,8 @@
import java.awt.*;
+import org.polepos.*;
+
import com.db4o.*;
import com.db4o.config.*;
import com.db4o.ta.*;
@@ -42,7 +44,7 @@
cfg.common().add(new TransparentPersistenceSupport());
// EmbeddedObjectContainer db = Db4oEmbedded.openFile(cfg, "ClientServerGraph.db4o");
- EmbeddedObjectContainer db = Db4oEmbedded.openFile(cfg, "EmbeddedGraph.db4o");
+ EmbeddedObjectContainer db = Db4oEmbedded.openFile(cfg, "graph.db4o");
// EmbeddedObjectContainer db = Db4oEmbedded.openFile(cfg, "ConcurrentGraph.db4o");
PersistentGraphs pg = db.query(PersistentGraphs.class).iterator().next();
@@ -74,18 +76,30 @@
PdfTemplate tp = cb.createTemplate(chartWidth(), chartHeight());
Graphics2D graphics = tp.createGraphics(chartWidth(), chartHeight(), new DefaultFontMapper());
- int height = new TimedLapsCustomBarRenderer(graph).render(graphics);
+ int height = newRenderer(graph).render(graphics);
tp = cb.createTemplate(chartWidth(), height);
graphics = tp.createGraphics(chartWidth(), height, new DefaultFontMapper());
- (graph.circuit().isFixedTime() ? new FixedTimeCustomBarRenderer(graph) : new TimedLapsCustomBarRenderer(graph)).render(graphics);
+ newRenderer(graph).render(graphics);
graphics.dispose();
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-07-15 16:00:32 UTC (rev 209)
+++ trunk/polepos/src/org/polepos/reporters/CustomBarRendererBase.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -42,12 +42,16 @@
}
protected static class TurnData {
+
public TurnData(TurnSetup turn, long best) {
this.turn = turn;
this.best = best;
}
+
TurnSetup turn;
+
long best;
+
public List<TeamData> teams = new ArrayList<TeamData>();
}
@@ -91,20 +95,32 @@
EmbeddedObjectContainer db = Db4oEmbedded.openFile("graph.db4o");
- Graph graph = db.query(Graph.class).iterator().next();
+ int circuitNo = 5;
+ ObjectSet<Graph> result = db.query(Graph.class);
+ // 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 TimedLapsCustomBarRenderer(graph));
- JFrame w = new JFrame("Polepos preview") {
+ // final CustomBarRendererBase renderer = (graph.circuit().isFixedTime() ? new FixedTimeCustomBarRenderer(graph) : new LogarithmicTimedLapsCustomBarRenderer(graph));
+ final CustomBarRendererBase renderer = (graph.circuit().isFixedTime() ? new LinearFixedTimeCustomBarRenderer(graph) : new LinearTimedLapsCustomBarRenderer(graph));
+
+ JFrame w = new JFrame("Polepos preview");
+ JPanel contentPane = new JPanel()
+ {
private static final long serialVersionUID = 1L;
@Override
public void paint(Graphics g) {
super.paint(g);
renderer.render(g);
}
+
};
+ w.setContentPane(contentPane);
+ contentPane.setBackground(Color.WHITE);
w.setSize(522, 600);
w.setVisible(true);
@@ -119,12 +135,16 @@
return graphData().maxTeamNameWidth+1;
}
- double maxBarWidth() {
- return graphics.getClipBounds().getWidth() - barX() - textWidth("10000x")/2;
+ double maxBarWidthWithLegend() {
+ return maxBarWidth()- textWidth("10000x")/2;
}
+
+ double maxBarWidth(){
+ return graphics.getClipBounds().getWidth() - barX();
+ }
protected double widthPerOrderOfMagnitude() {
- return maxBarWidth() / graphData().maxMagnitude;
+ return maxBarWidthWithLegend() / graphData().maxMagnitude;
}
public int render(Graphics graphics) {
@@ -153,7 +173,10 @@
graphics.setColor(Color.BLACK);
graphics.drawLine(axisX, 0, axisX, y);
graphics.drawLine(axisX, y, (int) graphics.getClipBounds().getWidth(), y);
-
+ return renderXLegend(graphics, y, axisX);
+ }
+
+ protected int renderXLegend(Graphics graphics, int y, int axisX) {
for(int i=0;i<=graphData().maxMagnitude;i++) {
int x = (int) (i * widthPerOrderOfMagnitude()) + axisX;
@@ -175,10 +198,7 @@
graphics.drawString(legend, (int)(x-textWidth(legend)/2.), (int)(y+graphData().markerHeight+textHeight(legend)));
}
- y += stride()*2;
-
- return y;
-
+ return (int) (y + stride()*2);
}
protected abstract boolean doDrawXAxisMarker(int i);
@@ -212,15 +232,13 @@
graphics.fillRect((int)barX(), (int) y, barWidth, (int) graphData().barHeight);
- String magnitude = magnitudeBarLegend(teamData);
-
graphics.setColor(Color.BLACK);
- graphics.drawString(magnitude, (int)(barX()+barWidth+graphData().paddingX), textY);
+ graphics.drawString(legendOnRightOfBar(teamData), (int)(barX()+barWidth+graphData().paddingX), textY);
if (teamData.val > 0) {
- String absolute = teamData.val+ taskLegend();
+ String legendInsideBar = legendInsideBar(teamData);
graphics.setColor(Color.WHITE);
- graphics.drawString(absolute, (int)(barX()+barWidth-textWidth(absolute)-graphData().paddingX), textY);
+ graphics.drawString(legendInsideBar, (int)(barX()+barWidth-textWidth(legendInsideBar)-graphData().paddingX), textY);
}
y += stride();
@@ -229,17 +247,17 @@
}
- protected abstract String magnitudeBarLegend(TeamData teamData);
+ protected abstract String legendInsideBar(TeamData teamData);
- protected abstract String taskLegend();
+ protected abstract String legendOnRightOfBar(TeamData teamData);
protected abstract int barWidth(TeamData teamData);
- private double textWidth(String string) {
+ protected double textWidth(String string) {
return textBounds(graphics, string, graphics.getFont()).getWidth();
}
- private double textHeight(String string) {
+ protected double textHeight(String string) {
return textBounds(graphics, string, graphics.getFont()).getHeight();
}
Deleted: trunk/polepos/src/org/polepos/reporters/FixedTimeCustomBarRenderer.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/FixedTimeCustomBarRenderer.java 2011-07-15 16:00:32 UTC (rev 209)
+++ trunk/polepos/src/org/polepos/reporters/FixedTimeCustomBarRenderer.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -1,119 +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.reporters;
-
-import java.util.*;
-
-import org.polepos.framework.*;
-import org.polepos.reporters.CustomBarRendererBase.*;
-
-public class FixedTimeCustomBarRenderer extends CustomBarRendererBase {
-
- private static final int BEST_MAGNITUDE = 5;
-
- public FixedTimeCustomBarRenderer(Graph graph) {
- super(graph);
- }
-
- @Override
- protected List<TurnData> prepareTurnsData(final Graph graph) {
- List<TurnData> runs = new ArrayList<TurnData>();
-
- final List<TurnSetup> setups = graph.setups();
- List<TeamCar> teamCars = graph.teamCars();
-
- for (final TurnSetup setup : setups) {
-
- TurnData turnData = new TurnData(setup, 0);
- long best = 0;
- for (TeamCar teamCar : teamCars) {
- long iterations = graph.iterationsFor(teamCar, setup);
- TeamData teamData = new TeamData(teamCar, 0, iterations);
- if (iterations != 0 && iterations > best) {
- best = iterations;
- }
- turnData.teams.add(teamData);
- }
- turnData.best = best;
-
- for (TeamData teamData : turnData.teams) {
- teamData.orderOfMagnitude = (double)turnData.best / (teamData.val == 0 ? 1 : teamData.val) ;
- }
-
- Collections.sort(turnData.teams, new Comparator<TeamData>() {
-
- @Override
- public int compare(TeamData team1, TeamData team2) {
- long iterations1 = graph.iterationsFor(team1.teamCar, setup);
- long iterations2 = graph.iterationsFor(team2.teamCar, setup);
-
- if (iterations1 < iterations2) {
- return 1;
- }
- if (iterations1 > iterations2) {
- return -1;
- }
- return 0;
- }
- });
-
- runs.add(turnData);
- }
- return runs;
- }
-
- @Override
- protected int barWidth(TeamData teamData) {
- return (int)((BEST_MAGNITUDE - barUnits(teamData.orderOfMagnitude)) * widthPerOrderOfMagnitude());
- }
-
- @Override
- protected String taskLegend() {
- return " iterations";
- }
-
- @Override
- protected String magnitudeBarLegend(TeamData teamData) {
-
- double orderOfMagnitude = teamData.orderOfMagnitude;
- if(orderOfMagnitude == 1){
- return "";
- }
- return String.format("1/%.1fx", orderOfMagnitude);
- }
-
- @Override
- protected String magnitudeAxisLegend(int i) {
- if(i == BEST_MAGNITUDE - 1){
- return "best";
- }
- if(i > BEST_MAGNITUDE - 1){
- return "";
- }
- return String.format("1/%.0fx", Math.pow(10, BEST_MAGNITUDE - 1 - i));
- }
-
- @Override
- protected boolean doDrawXAxisMarker(int i) {
- return i < BEST_MAGNITUDE;
- }
-
-}
Added: trunk/polepos/src/org/polepos/reporters/FixedTimeCustomBarRendererBase.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/FixedTimeCustomBarRendererBase.java (rev 0)
+++ trunk/polepos/src/org/polepos/reporters/FixedTimeCustomBarRendererBase.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -0,0 +1,86 @@
+/*
+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.framework.*;
+
+public abstract class FixedTimeCustomBarRendererBase extends CustomBarRendererBase {
+
+ public FixedTimeCustomBarRendererBase(Graph graph) {
+ super(graph);
+ }
+
+ @Override
+ protected List<TurnData> prepareTurnsData(final Graph graph) {
+
+ graph.best = 0;
+
+ List<TurnData> runs = new ArrayList<TurnData>();
+
+ final List<TurnSetup> setups = graph.setups();
+ List<TeamCar> teamCars = graph.teamCars();
+
+ for (final TurnSetup setup : setups) {
+
+ TurnData turnData = new TurnData(setup, 0);
+ long best = 0;
+ for (TeamCar teamCar : teamCars) {
+ long iterations = graph.iterationsFor(teamCar, setup);
+ TeamData teamData = new TeamData(teamCar, 0, iterations);
+ if (iterations != 0 && iterations > best) {
+ best = iterations;
+ }
+ if(iterations != 0 && iterations > graph.best){
+ graph.best = iterations;
+ }
+ turnData.teams.add(teamData);
+ }
+ turnData.best = best;
+
+ for (TeamData teamData : turnData.teams) {
+ teamData.orderOfMagnitude = (double)turnData.best / (teamData.val == 0 ? 1 : teamData.val) ;
+ }
+
+ Collections.sort(turnData.teams, new Comparator<TeamData>() {
+
+ @Override
+ public int compare(TeamData team1, TeamData team2) {
+ long iterations1 = graph.iterationsFor(team1.teamCar, setup);
+ long iterations2 = graph.iterationsFor(team2.teamCar, setup);
+
+ if (iterations1 < iterations2) {
+ return 1;
+ }
+ if (iterations1 > iterations2) {
+ return -1;
+ }
+ return 0;
+ }
+ });
+
+ runs.add(turnData);
+ }
+ return runs;
+ }
+
+
+}
\ No newline at end of file
Property changes on: trunk/polepos/src/org/polepos/reporters/FixedTimeCustomBarRendererBase.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/polepos/src/org/polepos/reporters/Graph.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/Graph.java 2011-07-15 16:00:32 UTC (rev 209)
+++ trunk/polepos/src/org/polepos/reporters/Graph.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -33,6 +33,9 @@
private final Circuit circuit;
private final Lap lap;
+ public long best;
+ public long worst;
+
public Graph(Result result){
teamCars= new ArrayList<TeamCar>();
setups=new ArrayList<TurnSetup>();
Added: trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java (rev 0)
+++ trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -0,0 +1,79 @@
+/*
+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.awt.*;
+
+public class LinearFixedTimeCustomBarRenderer extends FixedTimeCustomBarRendererBase {
+
+ private static final int BEST_MAGNITUDE = 5;
+
+ public LinearFixedTimeCustomBarRenderer(Graph graph) {
+ super(graph);
+ }
+
+ @Override
+ protected int barWidth(TeamData teamData) {
+ return (int) (((double)teamData.val / (double)graph.best) * (double)maxBarWidthWithLegend() );
+ }
+
+ @Override
+ protected String legendOnRightOfBar(TeamData teamData) {
+ return "";
+ // return " iterations";
+ }
+
+ @Override
+ protected String magnitudeAxisLegend(int i) {
+ if(i == BEST_MAGNITUDE - 1){
+ return "best";
+ }
+ if(i > BEST_MAGNITUDE - 1){
+ return "";
+ }
+ return String.format("1/%.0fx", Math.pow(10, BEST_MAGNITUDE - 1 - i));
+ }
+
+ @Override
+ protected boolean doDrawXAxisMarker(int i) {
+ return i < BEST_MAGNITUDE;
+ }
+
+ @Override
+ protected String legendInsideBar(TeamData teamData) {
+ return "" + teamData.val ;
+ }
+
+ @Override
+ double maxBarWidthWithLegend() {
+ return maxBarWidth(); // - textWidth(" iterations") -1;
+ }
+
+ @Override
+ protected int renderXLegend(Graphics graphics, int y, int axisX) {
+ int x = axisX;
+ String legend = "iterations of test cycles performed in fixed time (more is better)";
+ graphics.setFont(graphData().turnLegendFont);
+ graphics.drawString(legend, x, (int)(y+graphData().markerHeight+textHeight(legend)));
+ return (int) (y + stride()*2);
+ }
+
+}
Property changes on: trunk/polepos/src/org/polepos/reporters/LinearFixedTimeCustomBarRenderer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/polepos/src/org/polepos/reporters/LinearTimedLapsCustomBarRenderer.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/LinearTimedLapsCustomBarRenderer.java (rev 0)
+++ trunk/polepos/src/org/polepos/reporters/LinearTimedLapsCustomBarRenderer.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -0,0 +1,73 @@
+/*
+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.awt.*;
+
+public class LinearTimedLapsCustomBarRenderer extends TimedLapsCustomBarRendererBase {
+
+ public LinearTimedLapsCustomBarRenderer(Graph graph) {
+ super(graph);
+ }
+
+ @Override
+ protected int barWidth(TeamData teamData) {
+ return (int) (((double)teamData.val / (double)graph.worst) * (double)maxBarWidthWithLegend() );
+ }
+
+ @Override
+ protected String legendOnRightOfBar(TeamData teamData) {
+ return teamData.val + "ms";
+ }
+
+
+ @Override
+ protected String magnitudeAxisLegend(int i) {
+ if(i == 1){
+ return "best";
+ }
+ return String.format("%.0fx", Math.pow(10, i-1));
+ }
+
+ @Override
+ protected boolean doDrawXAxisMarker(int i) {
+ return true;
+ }
+
+ @Override
+ protected String legendInsideBar(TeamData teamData) {
+ return "";
+ }
+
+ @Override
+ double maxBarWidthWithLegend() {
+ String worst = "" + graph.worst + "ms";
+ return maxBarWidth() - textWidth(worst) -1;
+ }
+
+ @Override
+ protected int renderXLegend(Graphics graphics, int y, int axisX) {
+ int x = axisX;
+ String legend = "time in milliseconds (less is better)";
+ graphics.setFont(graphData().turnLegendFont);
+ graphics.drawString(legend, (int)(x), (int)(y+graphData().markerHeight+textHeight(legend)));
+ return (int) (y + stride()*2);
+ }
+
+}
Property changes on: trunk/polepos/src/org/polepos/reporters/LinearTimedLapsCustomBarRenderer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/polepos/src/org/polepos/reporters/LogarithmicFixedTimeCustomBarRenderer.java (from rev 209, trunk/polepos/src/org/polepos/reporters/FixedTimeCustomBarRenderer.java)
===================================================================
--- trunk/polepos/src/org/polepos/reporters/LogarithmicFixedTimeCustomBarRenderer.java (rev 0)
+++ trunk/polepos/src/org/polepos/reporters/LogarithmicFixedTimeCustomBarRenderer.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -0,0 +1,73 @@
+/*
+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.framework.*;
+
+public class LogarithmicFixedTimeCustomBarRenderer extends FixedTimeCustomBarRendererBase {
+
+ private static final int BEST_MAGNITUDE = 5;
+
+ public LogarithmicFixedTimeCustomBarRenderer(Graph graph) {
+ super(graph);
+ }
+
+
+ @Override
+ protected int barWidth(TeamData teamData) {
+ return (int)((BEST_MAGNITUDE - barUnits(teamData.orderOfMagnitude)) * widthPerOrderOfMagnitude());
+ }
+
+ @Override
+ protected String legendOnRightOfBar(TeamData teamData) {
+
+ double orderOfMagnitude = teamData.orderOfMagnitude;
+ if(orderOfMagnitude == 1){
+ return "";
+ }
+ return String.format("1/%.1fx", orderOfMagnitude);
+ }
+
+ @Override
+ protected String magnitudeAxisLegend(int i) {
+ if(i == BEST_MAGNITUDE - 1){
+ return "best";
+ }
+ if(i > BEST_MAGNITUDE - 1){
+ return "";
+ }
+ return String.format("1/%.0fx", Math.pow(10, BEST_MAGNITUDE - 1 - i));
+ }
+
+ @Override
+ protected boolean doDrawXAxisMarker(int i) {
+ return i < BEST_MAGNITUDE;
+ }
+
+ @Override
+ protected String legendInsideBar(TeamData teamData) {
+ return teamData.val+ " iterations";
+ }
+
+
+}
Copied: trunk/polepos/src/org/polepos/reporters/LogarithmicTimedLapsCustomBarRenderer.java (from rev 209, trunk/polepos/src/org/polepos/reporters/TimedLapsCustomBarRenderer.java)
===================================================================
--- trunk/polepos/src/org/polepos/reporters/LogarithmicTimedLapsCustomBarRenderer.java (rev 0)
+++ trunk/polepos/src/org/polepos/reporters/LogarithmicTimedLapsCustomBarRenderer.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -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.reporters;
+
+public class LogarithmicTimedLapsCustomBarRenderer extends TimedLapsCustomBarRendererBase {
+ public LogarithmicTimedLapsCustomBarRenderer(Graph graph) {
+ super(graph);
+ }
+
+ @Override
+ protected int barWidth(TeamData teamData) {
+ return (int) (barUnits(teamData.orderOfMagnitude) * widthPerOrderOfMagnitude());
+ }
+
+ @Override
+ protected String legendInsideBar(TeamData teamData) {
+ return teamData.val+ "ms";
+ }
+
+ @Override
+ protected String legendOnRightOfBar(TeamData teamData) {
+ return String.format("%.1fx", teamData.orderOfMagnitude);
+ }
+
+ @Override
+ protected String magnitudeAxisLegend(int i) {
+ if(i == 1){
+ return "best";
+ }
+ return String.format("%.0fx", Math.pow(10, i-1));
+ }
+
+ @Override
+ protected boolean doDrawXAxisMarker(int i) {
+ return true;
+ }
+
+}
Deleted: trunk/polepos/src/org/polepos/reporters/TimedLapsCustomBarRenderer.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/TimedLapsCustomBarRenderer.java 2011-07-15 16:00:32 UTC (rev 209)
+++ trunk/polepos/src/org/polepos/reporters/TimedLapsCustomBarRenderer.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -1,104 +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.reporters;
-
-import java.util.*;
-
-import org.polepos.framework.*;
-
-public class TimedLapsCustomBarRenderer extends CustomBarRendererBase {
- public TimedLapsCustomBarRenderer(Graph graph) {
- super(graph);
- }
-
- protected List<TurnData> prepareTurnsData(final Graph graph) {
- List<TurnData> runs = new ArrayList<TurnData>();
-
- final List<TurnSetup> setups = graph.setups();
- List<TeamCar> teamCars = graph.teamCars();
-
- for (final TurnSetup setup : setups) {
-
- TurnData turnData = new TurnData(setup, 0);
- long best = Long.MAX_VALUE;
- for (TeamCar teamCar : teamCars) {
- long time = graph.timeFor(teamCar, setup);
- TeamData teamData = new TeamData(teamCar, 0, time);
- if (time != 0 && time < best) {
- best = time;
- }
- turnData.teams.add(teamData);
- }
- turnData.best = best == 0 ? 1 : best;
-
- for (TeamData teamData : turnData.teams) {
- teamData.orderOfMagnitude = teamData.val / (double)turnData.best;
- }
-
- Collections.sort(turnData.teams, new Comparator<TeamData>() {
-
- @Override
- public int compare(TeamData team1, TeamData team2) {
- long time1 = graph.timeFor(team1.teamCar, setup);
- long time2 = graph.timeFor(team2.teamCar, setup);
-
- if (time1 > time2) {
- return 1;
- }
- if (time1 < time2) {
- return -1;
- }
- return 0;
- }
- });
-
- runs.add(turnData);
- }
- return runs;
- }
-
- @Override
- protected int barWidth(TeamData teamData) {
- return (int) (barUnits(teamData.orderOfMagnitude) * widthPerOrderOfMagnitude());
- }
-
- @Override
- protected String taskLegend() {
- return "ms";
- }
-
- @Override
- protected String magnitudeBarLegend(TeamData teamData) {
- return String.format("%.1fx", teamData.orderOfMagnitude);
- }
-
- @Override
- protected String magnitudeAxisLegend(int i) {
- if(i == 1){
- return "best";
- }
- return String.format("%.0fx", Math.pow(10, i-1));
- }
-
- @Override
- protected boolean doDrawXAxisMarker(int i) {
- return true;
- }
-
-}
Added: trunk/polepos/src/org/polepos/reporters/TimedLapsCustomBarRendererBase.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/TimedLapsCustomBarRendererBase.java (rev 0)
+++ trunk/polepos/src/org/polepos/reporters/TimedLapsCustomBarRendererBase.java 2011-07-18 16:51:14 UTC (rev 210)
@@ -0,0 +1,86 @@
+/*
+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.framework.*;
+
+public abstract class TimedLapsCustomBarRendererBase extends
+ CustomBarRendererBase {
+
+ public TimedLapsCustomBarRendererBase(Graph graph) {
+ super(graph);
+ }
+
+ protected List<TurnData> prepareTurnsData(final Graph graph) {
+
+ graph.worst = 0;
+
+ List<TurnData> runs = new ArrayList<TurnData>();
+
+ final List<TurnSetup> setups = graph.setups();
+ List<TeamCar> teamCars = graph.teamCars();
+
+ for (final TurnSetup setup : setups) {
+
+ TurnData turnData = new TurnData(setup, 0);
+ long best = Long.MAX_VALUE;
+ long worst = 0;
+ for (TeamCar teamCar : teamCars) {
+ long time = graph.timeFor(teamCar, setup);
+ TeamData teamData = new TeamData(teamCar, 0, time);
+ if (time != 0 && time < best) {
+ best = time;
+ }
+ if(time > graph.worst){
+ graph.worst = time;
+ }
+ turnData.teams.add(teamData);
+ }
+ turnData.best = best == 0 ? 1 : best;
+
+ for (TeamData teamData : turnData.teams) {
+ teamData.orderOfMagnitude = teamData.val / (double)turnData.best;
+ }
+
+ Collections.sort(turnData.teams, new Comparator<TeamData>() {
+
+ @Override
+ public int compare(TeamData team1, TeamData team2) {
+ long time1 = graph.timeFor(team1.teamCar, setup);
+ long time2 = graph.timeFor(team2.teamCar, setup);
+
+ if (time1 > time2) {
+ return 1;
+ }
+ if (time1 < time2) {
+ return -1;
+ }
+ return 0;
+ }
+ });
+
+ runs.add(turnData);
+ }
+ return runs;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/polepos/src/org/polepos/reporters/TimedLapsCustomBarRendererBase.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-03-14 17:07:46
|
Revision: 206
http://polepos.svn.sourceforge.net/polepos/?rev=206&view=rev
Author: carlrosenberger
Date: 2011-03-14 17:07:40 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
cr + acv: Disabling Datanucleus l2 ehcache again trying if the exception goes away.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-14 15:05:32 UTC (rev 205)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-14 17:07:40 UTC (rev 206)
@@ -167,7 +167,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.
|
|
From: <car...@us...> - 2011-03-14 15:05:38
|
Revision: 205
http://polepos.svn.sourceforge.net/polepos/?rev=205&view=rev
Author: carlrosenberger
Date: 2011-03-14 15:05:32 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
cr + acv: Turning ehcache back on for DataNucleus.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-14 14:54:35 UTC (rev 204)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-14 15:05:32 UTC (rev 205)
@@ -167,7 +167,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.
|
|
From: <car...@us...> - 2011-03-14 14:54:41
|
Revision: 204
http://polepos.svn.sourceforge.net/polepos/?rev=204&view=rev
Author: carlrosenberger
Date: 2011-03-14 14:54:35 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
cr + acv: Finding out the version of the used JDBC databases using JDBC metadata.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/teams/jdbc/JdbcCar.java
trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java
trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
Modified: trunk/polepos/src/org/polepos/teams/jdbc/JdbcCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/JdbcCar.java 2011-03-10 16:58:11 UTC (rev 203)
+++ trunk/polepos/src/org/polepos/teams/jdbc/JdbcCar.java 2011-03-14 14:54:35 UTC (rev 204)
@@ -43,16 +43,87 @@
JdbcSettings jdbcSettings = Jdbc.settings();
_website = jdbcSettings.getWebsite(dbtype);
_description = jdbcSettings.getDescription(dbtype);
- _name = jdbcSettings.getName(dbtype);
-
try {
Class.forName(jdbcSettings.getDriverClass(dbtype)).newInstance();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
+ _name = jdbcSettings.getName(dbtype) + "-" + getVersion(dbtype);
}
+
+ public Connection openConnection() {
+ try {
+ JdbcSettings jdbcSettings = Jdbc.settings();
+ Properties props = new Properties();
+ String username = jdbcSettings.getUsername(_dbType);
+ if(username != null){
+ props.put("user", username);
+ }
+ String password = jdbcSettings.getPassword(_dbType);
+ if(password != null){
+ props.put("password", password);
+ }
+
+ // If we don't use this setting, HSQLDB will hold all tables
+ // in memory completely, which is not what other engines do.
+ props.put("hsqldb.default_table_type", "cached");
+
+ String connectUrl = jdbcSettings.getConnectUrl(_dbType);
+ Connection connection = DriverManager.getConnection(connectUrl, props);
+ connection.setAutoCommit(false);
+ return connection;
+
+ } catch (SQLException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ }
+
+ private String getVersion(String dbtype){
+
+ try {
+ Connection conn = openConnection();
+ DatabaseMetaData meta = conn.getMetaData();
+
+ int majorVersion = 0;
+ int minorVersion = 0;
+ try {
+ majorVersion = meta.getDatabaseMajorVersion();
+ } catch (Exception e) {
+ System.out.println("major Version: unsupported feature");
+ }
+ try {
+ minorVersion = meta.getDatabaseMinorVersion();
+ } catch (Exception e) {
+ System.out.println("minorVersion unsupported feature");
+ }
+
+ String productName = meta.getDatabaseProductName();
+ String productVersion = meta.getDatabaseProductVersion();
+// System.out.println("productName" + productName);
+// System.out.println("productVersion" + productVersion);
+ conn.close();
+
+// The following produces earlier versions than we use:
+
+// String version = "" + majorVersion + "." + minorVersion;
+// return version;
+
+// Remove the part after the dash from Derby and MySQL
+ int pos = productVersion.indexOf("-");
+ String version = pos > 0 ? productVersion.substring(0, pos -1) : productVersion;
+ System.out.println("Detected: " + productName + " " + version);
+ return version;
+
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ return Jdbc.settings().getVersion(dbtype);
+ }
+
+
public String name() {
if (_name != null) {
return _name;
Modified: trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java 2011-03-10 16:58:11 UTC (rev 203)
+++ trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java 2011-03-14 14:54:35 UTC (rev 204)
@@ -26,7 +26,7 @@
import org.polepos.data.*;
-public abstract class JdbcDriver extends org.polepos.framework.DriverBase {
+public class JdbcDriver extends org.polepos.framework.DriverBase {
private Connection _connection;
@@ -148,36 +148,10 @@
public void openConnection() {
-
- try {
- assert null == _connection : "database has to be closed before opening";
- JdbcSettings jdbcSettings = Jdbc.settings();
-
- Properties props = new Properties();
- String username = jdbcSettings.getUsername(jdbcCar()._dbType);
- if(username != null){
- props.put("user", username);
- }
- String password = jdbcSettings.getPassword(jdbcCar()._dbType);
- if(password != null){
- props.put("password", password);
- }
-
- // If we don't use this setting, HSQLDB will hold all tables
- // in memory completely, which is not what other engines do.
- props.put("hsqldb.default_table_type", "cached");
-
-
- _connection = DriverManager.getConnection(jdbcSettings.getConnectUrl(jdbcCar()._dbType), props);
- _connection.setAutoCommit(false);
-
- if(isHsqlDb()){
- JdbcCar.hsqlDbWriteDelayToZero(_connection);
- }
-
- } catch (SQLException e) {
- e.printStackTrace();
- throw new RuntimeException(e);
+ assert null == _connection : "database has to be closed before opening";
+ _connection = jdbcCar().openConnection();
+ if(isHsqlDb()){
+ JdbcCar.hsqlDbWriteDelayToZero(_connection);
}
}
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-10 16:58:11 UTC (rev 203)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-14 14:54:35 UTC (rev 204)
@@ -36,14 +36,17 @@
private transient PersistenceManagerFactory _persistenceManagerFactory;
- private final String mDbName;
- private final String mName;
+ private final String _dbName;
+
+ private final String _jdoName;
+
+ private String _name;
JdoCar(Team team, String name, String dbName, String color) {
super(team, color);
- mName = name;
- mDbName = dbName;
+ _jdoName = name;
+ _dbName = dbName;
_website = Jdo.settings().getWebsite(name);
_description = Jdo.settings().getDescription(name);
@@ -53,7 +56,7 @@
}
private boolean isSQL() {
- return mDbName != null;
+ return _dbName != null;
}
private void initialize() {
@@ -61,7 +64,7 @@
Properties properties = new Properties();
properties.setProperty("javax.jdo.PersistenceManagerFactoryClass", Jdo.settings()
- .getFactory(mName));
+ .getFactory(_jdoName));
// properties.setProperty("javax.jdo.option.NontransactionalRead", "true");
@@ -101,36 +104,36 @@
if (isSQL()) {
try {
- Class.forName(Jdbc.settings().getDriverClass(mDbName)).newInstance();
+ Class.forName(Jdbc.settings().getDriverClass(_dbName)).newInstance();
} catch (Exception ex) {
ex.printStackTrace();
}
properties.setProperty("javax.jdo.option.ConnectionDriverName", Jdbc.settings()
- .getDriverClass(mDbName));
- String connectUrl = Jdbc.settings().getConnectUrl(mDbName);
+ .getDriverClass(_dbName));
+ String connectUrl = Jdbc.settings().getConnectUrl(_dbName);
properties.setProperty("javax.jdo.option.ConnectionURL", connectUrl);
- String user = Jdbc.settings().getUsername(mDbName);
+ String user = Jdbc.settings().getUsername(_dbName);
if (user != null) {
properties.setProperty("javax.jdo.option.ConnectionUserName", user);
}
- String password = Jdbc.settings().getPassword(mDbName);
+ String password = Jdbc.settings().getPassword(_dbName);
if (password != null) {
properties.setProperty("javax.jdo.option.ConnectionPassword", password);
}
} else {
- properties.setProperty("javax.jdo.option.ConnectionURL", Jdo.settings().getURL(mName));
+ properties.setProperty("javax.jdo.option.ConnectionURL", Jdo.settings().getURL(_jdoName));
- String user = Jdo.settings().getUsername(mName);
+ String user = Jdo.settings().getUsername(_jdoName);
if (user != null) {
properties.setProperty("javax.jdo.option.ConnectionUserName", user);
}
- String password = Jdo.settings().getPassword(mName);
+ String password = Jdo.settings().getPassword(_jdoName);
if (password != null) {
properties.setProperty("javax.jdo.option.ConnectionPassword", password);
}
@@ -182,27 +185,18 @@
}
public PersistenceManager getPersistenceManager() {
-
PersistenceManager pm = _persistenceManagerFactory.getPersistenceManager();
if(pm instanceof VersantPersistenceManager){
((VersantPersistenceManager)pm).setReadLockOnOptimisticQueryResults( false);
}
-
- if(! "hsqldb".equals(mDbName)){
+ if(! "hsqldb".equals(_dbName)){
return pm;
}
-
JDOConnection dataStoreConnection = pm.getDataStoreConnection();
Connection connection = (Connection) dataStoreConnection.getNativeConnection();
-
JdbcCar.hsqlDbWriteDelayToZero(connection);
try {
-
- // Closing the connection here really feels strange, but otherwise
- // Datanucleus hangs, probably because it runs out of JDBC connections.
-
connection.close();
-
} catch (SQLException e) {
e.printStackTrace();
}
@@ -211,12 +205,20 @@
@Override
public String name() {
+ if(_name != null){
+ return _name;
+ }
if(isSQL()){
- return Jdo.settings().getName(mName) + "/" +Jdbc.settings().getName(mDbName)+"-"+Jdbc.settings().getVersion(mDbName);
+ // Creating a JdbcCar to get the version name from it.
+ JdbcTeam jdbcTeam = new JdbcTeam();
+ JdbcCar jdbcCar = new JdbcCar(jdbcTeam, _dbName, color());
+ _name = Jdo.settings().getName(_jdoName) + "/" + jdbcCar.name();
+ } else {
+ _name = Jdo.settings().getVendor(_jdoName) + "/" + Jdo.settings().getName(_jdoName)+"-"+Jdo.settings().getVersion(_jdoName);
}
- return Jdo.settings().getVendor(mName) + "/" + Jdo.settings().getName(mName)+"-"+Jdo.settings().getVersion(mName);
-
+
+ return _name;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-03-10 16:58:17
|
Revision: 203
http://polepos.svn.sourceforge.net/polepos/?rev=203&view=rev
Author: carlrosenberger
Date: 2011-03-10 16:58:11 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
cr: Trying turning off the Datanucleus l2 cache (ehcache) since strange exceptions happen.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-10 13:37:59 UTC (rev 202)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-10 16:58:11 UTC (rev 203)
@@ -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.
|
|
From: <car...@us...> - 2011-03-10 13:38:05
|
Revision: 202
http://polepos.svn.sourceforge.net/polepos/?rev=202&view=rev
Author: carlrosenberger
Date: 2011-03-10 13:37:59 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
cr + acv: Improved deleting so constraints no longer are violated.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java 2011-03-09 14:33:48 UTC (rev 201)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java 2011-03-10 13:37:59 UTC (rev 202)
@@ -126,18 +126,26 @@
public void deleteAll(PersistenceManager pm) {
deleteAll(pm, JdoIndexedObject.class);
deleteAll(pm, ListHolder.class);
+
+ // This doesn't work for VOD, only objects of the concrete
+ // class are deleted.
+ deletePersistentAll(pm, ComplexHolder0.class);
+
+ // so we repeat deleting for each class
deleteAll(pm, ComplexHolder4.class);
deleteAll(pm, ComplexHolder3.class);
deleteAll(pm, ComplexHolder2.class);
deleteAll(pm, ComplexHolder1.class);
deleteAll(pm, ComplexHolder0.class);
+ deletePersistentAll(pm, InheritanceHierarchy0.class);
deleteAll(pm, InheritanceHierarchy4.class);
deleteAll(pm, InheritanceHierarchy3.class);
deleteAll(pm, InheritanceHierarchy2.class);
deleteAll(pm, InheritanceHierarchy1.class);
deleteAll(pm, InheritanceHierarchy0.class);
+ deletePersistentAll(pm, JB0.class);
deleteAll(pm, JB0.class);
deleteAll(pm, JB1.class);
deleteAll(pm, JB2.class);
@@ -158,27 +166,42 @@
// Added after getting OutOfMemory issues with
// 3 million objects per extent.
if(true){
+ checkExtentSize(pm, clazz, "before deleteAllBatched");
deleteAllBatched(pm, clazz);
+ checkExtentSize(pm, clazz, "after deleteAllBatched");
return;
}
+ // This didn't work for all engines
+ deletePersistentAll(pm, clazz);
- // This didn't work in Datanucleus ....
-
- pm.currentTransaction().begin();
- pm.newQuery(clazz).deletePersistentAll();
- pm.currentTransaction().commit();
-
// ...so delete all again like this...
-
pm.currentTransaction().begin();
pm.deletePersistentAll((Collection) pm.newQuery(clazz).execute());
pm.currentTransaction().commit();
}
+ private void deletePersistentAll(PersistenceManager pm, Class clazz) {
+ checkExtentSize(pm, clazz, "before deletePersistentAll");
+ pm.currentTransaction().begin();
+ pm.newQuery(clazz).deletePersistentAll();
+ pm.currentTransaction().commit();
+ checkExtentSize(pm, clazz, "after deletePersistentAll");
+ }
+
+ private void checkExtentSize(PersistenceManager pm, Class clazz, String msg){
+ if(true){
+ return;
+ }
+ pm.currentTransaction().begin();
+ Collection collection = (Collection) pm.newQuery(clazz).execute();
+ System.out.println(pm.getClass().getSimpleName());
+ System.out.println(msg + " " + clazz.getSimpleName() + " size: " + collection.size());
+ pm.currentTransaction().rollback();
+ }
+
private void deleteAllBatched(PersistenceManager pm, Class clazz) {
-
pm.currentTransaction().begin();
int batchSize = 10000;
int commitctr = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-03-09 14:33:56
|
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.
|
|
From: <car...@us...> - 2011-03-08 13:27:09
|
Revision: 200
http://polepos.svn.sourceforge.net/polepos/?rev=200&view=rev
Author: carlrosenberger
Date: 2011-03-08 13:27:03 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
cr + pr: Vod8 user and password set to dbbench
Modified Paths:
--------------
trunk/polepos/settings/Jdo.properties
Modified: trunk/polepos/settings/Jdo.properties
===================================================================
--- trunk/polepos/settings/Jdo.properties 2011-03-08 12:42:04 UTC (rev 199)
+++ trunk/polepos/settings/Jdo.properties 2011-03-08 13:27:03 UTC (rev 200)
@@ -34,6 +34,8 @@
#
vod8.factory=com.versant.core.jdo.BootstrapPMF
vod8.url=versant\:dbbench@localhost
+vod8.user=dbbench
+vod8.password=dbbench
vod8.website=http://www.versant.com
vod8.vendor=Versant
vod8.name=VOD
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-03-08 12:42:10
|
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.
|
|
From: <car...@us...> - 2011-03-07 16:20:06
|
Revision: 198
http://polepos.svn.sourceforge.net/polepos/?rev=198&view=rev
Author: carlrosenberger
Date: 2011-03-07 16:20:00 +0000 (Mon, 07 Mar 2011)
Log Message:
-----------
cr: No more termination on JDBC exceptions.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/framework/DriverBase.java
trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java
Modified: trunk/polepos/src/org/polepos/framework/DriverBase.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/DriverBase.java 2011-03-07 15:40:32 UTC (rev 197)
+++ trunk/polepos/src/org/polepos/framework/DriverBase.java 2011-03-07 16:20:00 UTC (rev 198)
@@ -120,9 +120,6 @@
try {
method.invoke(DriverBase.this, (Object[]) null);
} catch (Exception e) {
- if(Settings.isDebug()){
- throw new RuntimeException(e);
- }
e.printStackTrace();
}
}
@@ -131,9 +128,6 @@
try{
return DriverBase.this.getClass().getDeclaredMethod(lap.name(), (Class[])null);
} catch (Exception e) {
- if(Settings.isDebug()){
- throw new RuntimeException(e);
- }
e.printStackTrace();
}
return null;
Modified: trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java 2011-03-07 15:40:32 UTC (rev 197)
+++ trunk/polepos/src/org/polepos/teams/jdbc/JdbcDriver.java 2011-03-07 16:20:00 UTC (rev 198)
@@ -132,9 +132,6 @@
}
private void handleException(Exception e) {
- 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.
|
|
From: <car...@us...> - 2011-03-07 15:40:39
|
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.
|
|
From: <car...@us...> - 2011-03-07 14:07:10
|
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.
|
|
From: <car...@us...> - 2011-03-03 14:55:05
|
Revision: 195
http://polepos.svn.sourceforge.net/polepos/?rev=195&view=rev
Author: carlrosenberger
Date: 2011-03-03 14:54:59 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
cr + pr: Added parts of Andy Jeffersons suggestions for improvement.
Modified Paths:
--------------
trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java
trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateListHolder.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/IndexedObject.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/InheritanceHierarchy0.hbm.xml
trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.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/ComplexHolder0.java
trunk/polepos/src/org/polepos/teams/jdo/data/package.jdo
trunk/polepos/src/org/polepos/teams/jdo/data/vod.jdo
Removed Paths:
-------------
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.java
trunk/polepos/src/org/polepos/teams/jdo/data/ComplexRoot.java
Modified: trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java 2011-03-03 14:54:59 UTC (rev 195)
@@ -106,7 +106,6 @@
public static final Class[] persistentClasses() {
return new Class[] {
ComplexHolder0.class,
- ComplexRoot.class,
HB0.class,
HibernateIndexedPilot.class,
HibernateLightObject.class,
Deleted: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.hbm.xml 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.hbm.xml 2011-03-03 14:54:59 UTC (rev 195)
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.polepos.teams.hibernate.data">
- <class name="ComplexRoot" table="tComplexRoot">
- <id column="ID" type="int">
- <generator class="native"/>
- </id>
- <many-to-one name="holder" class="ComplexHolder0" cascade="all"/>
- </class>
-</hibernate-mapping>
Deleted: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.java 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.java 2011-03-03 14:54:59 UTC (rev 195)
@@ -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.teams.hibernate.data;
-
-public class ComplexRoot {
-
- private ComplexHolder0 holder;
-
- public ComplexRoot(){
-
- }
-
- public ComplexRoot(ComplexHolder0 holder) {
- this.holder = holder;
- }
-
- public ComplexHolder0 getHolder(){
- return holder;
- }
-
- public void setHolder(ComplexHolder0 holder){
- this.holder = holder;
- }
-
-
-}
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateListHolder.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateListHolder.hbm.xml 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateListHolder.hbm.xml 2011-03-03 14:54:59 UTC (rev 195)
@@ -3,7 +3,7 @@
<hibernate-mapping package="org.polepos.teams.hibernate.data">
<class name="HibernateListHolder" table="tHibernateListHolder">
- <id column="ID" type="int">
+ <id column="fid" type="int">
<generator class="native"/>
</id>
<list name="list" cascade="all">
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/IndexedObject.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/IndexedObject.hbm.xml 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/IndexedObject.hbm.xml 2011-03-03 14:54:59 UTC (rev 195)
@@ -3,7 +3,7 @@
<hibernate-mapping package="org.polepos.teams.hibernate.data">
<class name="IndexedObject" table="tIndexedObject">
- <id column="ID" type="int">
+ <id column="fid" type="int">
<generator class="native"/>
</id>
<property name="Int" column="fint" type="int" index="fint_idx"/>
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/InheritanceHierarchy0.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/InheritanceHierarchy0.hbm.xml 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/InheritanceHierarchy0.hbm.xml 2011-03-03 14:54:59 UTC (rev 195)
@@ -3,7 +3,7 @@
<hibernate-mapping package="org.polepos.teams.hibernate.data">
<class name="InheritanceHierarchy0" table="tInheritanceHierarchy0">
- <id column="ID" type="int">
+ <id column="fid" type="int">
<generator class="native"/>
</id>
<property name="i0" column="i0" type="int"/>
Modified: trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java 2011-03-03 14:54:59 UTC (rev 195)
@@ -468,7 +468,7 @@
arrayDeleteStat.executeBatch();
arrayDeleteStat.close();
- // Without this commit we get deadlocks
+ // FIXME: Without this commit we get deadlocks
// in the concurrency runs
commit();
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-03 14:54:59 UTC (rev 195)
@@ -148,15 +148,23 @@
properties.setProperty("datanucleus.autoCreateConstraints", "false");
-// properties.setProperty("datanucleus.validateColumns", "false");
+ // properties.setProperty("datanucleus.validateColumns", "false");
- properties.setProperty("datanucleus.connectionPoolingType", "DBCP");
+ // properties.setProperty("datanucleus.connectionPoolingType", "DBCP");
properties.setProperty("datanucleus.persistenceByReachabilityAtCommit", "false");
properties.setProperty("datanucleus.manageRelationships", "false");
- properties.setProperty("datanucleus.valuegeneration.sequence.allocationSize","100");
+ properties.setProperty("datanucleus.valuegeneration.sequence.allocationSize","100");
+ properties.setProperty("datanucleus.valuegeneration.increment.allocationSize","100");
+
+
+ properties.setProperty("datanucleus.connectionPool.maxStatements","20");
+ properties.setProperty("datanucleus.autoStartMechanism","None");
+
+
+ // properties.setProperty("datanucleus.cache.level2.type","ehcache");
_persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, JDOHelper.class.getClassLoader());
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java 2011-03-03 14:54:59 UTC (rev 195)
@@ -126,7 +126,6 @@
public void deleteAll(PersistenceManager pm) {
deleteAll(pm, JdoIndexedObject.class);
deleteAll(pm, ListHolder.class);
- deleteAll(pm, ComplexRoot.class);
deleteAll(pm, ComplexHolder4.class);
deleteAll(pm, ComplexHolder3.class);
deleteAll(pm, ComplexHolder2.class);
Modified: trunk/polepos/src/org/polepos/teams/jdo/data/ComplexHolder0.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/data/ComplexHolder0.java 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/jdo/data/ComplexHolder0.java 2011-03-03 14:54:59 UTC (rev 195)
@@ -28,6 +28,8 @@
public class ComplexHolder0 implements CheckSummable {
+ private long id;
+
private String name;
private List<ComplexHolder0> children = new ArrayList<ComplexHolder0>();
@@ -40,6 +42,7 @@
public static ComplexHolder0 generate(int depth, int leafs, boolean disjunctSpecial){
ComplexHolder0 complexHolder = new ComplexHolder0();
+
complexHolder.name = "root";
int specialValue = disjunctSpecial ? (int) Math.pow(leafs, depth) : 0;
createChildren(complexHolder, depth -1, leafs, specialValue);
Deleted: trunk/polepos/src/org/polepos/teams/jdo/data/ComplexRoot.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/data/ComplexRoot.java 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/jdo/data/ComplexRoot.java 2011-03-03 14:54:59 UTC (rev 195)
@@ -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.teams.jdo.data;
-
-public class ComplexRoot {
-
- private ComplexHolder0 holder;
-
- public ComplexRoot(){
-
- }
-
- public ComplexRoot(ComplexHolder0 holder) {
- this.holder = holder;
- }
-
- public ComplexHolder0 getHolder(){
- return holder;
- }
-
- public void setHolder(ComplexHolder0 holder){
- this.holder = holder;
- }
-
-
-}
Modified: trunk/polepos/src/org/polepos/teams/jdo/data/package.jdo
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/data/package.jdo 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/jdo/data/package.jdo 2011-03-03 14:54:59 UTC (rev 195)
@@ -2,22 +2,9 @@
<!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" persistence-modifier="persistent" indexed = "true">
- <column length="100" jdbc-type="VARCHAR"/>
- </field>
- <field name="_list">
- <collection element-type="ListHolder"/>
- </field>
- </class>
- <class name="ComplexRoot" />
- <class name="ComplexHolder0">
+ <class name="ComplexHolder0" identity-type="application">
<inheritance strategy="new-table"/>
+ <field name="id" primary-key="true" value-strategy="native"/>
<field name="name" persistence-modifier="persistent">
<column length="100" jdbc-type="VARCHAR"/>
</field>
@@ -42,6 +29,15 @@
<inheritance strategy="new-table"/>
<field name = "i4" />
</class>
+ <class name="ListHolder">
+ <field name="_id" indexed = "true"/>
+ <field name="_name" persistence-modifier="persistent" indexed = "true">
+ <column length="100" jdbc-type="VARCHAR"/>
+ </field>
+ <field name="_list">
+ <collection element-type="ListHolder"/>
+ </field>
+ </class>
<class name="InheritanceHierarchy0">
<inheritance strategy="new-table"/>
<field name = "i0" />
@@ -62,6 +58,10 @@
<inheritance strategy="new-table"/>
<field name = "i4" />
</class>
+ <class name="JdoIndexedObject">
+ <field name = "_int" indexed = "true"/>
+ <field name = "_string" indexed = "true"/>
+ </class>
<class name="JB0">
</class>
<class name="JB1" persistence-capable-superclass="org.polepos.teams.jdo.data.JB0">
Modified: trunk/polepos/src/org/polepos/teams/jdo/data/vod.jdo
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/data/vod.jdo 2011-03-01 15:27:01 UTC (rev 194)
+++ trunk/polepos/src/org/polepos/teams/jdo/data/vod.jdo 2011-03-03 14:54:59 UTC (rev 195)
@@ -13,7 +13,6 @@
<collection element-type="ListHolder"/>
</field>
</class>
- <class name="ComplexRoot" />
<class name="ComplexHolder0">
<field name="name" />
<field name="array" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-03-01 15:27:10
|
Revision: 194
http://polepos.svn.sourceforge.net/polepos/?rev=194&view=rev
Author: carlrosenberger
Date: 2011-03-01 15:27:01 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
cr + acv: Trying to add Andy Jeffersons suggestion.
Strings now have fixed lengths. autocreateSchema is false when the benchmark is run.
Modified Paths:
--------------
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
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-01 15:23:19 UTC (rev 193)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2011-03-01 15:27:01 UTC (rev 194)
@@ -155,9 +155,22 @@
properties.setProperty("datanucleus.persistenceByReachabilityAtCommit", "false");
properties.setProperty("datanucleus.manageRelationships", "false");
+
+ properties.setProperty("datanucleus.valuegeneration.sequence.allocationSize","100");
+ _persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, JDOHelper.class.getClassLoader());
+
+
+ PersistenceManager pm = _persistenceManagerFactory.getPersistenceManager();
+ ((JdoTeam)team()).deleteAll(pm);
+ pm.close();
+ _persistenceManagerFactory.close();
+
+ properties.setProperty("datanucleus.autoCreateSchema", "false");
+
_persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, JDOHelper.class.getClassLoader());
+
}
public PersistenceManager getPersistenceManager() {
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java 2011-03-01 15:23:19 UTC (rev 193)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java 2011-03-01 15:27:01 UTC (rev 194)
@@ -115,44 +115,45 @@
@Override
public void setUp() {
for(int i = 0; i < mCars.length;i++){
-
JdoCar jdoCar = (JdoCar)mCars[i];
PersistenceManager pm = jdoCar.getPersistenceManager();
-
- 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, InheritanceHierarchy4.class);
- deleteAll(pm, InheritanceHierarchy3.class);
- deleteAll(pm, InheritanceHierarchy2.class);
- deleteAll(pm, InheritanceHierarchy1.class);
- deleteAll(pm, InheritanceHierarchy0.class);
-
- deleteAll(pm, JB0.class);
- deleteAll(pm, JB1.class);
- deleteAll(pm, JB2.class);
- deleteAll(pm, JB3.class);
- deleteAll(pm, JB4.class);
-
- deleteAll(pm, JdoIndexedPilot.class);
- deleteAll(pm, JdoPilot.class);
- deleteAll(pm, JdoTree.class);
- deleteAll(pm, JdoLightObject.class);
- deleteAll(pm, JdoListHolder.class);
- deleteAll(pm, JN1.class);
-
-
+ deleteAll(pm);
pm.close();
}
}
+ public void deleteAll(PersistenceManager pm) {
+ 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, InheritanceHierarchy4.class);
+ deleteAll(pm, InheritanceHierarchy3.class);
+ deleteAll(pm, InheritanceHierarchy2.class);
+ deleteAll(pm, InheritanceHierarchy1.class);
+ deleteAll(pm, InheritanceHierarchy0.class);
+
+ deleteAll(pm, JB0.class);
+ deleteAll(pm, JB1.class);
+ deleteAll(pm, JB2.class);
+ deleteAll(pm, JB3.class);
+ deleteAll(pm, JB4.class);
+
+ deleteAll(pm, JdoIndexedPilot.class);
+ deleteAll(pm, JdoPilot.class);
+ deleteAll(pm, JdoTree.class);
+ deleteAll(pm, JdoLightObject.class);
+ deleteAll(pm, JdoListHolder.class);
+ deleteAll(pm, JN1.class);
+ }
+
+
private void deleteAll(PersistenceManager pm, Class clazz) {
// Added after getting OutOfMemory issues with
Modified: trunk/polepos/src/org/polepos/teams/jdo/data/package.jdo
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/data/package.jdo 2011-03-01 15:23:19 UTC (rev 193)
+++ trunk/polepos/src/org/polepos/teams/jdo/data/package.jdo 2011-03-01 15:27:01 UTC (rev 194)
@@ -3,12 +3,14 @@
<jdo>
<package name="org.polepos.teams.jdo.data">
<class name="JdoIndexedObject">
- <field name = "_int" indexed = "true"/>
- <field name = "_string" indexed = "true"/>
+ <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="_name" persistence-modifier="persistent" indexed = "true">
+ <column length="100" jdbc-type="VARCHAR"/>
+ </field>
<field name="_list">
<collection element-type="ListHolder"/>
</field>
@@ -16,7 +18,9 @@
<class name="ComplexRoot" />
<class name="ComplexHolder0">
<inheritance strategy="new-table"/>
- <field name="name" />
+ <field name="name" persistence-modifier="persistent">
+ <column length="100" jdbc-type="VARCHAR"/>
+ </field>
<field name="array" />
<field name="children">
<collection element-type="ComplexHolder0"/>
@@ -58,36 +62,42 @@
<inheritance strategy="new-table"/>
<field name = "i4" />
</class>
-
-
- <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 name="JB0">
+ </class>
+ <class name="JB1" persistence-capable-superclass="org.polepos.teams.jdo.data.JB0">
+ </class>
+ <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 name="JB3" persistence-capable-superclass="org.polepos.teams.jdo.data.JB2">
+ </class>
+ <class name="JB4" persistence-capable-superclass="org.polepos.teams.jdo.data.JB3">
</class>
- <class name="JdoLightObject"/>
- <class name="JdoListHolder">
+ <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>
+ <class name="JdoIndexedPilot">
+ <field name="mName" persistence-modifier="persistent" indexed = "true">
+ <column length="100" jdbc-type="VARCHAR"/>
+ </field>
+ <field name = "mLicenseID" indexed = "true"/>
+ </class>
+ <class name="JdoLightObject">
+ </class>
+ <class name="JdoListHolder">
<field name = "list">
<collection element-type="java.lang.Integer"/>
</field>
</class>
- <class name="JN1"/>
+ <class name="JN1">
+ </class>
</package>
</jdo>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
