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