Permalink
Browse files

Tidy up : settings for latest runs

  • Loading branch information...
1 parent 8529cb5 commit 768f4fc668e1d74cac6a9768e63b103a66cece06 Andy Seaborne committed Nov 25, 2010
Showing with 161 additions and 170 deletions.
  1. +7 −0 Notes.txt
  2. +1 −0 genAll
  3. +4 −2 loadAll
  4. +149 −159 pom.xml
  5. +0 −9 runPerf
View
@@ -1,5 +1,8 @@
==== Build Setup
+mvn dependency:copy-dependencies -DoutputDirectory=lib-sys
+
+
# -sync can delete as well
ivy -settings ivysettings.xml -ivy ivy.xml \
-retrieve 'lib-sys/[artifact]-[revision](-[classifier]).[ext]' \
@@ -9,6 +12,10 @@ ivy -settings ivysettings.xml -ivy ivy.xml \
See run-complete for a script to drive all the scripts.
+mkdir Data
+mkdir TDB-DB
+mkdir Sesame-DB
+
genAll (choose sizes wanted)
SIZES="50k 250k" loadAll (choose sizes to load)
SIZES="50k 250k" runPerf (choose sizes to test)
View
1 genAll
@@ -27,6 +27,7 @@ function generate
java -cp "$CLASSPATH" -Xmx1024M -server benchmark.generator.Generator \
-fc -pc $pc -dir $DIR -fn "$DIR/data"
+ echo "---- gzip: $size"
gzip "$DIR/data.nt"
}
View
@@ -4,6 +4,7 @@
DIRS="${SIZES:-50k 250k 1m 5m 25m 100m 200m}"
#DIRS="200m"
+LOADER=tdbloader2
for d in $DIRS
do
@@ -22,14 +23,15 @@ do
fi
LOC="$DB/Store"
rm -rf $LOC
+ mkdir -p "$LOC"
echo "== Load ($d)"
if [ -e "$SET/data.nt" ] ; then
echo "== Load from $SET/data.nt"
- tdbloader --loc "$LOC" "$SET/data.nt"
+ $LOADER --loc "$LOC" "$SET/data.nt"
elif [ -e "$SET/data.nt.gz" ] ; then
echo "== Load from $SET/data.nt.gz"
- gzip -d < "$SET/data.nt.gz" | tdbloader --loc "$LOC" -- -
+ $LOADER --loc "$LOC" "$SET/data.nt.gz"
else
echo "No data.nt or data.nt.gz for $SET"
continue
View
308 pom.xml
@@ -1,159 +1,149 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>bsbm-local</artifactId>
- <packaging>jar</packaging>
- <name>BSBM-Local</name>
- <version>0.0.0-SNAPSHOT</version>
-
- <description>BSBM running over a local store</description>
-
- <licenses>
- <license>
- <name>BSD-style license</name>
- <url>http://openjena.org/license.html</url>
- </license>
- </licenses>
-
- <scm>
- <connection>git://github.com/afs/BSBM-Local</connection>
- <url>http://github.com/afs/BSBM-Local</url>
- </scm>
-
- <properties>
- <this.root>${project.artifactId}-${project.version}</this.root>
- <ver.jena>2.6.3</ver.jena>
- <ver.arq>2.8.6</ver.arq>
- <ver.tdb>0.8.8-SNAPSHOT</ver.tdb>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>tdb</artifactId>
- <version>${ver.tdb}</version>
- </dependency>
-
- <!-- OpenRDF Sesame -->
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-runtime</artifactId>
- <version>2.3.0</version>
- </dependency>
-
- <!-- Maven does not pull this in from sesame-runtime (but ivy does) -->
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-sail-nativerdf</artifactId>
- <version>2.3.0</version>
- </dependency>
-
- <!-- Logging -->
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>[1.2.12,)</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>src-test</testSourceDirectory>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!--<compilerArgument>-verbose</compilerArgument>-->
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <overWriteReleases>false</overWriteReleases>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <repositories>
-
- <!-- jena-repo is mirrored to Maven central repository -->
- <!-- In case mirroring has not happened yet ... -->
- <repository>
- <id>repo-jena</id>
- <name>Jena Maven - Repository</name>
- <layout>default</layout>
- <url>http://openjena.org/repo</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <!-- jena-repo-dev is where SNAPSHOTs and RCs are published -->
- <!--
- <repository>
- <id>repo-jena-dev</id>
- <name>Jena Maven - Development Repository</name>
- <layout>default</layout>
- <url>http://openjena.org/repo-dev</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- -->
-
- <repository>
- <id>repo-openrdf</id>
- <name>OpenRDF releases</name>
- <layout>default</layout>
- <url>http://repo.aduna-software.org/maven2/releases</url>
- </repository>
-
- </repositories>
-
- <distributionManagement>
- <downloadUrl>http://openjena.org/repo-dev</downloadUrl>
-
- <repository>
- <id>jena-repo</id>
- <name>Jena repo</name>
-
- <!--<url>sftp://openjena.org/var/repo</url>-->
-
- <!-- Because RC's aren't snapshots IMHO -->
- <url>sftp://openjena.org/var/repo-dev</url>
-
- <!--<url>file:tmp</url>-->
- <layout>default</layout>
- </repository>
-
- <snapshotRepository>
- <id>jena-repo-dev</id>
- <name>Jena development repo</name>
- <url>sftp://openjena.org/var/repo-dev</url>
- <!--<url>file:tmp</url>-->
- <layout>default</layout>
- </snapshotRepository>
-
- </distributionManagement>
-
-</project>
+<?xml version="1.0" encoding="utf-8"?>
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>bsbm-local</artifactId>
+ <packaging>jar</packaging>
+ <name>BSBM-Local</name>
+ <version>0.0.0-SNAPSHOT</version>
+
+ <description>BSBM running over a local store</description>
+
+ <licenses>
+ <license>
+ <name>BSD-style license</name>
+ <url>http://openjena.org/license.html</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>git://github.com/afs/BSBM-Local</connection>
+ <url>http://github.com/afs/BSBM-Local</url>
+ </scm>
+
+ <properties>
+ <this.root>${project.artifactId}-${project.version}</this.root>
+ <ver.jena>2.6.3</ver.jena>
+ <ver.arq>2.8.6</ver.arq>
+ <ver.tdb>0.8.8-SNAPSHOT</ver.tdb>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>tdb</artifactId>
+ <version>${ver.tdb}</version>
+ </dependency>
+
+ <!-- OpenRDF Sesame -->
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-runtime</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+
+ <!-- Maven does not pull this in from sesame-runtime (but ivy does) -->
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-sail-nativerdf</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+
+ <!-- Logging -->
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>[1.2.12,)</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>src-test</testSourceDirectory>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!--<compilerArgument>-verbose</compilerArgument>-->
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <repositories>
+
+ <!-- jena-repo is mirrored to Maven central repository -->
+ <!-- In case mirroring has not happened yet ... -->
+ <repository>
+ <id>repo-jena</id>
+ <name>Jena Maven - Repository</name>
+ <layout>default</layout>
+ <url>http://openjena.org/repo</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>repo-jena-dev</id>
+ <name>Jena Maven - Repository</name>
+ <layout>default</layout>
+ <url>http://openjena.org/repo-dev</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>repo-openrdf</id>
+ <name>OpenRDF releases</name>
+ <layout>default</layout>
+ <url>http://repo.aduna-software.org/maven2/releases</url>
+ </repository>
+
+ </repositories>
+
+ <distributionManagement>
+ <downloadUrl>http://openjena.org/repo-dev</downloadUrl>
+
+ <repository>
+ <id>jena-repo</id>
+ <name>Jena repo</name>
+ <url>sftp://openjena.org/var/repo</url>
+ <layout>default</layout>
+ </repository>
+
+ <snapshotRepository>
+ <id>jena-repo-dev</id>
+ <name>Jena development repo</name>
+ <url>sftp://openjena.org/var/repo-dev</url>
+ <layout>default</layout>
+ </snapshotRepository>
+
+ </distributionManagement>
+
+</project>
View
@@ -4,23 +4,14 @@
[ -d "$JENADB" ] || { echo "Not a directory: $JENADB" ; exit 1 ; }
-##DIRS="50k 250k 1m 5m 25m 100m 200m"
DIRS="${SIZES:-50k 250k 1m 5m 25m 100m 200m}"
-##rm -rf Results/*
-
-## ---- Setup
-## Need to add -Xmx1024M for 32 bit
-#PROFILE="-agentpath:c:/Progra~1/YourKi~1.13/bin/win32/yjpagent.dll"
-JVM_ARGS="-Xmx1024M -server $PROFILE"
-
# TestDriver args
# -seed 808080
# Need more runs
ARGS="-runs 10 -w 10"
# TDB logging.
-## **** RunBSBM.java has
## ????TDB_ARGS="-Dtdb:logExec=true"
PROGRAM=benchmark.testdriver.TestDriver

0 comments on commit 768f4fc

Please sign in to comment.