|
From: <car...@us...> - 2011-02-18 19:10:36
|
Revision: 191
http://polepos.svn.sourceforge.net/polepos/?rev=191&view=rev
Author: carlrosenberger
Date: 2011-02-18 19:10:29 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
cr: Added InsertCentricConcurrency
Modified Paths:
--------------
trunk/polepos/settings/Circuits.properties
trunk/polepos/settings/DebugCircuits.properties
trunk/polepos/src/org/polepos/RunSeason.java
trunk/polepos/src/org/polepos/framework/TurnSetup.java
trunk/polepos/src/org/polepos/framework/TurnSetupConfig.java
trunk/polepos/src/org/polepos/reporters/RenderingReporter.java
Added Paths:
-----------
trunk/polepos/src/org/polepos/circuits/complexconcurrency/InsertCentricConcurrency.java
Modified: trunk/polepos/settings/Circuits.properties
===================================================================
--- trunk/polepos/settings/Circuits.properties 2011-02-18 18:44:02 UTC (rev 190)
+++ trunk/polepos/settings/Circuits.properties 2011-02-18 19:10:29 UTC (rev 191)
@@ -109,23 +109,34 @@
# complexconcurrency
complexconcurrency.threads=1,3,10
-complexconcurrency.time=10000,10000,10000
-complexconcurrency.objects=3,3,3
-complexconcurrency.depth=4,4,4
+complexconcurrency.time=60000,60000,60000
complexconcurrency.writes=3,3,3
complexconcurrency.selects=20,20,20
complexconcurrency.updates=2,2,2
complexconcurrency.deletes=2,2,2
+complexconcurrency.objects=3,3,3
+complexconcurrency.depth=4,4,4
# querycentricconcurrency
querycentricconcurrency.threads=1,3,10
-querycentricconcurrency.time=10000,10000,10000
-querycentricconcurrency.objects=3,3,3
-querycentricconcurrency.depth=4,4,4
+querycentricconcurrency.time=60000,60000,60000
+querycentricconcurrency.selects=300,300,300
querycentricconcurrency.writes=2,2,2
-querycentricconcurrency.selects=100,100,100
querycentricconcurrency.updates=1,1,1
querycentricconcurrency.deletes=1,1,1
+querycentricconcurrency.objects=3,3,3
+querycentricconcurrency.depth=4,4,4
+
+# insertcentricconcurrency
+
+insertcentricconcurrency.threads=1,3,10
+insertcentricconcurrency.time=60000,60000,60000
+insertcentricconcurrency.writes=10,10,10
+insertcentricconcurrency.selects=10,10,10
+insertcentricconcurrency.updates=1,1,1
+insertcentricconcurrency.deletes=1,1,1
+insertcentricconcurrency.objects=3,3,3
+insertcentricconcurrency.depth=4,4,4
Modified: trunk/polepos/settings/DebugCircuits.properties
===================================================================
--- trunk/polepos/settings/DebugCircuits.properties 2011-02-18 18:44:02 UTC (rev 190)
+++ trunk/polepos/settings/DebugCircuits.properties 2011-02-18 19:10:29 UTC (rev 191)
@@ -104,28 +104,40 @@
nativeids.commitinterval=1000,1000,1000
-
# complexconcurrency
complexconcurrency.threads=1,3,10
complexconcurrency.time=10000,10000,10000
-complexconcurrency.objects=3,3,3
-complexconcurrency.depth=4,4,4
complexconcurrency.writes=3,3,3
complexconcurrency.selects=20,20,20
complexconcurrency.updates=2,2,2
complexconcurrency.deletes=2,2,2
+complexconcurrency.objects=3,3,3
+complexconcurrency.depth=4,4,4
# querycentricconcurrency
querycentricconcurrency.threads=1,3,10
querycentricconcurrency.time=10000,10000,10000
-querycentricconcurrency.objects=3,3,3
-querycentricconcurrency.depth=4,4,4
+querycentricconcurrency.selects=300,300,300
querycentricconcurrency.writes=2,2,2
-querycentricconcurrency.selects=100,100,100
querycentricconcurrency.updates=1,1,1
querycentricconcurrency.deletes=1,1,1
+querycentricconcurrency.objects=3,3,3
+querycentricconcurrency.depth=4,4,4
+# insertcentricconcurrency
+
+insertcentricconcurrency.threads=1,3,10
+insertcentricconcurrency.time=10000,10000,10000
+insertcentricconcurrency.writes=10,10,10
+insertcentricconcurrency.selects=10,10,10
+insertcentricconcurrency.updates=1,1,1
+insertcentricconcurrency.deletes=1,1,1
+insertcentricconcurrency.objects=3,3,3
+insertcentricconcurrency.depth=4,4,4
+
+
+
Modified: trunk/polepos/src/org/polepos/RunSeason.java
===================================================================
--- trunk/polepos/src/org/polepos/RunSeason.java 2011-02-18 18:44:02 UTC (rev 190)
+++ trunk/polepos/src/org/polepos/RunSeason.java 2011-02-18 19:10:29 UTC (rev 191)
@@ -68,6 +68,7 @@
// new ComplexConcurrency(),
// new QueryCentricConcurrency(),
+// new InsertCentricConcurrency(),
// new Trees(),
// new NativeIds(),
Added: trunk/polepos/src/org/polepos/circuits/complexconcurrency/InsertCentricConcurrency.java
===================================================================
--- trunk/polepos/src/org/polepos/circuits/complexconcurrency/InsertCentricConcurrency.java (rev 0)
+++ trunk/polepos/src/org/polepos/circuits/complexconcurrency/InsertCentricConcurrency.java 2011-02-18 19:10:29 UTC (rev 191)
@@ -0,0 +1,30 @@
+/*
+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.circuits.complexconcurrency;
+
+public class InsertCentricConcurrency extends ComplexConcurrency {
+
+ @Override
+ public String description() {
+ return "runs the complex concurrent scenario with a focus on inserting many objects";
+ }
+
+}
Property changes on: trunk/polepos/src/org/polepos/circuits/complexconcurrency/InsertCentricConcurrency.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/polepos/src/org/polepos/framework/TurnSetup.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/TurnSetup.java 2011-02-18 18:44:02 UTC (rev 190)
+++ trunk/polepos/src/org/polepos/framework/TurnSetup.java 2011-02-18 19:10:29 UTC (rev 191)
@@ -124,9 +124,7 @@
}
public List<SetupProperty> properties() {
- List<SetupProperty> list = new ArrayList<SetupProperty>(mSettings.values());
- Collections.sort(list);
- return list;
+ return new ArrayList<SetupProperty>(mSettings.values());
}
public void addSetting(SetupProperty setupProperty){
Modified: trunk/polepos/src/org/polepos/framework/TurnSetupConfig.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/TurnSetupConfig.java 2011-02-18 18:44:02 UTC (rev 190)
+++ trunk/polepos/src/org/polepos/framework/TurnSetupConfig.java 2011-02-18 19:10:29 UTC (rev 191)
@@ -44,17 +44,17 @@
final static String[] AVAILABLE_SETTINGS = new String[]{
THREADCOUNT,
TIME,
- REUSE,
- OBJECTCOUNT,
SELECTCOUNT,
UPDATECOUNT,
- COMMITCOUNT,
+ WRITES,
+ DELETES,
+ OBJECTCOUNT,
TREEWIDTH,
DEPTH,
+ REUSE,
+ COMMITCOUNT,
COMMITINTERVAL,
OBJECTSIZE,
- WRITES,
- DELETES,
};
public TurnSetupConfig(String propertiesFileName){
Modified: trunk/polepos/src/org/polepos/reporters/RenderingReporter.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/RenderingReporter.java 2011-02-18 18:44:02 UTC (rev 190)
+++ trunk/polepos/src/org/polepos/reporters/RenderingReporter.java 2011-02-18 19:10:29 UTC (rev 191)
@@ -36,7 +36,9 @@
public abstract class RenderingReporter extends GraphReporter{
- public RenderingReporter(String path) {
+ private static final int MAX_PROPERTIES_TO_DISPLAY = 6;
+
+ public RenderingReporter(String path) {
super(path);
}
@@ -170,6 +172,7 @@
protected static String legend(TurnSetup setup) {
String legend = "";
boolean first = true;
+ int count = 0;
for (SetupProperty sp : setup.properties()) {
if (!first) {
legend += ", ";
@@ -179,6 +182,10 @@
legend += name + "=" + sp.value();
first = false;
}
+ count++;
+ if(count >= MAX_PROPERTIES_TO_DISPLAY){
+ return legend;
+ }
}
return legend;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
