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/10/07 16:44:31 UTC
svn commit: r1180060 - in /incubator/jena/Experimental:
JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala
JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala
TxTDB/trunk/bin/make_classpath_mvn TxTDB/trunk/bin/tdb_path
Author: andy
Date: Fri Oct 7 14:44:31 2011
New Revision: 1180060
URL: http://svn.apache.org/viewvc?rev=1180060&view=rev
Log: (empty)
Added:
incubator/jena/Experimental/TxTDB/trunk/bin/make_classpath_mvn (with props)
Modified:
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/PerfUnitLib.scala
incubator/jena/Experimental/TxTDB/trunk/bin/tdb_path
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=1180060&r1=1180059&r2=1180060&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 Fri Oct 7 14:44:31 2011
@@ -9,7 +9,7 @@ import java.text.SimpleDateFormat
object PerfMain {
def main(args: Array[String]): Unit = {
- var manifestFilename:String = "Benchmarks/LUBM/manifest.ttl"
+ var manifestFilename:String = "Benchmarks/SP2B/manifest.ttl"
if ( args.length == 1 )
manifestFilename = args(0)
else if ( args.length > 1 )
Modified: incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala?rev=1180060&r1=1180059&r2=1180060&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala Fri Oct 7 14:44:31 2011
@@ -20,6 +20,8 @@ import scala.collection.mutable.{Map =>
// }
//}
+// TODO
+// Unique ID per query.
class Collector {
case class RunUnit(name: String, id: Int, action: Action, result: Result)
private val lock: AnyRef = new AnyRef
@@ -130,6 +132,16 @@ class ReporterAgg extends Reporter {
s.max = if ( x > s.min ) x else s.max
}
- mb.foreach(x => printf("%s %d %d %d %d\n", x._1, x._2.num, x._2.total, x._2.min, x._2.max) )
+ println()
+ // CSV :-)
+ printf("Query , Average ms, Number, Total ms, Min ms , Max ms\n")
+ mb.foreach(x => {
+ val summary = x._2
+ val name = x._1
+ val avg = if ( summary.num == 0 ) 0.0 else (summary.total / summary.num)
+ printf("%-15s , %10.2f, %-6d, %-8d, %-7d, %-7d\n", name, avg, summary.num, summary.total, summary.min, summary.max)
+
+ })
+ println()
}
}
Added: incubator/jena/Experimental/TxTDB/trunk/bin/make_classpath_mvn
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/bin/make_classpath_mvn?rev=1180060&view=auto
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/bin/make_classpath_mvn (added)
+++ incubator/jena/Experimental/TxTDB/trunk/bin/make_classpath_mvn Fri Oct 7 14:44:31 2011
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+DIRROOT="$1"
+
+if [ "$DIRROOT" = "" ]
+then
+ echo "No directory given" 1>&2
+ exit 1
+ fi
+
+M2_REPO="${M2_REPO:-$HOME/.m2/repository}" ;
+X=$(perl -ne 'next unless /\spath="M2_REPO([^"]*)"/s ; print "$1","\n"' $DIRROOT/.classpath)
+
+CP=
+for x in $X
+do
+ CP="$CP:$M2_REPO$x"
+done
+
+CP="$DIRROOT/classes$CP"
+echo "$CP"
+
Propchange: incubator/jena/Experimental/TxTDB/trunk/bin/make_classpath_mvn
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/jena/Experimental/TxTDB/trunk/bin/tdb_path
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/bin/tdb_path?rev=1180060&r1=1180059&r2=1180060&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/bin/tdb_path (original)
+++ incubator/jena/Experimental/TxTDB/trunk/bin/tdb_path Fri Oct 7 14:44:31 2011
@@ -1,6 +1,11 @@
#!/bin/bash
# Sets CP
-# Adds "classes", "build/classes", "target/classes"
-CP="$($TDBROOT/bin/make_classpath "$TDBROOT")"
+# Check for development system
+if [ ! -e "$TDBROOT/lib" ]
+then
+ CP="$($TDBROOT/bin/make_classpath_mvn "$TDBROOT")"
+else
+ CP="$($TDBROOT/bin/make_classpath "$TDBROOT")"
+fi
echo "$CP"