|
From: <car...@us...> - 2010-12-02 15:52:13
|
Revision: 153
http://polepos.svn.sourceforge.net/polepos/?rev=153&view=rev
Author: carlrosenberger
Date: 2010-12-02 15:52:05 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
cr + acv: Work on ComplexHibernate. Updated some libs.
Modified Paths:
--------------
trunk/polepos/.classpath
trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java
trunk/polepos/src/org/polepos/teams/hibernate/data/HB0.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/HN1.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateIndexedPilot.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateLightObject.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateListHolder.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/HibernatePilot.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateTree.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/hibernate/data/ListHolder.hbm.xml
trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java
Added Paths:
-----------
trunk/polepos/lib/common/javassist-3.12.0.GA.jar
trunk/polepos/lib/common/slf4j-api-1.6.1.jar
trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder1.java
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder2.java
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder3.java
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder4.java
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.hbm.xml
trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.java
Removed Paths:
-------------
trunk/polepos/lib/common/javassist-3.9.0.GA.jar
trunk/polepos/lib/hibernate/javassist-3.12.0.GA.jar
Modified: trunk/polepos/.classpath
===================================================================
--- trunk/polepos/.classpath 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/.classpath 2010-12-02 15:52:05 UTC (rev 153)
@@ -15,7 +15,6 @@
<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/javassist-3.9.0.GA.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"/>
@@ -44,7 +43,8 @@
<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/hibernate/javassist-3.12.0.GA.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="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"/>
Added: trunk/polepos/lib/common/javassist-3.12.0.GA.jar
===================================================================
(Binary files differ)
Property changes on: trunk/polepos/lib/common/javassist-3.12.0.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/polepos/lib/common/javassist-3.9.0.GA.jar
===================================================================
(Binary files differ)
Added: trunk/polepos/lib/common/slf4j-api-1.6.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/polepos/lib/common/slf4j-api-1.6.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/polepos/lib/hibernate/javassist-3.12.0.GA.jar
===================================================================
(Binary files differ)
Added: trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java (rev 0)
+++ trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.java 2010-12-02 15:52:05 UTC (rev 153)
@@ -0,0 +1,123 @@
+/*
+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;
+
+import java.util.*;
+
+import org.hibernate.*;
+import org.polepos.circuits.complex.*;
+import org.polepos.teams.hibernate.data.*;
+
+
+public class ComplexHibernate extends HibernateDriver implements Complex {
+
+ @Override
+ public void write() {
+ Transaction tx = begin();
+ ComplexHolder0 holder = ComplexHolder0.generate(depth(), objectCount());
+ addToCheckSum(holder);
+ store(new ComplexRoot(holder));
+ tx.commit();
+ }
+
+ @Override
+ public void read() {
+ ComplexHolder0 holder = root();
+ addToCheckSum(holder);
+ }
+
+ private ComplexHolder0 root() {
+ String from = "from org.polepos.teams.hibernate.data.ComplexRoot";
+ Iterator it = db().iterate(from);
+ if(! it.hasNext()){
+ throw new IllegalStateException("no ComplexRoot found");
+ }
+ ComplexRoot root = (ComplexRoot) it.next();
+ if(it.hasNext()){
+ throw new IllegalStateException("More than one ComplexRoot found");
+ }
+ ComplexHolder0 holder = root.getHolder();
+ return holder;
+ }
+
+ @Override
+ public void query() {
+// int selectCount = selectCount();
+// int firstInt = objectCount() * objectCount() + objectCount();
+// int lastInt = firstInt + (objectCount() * objectCount() * objectCount()) - 1;
+// int currentInt = firstInt;
+// for (int run = 0; run < selectCount; run++) {
+//
+// Query query = null;
+// query.constrain(ComplexHolder2.class);
+// query.descend("_i2").constrain(currentInt);
+// ObjectSet<ComplexHolder2> result = query.execute();
+// if(result.size() != 1) {
+// throw new IllegalStateException("" + result.size());
+// }
+// ComplexHolder2 holder = result.get(0);
+//
+// addToCheckSum(holder.ownCheckSum());
+//
+// currentInt++;
+// if(currentInt > lastInt){
+// currentInt = firstInt;
+// }
+// }
+//
+ }
+
+ @Override
+ public void update() {
+// ComplexHolder0 holder = root();
+// holder.traverse(new NullVisitor(),
+// new Visitor<ComplexHolder0>() {
+// @Override
+// public void visit(ComplexHolder0 holder) {
+// addToCheckSum(holder.ownCheckSum());
+// holder.setName("updated");
+// ComplexHolder2 newChild = new ComplexHolder2();
+// newChild._i1 = 1;
+// newChild._i2 = 2;
+// newChild.setName("added");
+// holder.addChild(newChild);
+// store(holder.getChildren());
+// store(holder);
+// }
+// });
+ }
+
+ @Override
+ public void delete() {
+// ComplexHolder0 holder = root();
+//
+// holder.traverse(
+// new NullVisitor(),
+// new Visitor<ComplexHolder0>() {
+// @Override
+// public void visit(ComplexHolder0 holder) {
+// addToCheckSum(holder.ownCheckSum());
+// db().delete(holder);
+// }
+// });
+ }
+
+}
Property changes on: trunk/polepos/src/org/polepos/teams/hibernate/ComplexHibernate.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 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/hibernate/HibernateTeam.java 2010-12-02 15:52:05 UTC (rev 153)
@@ -63,6 +63,7 @@
new FlatObjectHibernate(),
new NestedListsHibernate(),
new InheritanceHierarchyHibernate(),
+ new ComplexHibernate(),
new MelbourneHibernate(),
new SepangHibernate(),
new BahrainHibernate(),
@@ -103,17 +104,18 @@
public static final Class[] persistentClasses() {
return new Class[] {
- IndexedObject.class,
- ListHolder.class,
- InheritanceHierarchy0.class,
- HibernatePilot.class,
- HibernateTree.class,
+ ComplexHolder0.class,
+ ComplexRoot.class,
+ HB0.class,
HibernateIndexedPilot.class,
- HB0.class,
HibernateLightObject.class,
HibernateListHolder.class,
- HN1.class,
-
+ HibernatePilot.class,
+ HibernateTree.class,
+ HN1.class,
+ IndexedObject.class,
+ InheritanceHierarchy0.class,
+ ListHolder.class,
};
}
Added: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.hbm.xml (rev 0)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -0,0 +1,36 @@
+<?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="ComplexHolder0" table="tComplexHolder0">
+ <id name="id" column="fid" type="int" />
+ <many-to-one name="previous" column="fprevious" cascade="all"/>
+ <property name="name" column="fname" type="string"/>
+ <list name="children" access="field" cascade="all">
+ <key column="parentId" />
+ <index column="elementIndex"/>
+ <many-to-many class="ComplexHolder0" />
+ </list>
+ <array name="array" access="field" cascade="all">
+ <key column="parentId" />
+ <index column="elementIndex"/>
+ <many-to-many class="ComplexHolder0"/>
+ </array>
+ <joined-subclass name="ComplexHolder1" table="tComplexHolder1">
+ <key column="parent0"/>
+ <property name="i1" column="i1" type="int"/>
+ <joined-subclass name="ComplexHolder2" table="tComplexHolder2">
+ <key column="parent1"/>
+ <property name="i2" column="i2" type="int" index="i2_idx"/>
+ <joined-subclass name="ComplexHolder3" table="tComplexHolder3">
+ <key column="parent2"/>
+ <property name="i3" column="i3" type="int"/>
+ <joined-subclass name="ComplexHolder4" table="tComplexHolder4">
+ <key column="parent3"/>
+ <property name="i4" column="i4" type="int"/>
+ </joined-subclass>
+ </joined-subclass>
+ </joined-subclass>
+ </joined-subclass>
+ </class>
+</hibernate-mapping>
Property changes on: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.hbm.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java (rev 0)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java 2010-12-02 15:52:05 UTC (rev 153)
@@ -0,0 +1,243 @@
+/*
+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;
+
+import java.util.*;
+
+import org.polepos.framework.*;
+
+import com.db4o.foundation.*;
+
+public class ComplexHolder0 implements CheckSummable {
+
+ private int id;
+
+ private ComplexHolder0 previous;
+
+ private String name;
+
+ private List<ComplexHolder0> children = new ArrayList<ComplexHolder0>();
+
+ private ComplexHolder0[] array;
+
+ private static IdGenerator _idGenerator = new IdGenerator();
+
+ public ComplexHolder0() {
+ id = (int) _idGenerator.nextId();
+ }
+
+ public static void main(String[] args) {
+ ComplexHolder0 root = generate(10, 1);
+ System.out.println(root.checkSum());
+ }
+
+ public static ComplexHolder0 generate(int depth, int leafs){
+ ComplexHolder0 complexHolder = new ComplexHolder0();
+ complexHolder.name = "root";
+ complexHolder.previous = complexHolder;
+ createChildren(complexHolder, depth -1, leafs);
+ return complexHolder;
+ }
+
+
+ private static void createChildren(ComplexHolder0 root, int depth, int numChildren) {
+ if(depth < 1){
+ return;
+ }
+ int factoryIdx = 0;
+ int holderIdx = 0;
+ List<ComplexHolder0> parentLevel = Arrays.asList(root);
+ for (int i = 0; i < depth; i++) {
+ Closure4<ComplexHolder0> curFactory = FACTORIES[factoryIdx];
+ List<ComplexHolder0> childLevel = new ArrayList<ComplexHolder0>();
+
+ ComplexHolder0 previous = null;
+ for (ComplexHolder0 curParent : parentLevel) {
+ for (int childIdx = 0; childIdx < numChildren; childIdx++) {
+ ComplexHolder0 curChild = curFactory.run();
+ curChild.name = String.valueOf(holderIdx);
+ curChild.previous = previous;
+ curChild.array = createArray(holderIdx);
+ curChild.setSpecial(holderIdx);
+ curParent.addChild(curChild);
+ childLevel.add(curChild);
+ previous = curChild;
+ holderIdx++;
+ }
+ }
+
+ parentLevel = childLevel;
+
+ factoryIdx++;
+ if(factoryIdx == FACTORIES.length) {
+ factoryIdx = 0;
+ }
+ }
+
+ }
+
+ private static ComplexHolder0[] createArray(int holderIdx) {
+ ComplexHolder0[] holders = new ComplexHolder0[] {
+ new ComplexHolder0(),
+ new ComplexHolder1(),
+ new ComplexHolder2(),
+ new ComplexHolder3(),
+ new ComplexHolder4(),
+ };
+ for (int i = 0; i < holders.length; i++) {
+ holders[i].name = "a" + holderIdx + "_" + i;
+ }
+ return holders;
+ }
+
+ public void addChild(ComplexHolder0 child) {
+ children.add(child);
+ }
+
+
+ public static final Closure4[] FACTORIES = {
+ new Closure4<ComplexHolder0>(){
+ @Override
+ public ComplexHolder0 run() {
+ return new ComplexHolder0();
+ }
+ },
+ new Closure4<ComplexHolder0>(){
+ @Override
+ public ComplexHolder0 run() {
+ return new ComplexHolder1();
+ }
+ },
+ new Closure4<ComplexHolder0>(){
+ @Override
+ public ComplexHolder0 run() {
+ return new ComplexHolder2();
+ }
+ },
+ new Closure4<ComplexHolder0>(){
+ @Override
+ public ComplexHolder0 run() {
+ return new ComplexHolder3();
+ }
+ },
+ new Closure4<ComplexHolder0>(){
+ @Override
+ public ComplexHolder0 run() {
+ return new ComplexHolder4();
+ }
+ }
+ };
+
+ @Override
+ public long checkSum() {
+
+ class CheckSumVisitor implements Visitor<ComplexHolder0> {
+
+ long checkSum;
+
+ @Override
+ public void visit(ComplexHolder0 holder) {
+ System.err.println(holder.getName() + holder.ownCheckSum());
+ checkSum += Math.abs(holder.ownCheckSum());
+ }
+ }
+ CheckSumVisitor visitor = new CheckSumVisitor();
+ traverse(visitor, new NullVisitor<ComplexHolder0>());
+ return visitor.checkSum;
+ }
+
+ public void traverse(Visitor<ComplexHolder0> preVisitor, Visitor<ComplexHolder0> postVisitor) {
+ internalTraverse(new IdentityHashMap<ComplexHolder0, ComplexHolder0>(), preVisitor, postVisitor);
+ }
+
+ private void internalTraverse(IdentityHashMap<ComplexHolder0, ComplexHolder0> visited, Visitor<ComplexHolder0> preVisitor, Visitor<ComplexHolder0> postVisitor) {
+ if(visited.containsKey(this)) {
+ System.err.println("already found " + getName() + " " + System.identityHashCode(this));
+
+ return;
+ }
+ System.err.println("Adding " + getName() + " " + System.identityHashCode(this));
+ visited.put(this, this);
+ preVisitor.visit(this);
+ for (ComplexHolder0 child : getChildren()) {
+ child.internalTraverse(visited, preVisitor, postVisitor);
+ }
+ if(getArray() != null) {
+ for (ComplexHolder0 child : getArray()) {
+ child.internalTraverse(visited, preVisitor, postVisitor);
+ }
+ }
+ if(getPrevious() != null) {
+ getPrevious().internalTraverse(visited, preVisitor, postVisitor);
+ }
+ postVisitor.visit(this);
+ }
+
+
+ public long ownCheckSum() {
+ return getName().hashCode();
+ }
+
+ protected void setSpecial(int value) {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public ComplexHolder0 getPrevious() {
+ return previous;
+ }
+
+ public void setPrevious(ComplexHolder0 holder) {
+ previous = holder;
+ }
+
+ public List<ComplexHolder0> getChildren() {
+ return children;
+ }
+
+ public void setChildren(List<ComplexHolder0> children) {
+ this.children = children;
+ }
+
+ public ComplexHolder0[] getArray() {
+ return array;
+ }
+
+ public void setArray(ComplexHolder0[] array) {
+ this.array = array;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+
+}
Property changes on: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder0.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder1.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder1.java (rev 0)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder1.java 2010-12-02 15:52:05 UTC (rev 153)
@@ -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.teams.hibernate.data;
+
+public class ComplexHolder1 extends ComplexHolder0 {
+
+ public int i1;
+
+ public int getI1() {
+ return i1;
+ }
+
+ public void setI1(int i1) {
+ this.i1 = i1;
+ }
+
+ @Override
+ public long ownCheckSum() {
+ return i1 + super.ownCheckSum();
+ }
+
+ @Override
+ protected void setSpecial(int value) {
+ super.setSpecial(value);
+ i1 = value;
+ }
+
+}
Property changes on: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder2.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder2.java (rev 0)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder2.java 2010-12-02 15:52:05 UTC (rev 153)
@@ -0,0 +1,47 @@
+/*
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA 02111-1307, USA. */
+
+
+package org.polepos.teams.hibernate.data;
+
+public class ComplexHolder2 extends ComplexHolder1 {
+
+ public int i2;
+
+ public int getI2() {
+ return i2;
+ }
+
+ public void setI2(int i2) {
+ this.i2 = i2;
+ }
+
+ @Override
+ public long ownCheckSum() {
+ return i2 + super.ownCheckSum();
+ }
+
+ @Override
+ protected void setSpecial(int value) {
+ super.setSpecial(value);
+ i2 = value;
+ }
+
+
+}
Property changes on: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder3.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder3.java (rev 0)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder3.java 2010-12-02 15:52:05 UTC (rev 153)
@@ -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.teams.hibernate.data;
+
+public class ComplexHolder3 extends ComplexHolder2 {
+
+ public int i3;
+
+ public int getI3() {
+ return i3;
+ }
+
+ public void setI3(int i3) {
+ this.i3 = i3;
+ }
+
+ @Override
+ public long ownCheckSum() {
+ return i3 + super.ownCheckSum();
+ }
+
+ @Override
+ protected void setSpecial(int value) {
+ super.setSpecial(value);
+ i3 = value;
+ }
+
+}
Property changes on: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder4.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder4.java (rev 0)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder4.java 2010-12-02 15:52:05 UTC (rev 153)
@@ -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.teams.hibernate.data;
+
+public class ComplexHolder4 extends ComplexHolder3 {
+
+ public int i4;
+
+ public int getI4() {
+ return i4;
+ }
+
+ public void setI4(int i4) {
+ this.i4 = i4;
+ }
+
+ @Override
+ public long ownCheckSum() {
+ return i4 + super.ownCheckSum();
+ }
+
+ @Override
+ protected void setSpecial(int value) {
+ super.setSpecial(value);
+ i4 = value;
+ }
+
+}
Property changes on: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexHolder4.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.hbm.xml (rev 0)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -0,0 +1,11 @@
+<?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>
Property changes on: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.hbm.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.java (rev 0)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.java 2010-12-02 15:52:05 UTC (rev 153)
@@ -0,0 +1,44 @@
+/*
+This file is part of the PolePosition database benchmark
+http://www.polepos.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA 02111-1307, USA. */
+
+
+package org.polepos.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;
+ }
+
+
+}
Property changes on: trunk/polepos/src/org/polepos/teams/hibernate/data/ComplexRoot.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/HB0.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/HB0.hbm.xml 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/HB0.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!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="HB0" table="tHB0">
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/HN1.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/HN1.hbm.xml 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/HN1.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!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="HN1" table="tHN1">
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateIndexedPilot.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateIndexedPilot.hbm.xml 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateIndexedPilot.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!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="HibernateIndexedPilot" table="tHibernateIndexedPilot">
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateLightObject.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateLightObject.hbm.xml 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateLightObject.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!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="HibernateLightObject" table="tHibernateLightObject">
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateListHolder.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateListHolder.hbm.xml 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateListHolder.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!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="HibernateListHolder" table="tHibernateListHolder">
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/HibernatePilot.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/HibernatePilot.hbm.xml 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/HibernatePilot.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!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="HibernatePilot" table="tHibernatePilot">
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateTree.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateTree.hbm.xml 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/HibernateTree.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!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="HibernateTree" table="tHibernateTree">
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/IndexedObject.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/IndexedObject.hbm.xml 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/IndexedObject.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!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="IndexedObject" table="tIndexedObject">
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/InheritanceHierarchy0.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/InheritanceHierarchy0.hbm.xml 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/InheritanceHierarchy0.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!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="InheritanceHierarchy0" table="tInheritanceHierarchy0">
Modified: trunk/polepos/src/org/polepos/teams/hibernate/data/ListHolder.hbm.xml
===================================================================
--- trunk/polepos/src/org/polepos/teams/hibernate/data/ListHolder.hbm.xml 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/hibernate/data/ListHolder.hbm.xml 2010-12-02 15:52:05 UTC (rev 153)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!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="ListHolder" table="tListHolder">
Modified: trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java 2010-12-01 15:41:11 UTC (rev 152)
+++ trunk/polepos/src/org/polepos/teams/jdbc/ComplexJdbc.java 2010-12-02 15:52:05 UTC (rev 153)
@@ -61,7 +61,7 @@
private static final int POS = 3;
- private IdGenerator _idGenerator = new IdGenerator(ROOT_ID);
+ private IdGenerator _idGenerator;
public void takeSeatIn(Car car, TurnSetup setup) throws CarMotorFailureException{
@@ -107,7 +107,7 @@
@Override
public void write() {
-
+ _idGenerator = new IdGenerator(ROOT_ID);
final Stack<Integer> parentIds = new Stack<Integer>();
final PreparedStatement complexHolder0Stat = prepareStatement("insert into complexHolder0 (id, previous, name, type) values (?,?,?,?)");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
