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.
|
