|
From: <pat...@us...> - 2010-11-29 16:02:46
|
Revision: 147
http://polepos.svn.sourceforge.net/polepos/?rev=147&view=rev
Author: patrickroemer
Date: 2010-11-29 16:02:39 +0000 (Mon, 29 Nov 2010)
Log Message:
-----------
cr/pr - specialized fields in inheritance hierarchy
Modified Paths:
--------------
trunk/polepos/settings/Circuits.properties
trunk/polepos/settings/DebugCircuits.properties
trunk/polepos/src/org/polepos/data/ComplexHolder0.java
trunk/polepos/src/org/polepos/data/ComplexHolder1.java
trunk/polepos/src/org/polepos/data/ComplexHolder2.java
trunk/polepos/src/org/polepos/data/ComplexHolder3.java
trunk/polepos/src/org/polepos/data/ComplexHolder4.java
trunk/polepos/src/org/polepos/teams/db4o/ComplexDb4o.java
Modified: trunk/polepos/settings/Circuits.properties
===================================================================
--- trunk/polepos/settings/Circuits.properties 2010-11-29 15:35:16 UTC (rev 146)
+++ trunk/polepos/settings/Circuits.properties 2010-11-29 16:02:39 UTC (rev 147)
@@ -42,7 +42,7 @@
# [objects]: number of objects to select from
# [selects]: number of queries run against all objects
-complex.depth=3,4,5
+complex.depth=7
complex.objects=5,5,5
complex.selects=100,100,100
Modified: trunk/polepos/settings/DebugCircuits.properties
===================================================================
--- trunk/polepos/settings/DebugCircuits.properties 2010-11-29 15:35:16 UTC (rev 146)
+++ trunk/polepos/settings/DebugCircuits.properties 2010-11-29 16:02:39 UTC (rev 147)
@@ -42,7 +42,7 @@
# [objects]: number of objects to select from
# [selects]: number of queries run against all objects
-complex.depth=3,4,5
+complex.depth=5,6
complex.objects=5,5,5
complex.selects=100,100,100
Modified: trunk/polepos/src/org/polepos/data/ComplexHolder0.java
===================================================================
--- trunk/polepos/src/org/polepos/data/ComplexHolder0.java 2010-11-29 15:35:16 UTC (rev 146)
+++ trunk/polepos/src/org/polepos/data/ComplexHolder0.java 2010-11-29 16:02:39 UTC (rev 147)
@@ -69,6 +69,7 @@
curChild._name = String.valueOf(holderIdx);
curChild._previous = previous;
curChild._array = createArray(holderIdx);
+ curChild.setSpecial(holderIdx);
curParent.addChild(curChild);
childLevel.add(curChild);
previous = curChild;
@@ -167,5 +168,6 @@
return _name.hashCode();
}
-
+ protected void setSpecial(int value) {
+ }
}
Modified: trunk/polepos/src/org/polepos/data/ComplexHolder1.java
===================================================================
--- trunk/polepos/src/org/polepos/data/ComplexHolder1.java 2010-11-29 15:35:16 UTC (rev 146)
+++ trunk/polepos/src/org/polepos/data/ComplexHolder1.java 2010-11-29 16:02:39 UTC (rev 147)
@@ -28,4 +28,9 @@
return _i1 + super.internalCheckSum();
}
+ protected void setSpecial(int value) {
+ super.setSpecial(value);
+ _i1 = value;
+ }
+
}
Modified: trunk/polepos/src/org/polepos/data/ComplexHolder2.java
===================================================================
--- trunk/polepos/src/org/polepos/data/ComplexHolder2.java 2010-11-29 15:35:16 UTC (rev 146)
+++ trunk/polepos/src/org/polepos/data/ComplexHolder2.java 2010-11-29 16:02:39 UTC (rev 147)
@@ -22,10 +22,15 @@
public class ComplexHolder2 extends ComplexHolder1 {
- private int _i2;
+ public int _i2;
protected long internalCheckSum() {
return _i2 + super.internalCheckSum();
}
+ protected void setSpecial(int value) {
+ super.setSpecial(value);
+ _i2 = value;
+ }
+
}
Modified: trunk/polepos/src/org/polepos/data/ComplexHolder3.java
===================================================================
--- trunk/polepos/src/org/polepos/data/ComplexHolder3.java 2010-11-29 15:35:16 UTC (rev 146)
+++ trunk/polepos/src/org/polepos/data/ComplexHolder3.java 2010-11-29 16:02:39 UTC (rev 147)
@@ -28,4 +28,9 @@
return _i3 + super.internalCheckSum();
}
+ protected void setSpecial(int value) {
+ super.setSpecial(value);
+ _i3 = value;
+ }
+
}
Modified: trunk/polepos/src/org/polepos/data/ComplexHolder4.java
===================================================================
--- trunk/polepos/src/org/polepos/data/ComplexHolder4.java 2010-11-29 15:35:16 UTC (rev 146)
+++ trunk/polepos/src/org/polepos/data/ComplexHolder4.java 2010-11-29 16:02:39 UTC (rev 147)
@@ -28,4 +28,9 @@
return _i4 + super.internalCheckSum();
}
+ protected void setSpecial(int value) {
+ super.setSpecial(value);
+ _i4 = value;
+ }
+
}
Modified: trunk/polepos/src/org/polepos/teams/db4o/ComplexDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/ComplexDb4o.java 2010-11-29 15:35:16 UTC (rev 146)
+++ trunk/polepos/src/org/polepos/teams/db4o/ComplexDb4o.java 2010-11-29 16:02:39 UTC (rev 147)
@@ -25,6 +25,7 @@
import com.db4o.*;
import com.db4o.config.*;
+import com.db4o.query.*;
public class ComplexDb4o extends Db4oDriver implements Complex {
@@ -48,8 +49,23 @@
@Override
public void query() {
- // TODO Auto-generated method stub
-
+ int holderId = objectCount() * objectCount() + objectCount();
+ System.err.println("QUERYING FOR " + holderId);
+ Query query = db().query();
+ query.constrain(ComplexHolder2.class);
+// query.descend("_id2").constrain(holderId);
+ ObjectSet<ComplexHolder2> result = query.execute();
+// if(result.size() != 1) {
+// throw new IllegalStateException("" + result.size());
+// }
+ for (ComplexHolder2 holder : result) {
+ if(holder.getClass() == ComplexHolder2.class) {
+ System.err.println(holder._i2);
+ }
+ }
+ ComplexHolder2 holder = result.get(0);
+ db().activate(holder, Integer.MAX_VALUE);
+ addToCheckSum(holder);
}
@Override
@@ -66,7 +82,7 @@
@Override
public void configure(Configuration config) {
-
+ config.objectClass(ComplexHolder2.class).objectField("_i2").indexed(true);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
