You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/09/29 23:48:13 UTC
svn commit: r1177440 - in /incubator/jena/Experimental/JenaPerf/trunk: ./
classes/ classes/org/ classes/org/apache/ classes/org/apache/jena/
classes/org/apache/jena/perf/ src/main/scala/org/apache/jena/perf/
Author: andy
Date: Thu Sep 29 21:48:13 2011
New Revision: 1177440
URL: http://svn.apache.org/viewvc?rev=1177440&view=rev
Log: (empty)
Added:
incubator/jena/Experimental/JenaPerf/trunk/classes/
incubator/jena/Experimental/JenaPerf/trunk/classes/org/
incubator/jena/Experimental/JenaPerf/trunk/classes/org/apache/
incubator/jena/Experimental/JenaPerf/trunk/classes/org/apache/jena/
incubator/jena/Experimental/JenaPerf/trunk/classes/org/apache/jena/perf/
Modified:
incubator/jena/Experimental/JenaPerf/trunk/.project
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnit.scala
Modified: incubator/jena/Experimental/JenaPerf/trunk/.project
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/.project?rev=1177440&r1=1177439&r2=1177440&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/.project (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/.project Thu Sep 29 21:48:13 2011
@@ -1,5 +1,5 @@
<projectDescription>
- <name>jena-perf</name>
+ <name>JenaPerf</name>
<projects/>
<buildSpec>
<buildCommand>
Modified: incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala?rev=1177440&r1=1177439&r2=1177440&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala Thu Sep 29 21:48:13 2011
@@ -14,9 +14,26 @@ object PerfMain {
val actions = createActions()
val collector = new Collector()
- enact(actions, collector)
+ val runner = new Runner() {
+ def perform(action: Action):Unit = {
+ println(action.name) ;
+ collector.acc(action, action.perform())
+ }
+ }
+
+ val reporter = new Reporter() {
+ def report(collector: Collector): Unit = {
+ println("Acc = "+collector.results.length)
+ for (runUnit <- collector.results) {
+ //println("**"+runUnit.action.name)
+ printf("%s[%d] : %-10s %dms\n", runUnit.name, runUnit.id, runUnit.result.outcome, runUnit.result.elapsed)
+ }
+ }
+ }
+
+ enact(actions, runner)
- report(collector)
+ report(reporter, collector)
println("Finish @ "+now())
}
@@ -29,18 +46,12 @@ object PerfMain {
val action2 = new ActionByScheme("Q2", "tdb:DB", query2)
def createActions(): List[Action] = { List(action1, action2) }
- // Performing
- def enact(actions: List[Action], collector: Collector): Unit =
- actions.foreach(a => { println("Action: "+a.name) ; collector.acc(a, a.perform()) } )
-
- // Reporting
- def report(collector: Collector): Unit = {
- println("Acc = " + collector.results.length)
- for (runUnit <- collector.results) {
- println("**" + runUnit.action.name)
- printf("%s[%d] : %-10s %dms\n", runUnit.name, runUnit.id, runUnit.result.outcome, runUnit.result.elapsed)
- }
- }
+ // Performing : Runner
+ def enact(actions: List[Action], runner:Runner): Unit =
+ actions.foreach(runner.perform(_))
+
+ // Reporting : reporter
+ def report(reporter: Reporter, collector: Collector): Unit = reporter.report(collector)
val dateFmt:DateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z")
def now():String = dateFmt.format(new Date())
Modified: incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnit.scala
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnit.scala?rev=1177440&r1=1177439&r2=1177440&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnit.scala (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnit.scala Thu Sep 29 21:48:13 2011
@@ -19,12 +19,6 @@ case object Success extends Outcome("suc
case object Failure extends Outcome("failure")
case object NoOutcome extends Outcome("nothing")
-//sealed trait Outcome extends Outcome.Value
-//object Outcome extends Enum[Outcome]
-//case object Success extends Outcome
-//case object Failure extends Outcome
-//case object NoOutcome extends Outcome
-
/** Details, details */
case class Result(outcome:Outcome, elapsed:Long, startDT:Option[Date] = None, finishDT:Option[Date] = None )
{
@@ -66,3 +60,11 @@ class Collector {
resultsAcc += RunUnit(action.name, id, action, result) ; view = None ; }
}
}
+
+trait Runner {
+ def perform(action:Action)
+}
+
+trait Reporter {
+ def report(collector: Collector)
+}