Author: manik.surtani(a)jboss.com Date: 2009-04-30 10:48:13 -0400 (Thu, 30 Apr 2009) New Revision: 8037 Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/coherence34.xml benchmarks/benchmark-fwk/branches/mavenized/assembly/ehcache15.xml benchmarks/benchmark-fwk/branches/mavenized/assembly/ehcache16.xml benchmarks/benchmark-fwk/branches/mavenized/assembly/framework.xml benchmarks/benchmark-fwk/branches/mavenized/assembly/hazelcast15.xml benchmarks/benchmark-fwk/branches/mavenized/assembly/infinispan40.xml benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache21.xml benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache22.xml benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache30.xml benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache31.xml benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/java/org/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/java/org/cachebench/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/java/org/cachebench/cachewrappers/ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/java/org/cachebench/cachewrappers/EHCacheWrapper.java benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/java/org/ benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/java/org/cachebench/ benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/java/org/cachebench/cachewrappers/ benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/java/org/cachebench/cachewrappers/HazelcastCacheWrapper.java benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/test/ benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/test/java/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/java/org/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/java/org/cachebench/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/java/org/cachebench/cachewrappers/ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/java/org/cachebench/cachewrappers/JBossCache310Wrapper.java benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/resources/bin/ Removed: benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml benchmarks/benchmark-fwk/branches/mavenized/bin/ Modified: benchmarks/benchmark-fwk/branches/mavenized/README.txt benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/pom.xml benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/pom.xml benchmarks/benchmark-fwk/branches/mavenized/pom.xml Log: Modified: benchmarks/benchmark-fwk/branches/mavenized/README.txt =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/README.txt 2009-04-30 13:27:45 UTC (rev 8036) +++ benchmarks/benchmark-fwk/branches/mavenized/README.txt 2009-04-30 14:48:13 UTC (rev 8037) @@ -1,6 +1,38 @@ -README.txt +This benchmark framework is used to compare distributed cache performance. -All information on this framework, including usage, is maintained online: +The framework is pluggable and can be used to test access patterns specific to your use case. - http://wiki.jboss.org/wiki/Wiki.jsp?page=CacheBenchmarkFramework +1. Building +------------ +This framework is built using Apache Maven. You neeed at least Maven 2.1.0 to build this project. + + $ mvn clean package + +is all you need to do to build the framework plus all *open source* cache providers. + +2. Building non-Open Source cache providers +-------------------------------------------- + +To do this, you need to: + +a. Edit pom.xml in the project root and uncomment the modules for commercial cache providers +b. Install the cache provider JARs in your local Maven2 repository. Just running a "mvn package" + after you have done (a.) will provide the necessary instructions. + +3. Running benchmarks +---------------------- + +After running + + $ mvn clean package + +the framework will be installed in './target/' as a ZIP file. The ZIP file can then be uploaded +to your target server for performance tests. + +To run the tests, in the directory you extract from the ZIP file, run the various scripts in the +'bin' directory. You can edit the configurations in the 'conf' directory to control the tests +run, etc. + + + Deleted: benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml 2009-04-30 13:27:45 UTC (rev 8036) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/assembly.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - - <formats> - <format>dir</format> - </formats> - - <moduleSets> - <moduleSet> - <includeSubModules>false</includeSubModules> - - <sources> - <includeModuleDirectory>false</includeModuleDirectory> - - <fileSets> - <!-- Log4j XML --> - <fileSet> - <directory>src/main/resources</directory> - <outputDirectory>${module.basedir.name}/conf</outputDirectory> - <includes> - <include>**/*.xml</include> - </includes> - </fileSet> - </fileSets> - </sources> - - <binaries> - <outputDirectory>${module.basedir.name}/lib</outputDirectory> - <outputFileNameMapping> - ${module.artifactId}.${module.extension} - </outputFileNameMapping> - <unpack>false</unpack> - <dependencySets> - <dependencySet> - <useTransitiveDependencies>true</useTransitiveDependencies> - <outputDirectory>${module.basedir.name}/lib</outputDirectory> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - </moduleSets> -</assembly> \ No newline at end of file Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/coherence34.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/coherence34.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/coherence34.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>coherence34</id> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includes> + <include>org.cachebench.wrappers:wrapper-coherence34</include> + </includes> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>${module.basedir.name}</outputDirectory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> + </sources> + + <binaries> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + <outputFileNameMapping> + ${module.artifactId}.${module.extension} + </outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/coherence34.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/ehcache15.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/ehcache15.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/ehcache15.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>ehcache15</id> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includes> + <include>org.cachebench.wrappers:wrapper-ehcache15</include> + </includes> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>${module.basedir.name}</outputDirectory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> + </sources> + + <binaries> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + <outputFileNameMapping> + ${module.artifactId}.${module.extension} + </outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/ehcache15.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/ehcache16.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/ehcache16.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/ehcache16.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>ehcache16</id> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includes> + <include>org.cachebench.wrappers:wrapper-ehcache16</include> + </includes> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>${module.basedir.name}</outputDirectory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> + </sources> + + <binaries> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + <outputFileNameMapping> + ${module.artifactId}.${module.extension} + </outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/ehcache16.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/framework.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/framework.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/framework.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>framework</id> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includes> + <include>org.cachebench:cachebench-framework</include> + </includes> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + </sources> + + <binaries> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + <outputFileNameMapping> + ${module.artifactId}.${module.extension} + </outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/framework.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/hazelcast15.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/hazelcast15.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/hazelcast15.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>hazelcast15</id> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includes> + <include>org.cachebench.wrappers:wrapper-hazelcast15</include> + </includes> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>${module.basedir.name}</outputDirectory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> + </sources> + + <binaries> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + <outputFileNameMapping> + ${module.artifactId}.${module.extension} + </outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/hazelcast15.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/infinispan40.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/infinispan40.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/infinispan40.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>infinispan40</id> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includes> + <include>org.cachebench.wrappers:wrapper-infinispan40</include> + </includes> + + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>${module.basedir.name}</outputDirectory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> + </sources> + + <binaries> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + <outputFileNameMapping> + ${module.artifactId}.${module.extension} + </outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/infinispan40.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache21.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache21.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache21.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>jbosscache21</id> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includes> + <include>org.cachebench.wrappers:wrapper-jbosscache21</include> + </includes> + + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>${module.basedir.name}</outputDirectory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> + </sources> + + <binaries> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + <outputFileNameMapping> + ${module.artifactId}.${module.extension} + </outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache21.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache22.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache22.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache22.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>jbosscache22</id> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includes> + <include>org.cachebench.wrappers:wrapper-jbosscache22</include> + </includes> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>${module.basedir.name}</outputDirectory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> + </sources> + + <binaries> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + <outputFileNameMapping> + ${module.artifactId}.${module.extension} + </outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache22.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache30.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache30.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache30.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>jbosscache30</id> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includes> + <include>org.cachebench.wrappers:wrapper-jbosscache30</include> + </includes> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>${module.basedir.name}</outputDirectory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> + </sources> + + <binaries> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + <outputFileNameMapping> + ${module.artifactId}.${module.extension} + </outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache30.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache31.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache31.xml (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache31.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>jbosscache31</id> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includes> + <include>org.cachebench.wrappers:wrapper-jbosscache31</include> + </includes> + + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>${module.basedir.name}</outputDirectory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> + </sources> + + <binaries> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + <outputFileNameMapping> + ${module.artifactId}.${module.extension} + </outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>${module.basedir.name}/lib</outputDirectory> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/assembly/jbosscache31.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/pom.xml 2009-04-30 13:27:45 UTC (rev 8036) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/pom.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -24,20 +24,7 @@ <version>2.0.0-SNAPSHOT</version> </dependency> - <!-- depend on the EHCache15 wrapper since the wrapper is essentially the same --> <dependency> - <groupId>org.cachebench.wrappers</groupId> - <artifactId>wrapper-ehcache15</artifactId> - <version>2.0.0-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> <version>1.6.0-beta3</version> Added: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/java/org/cachebench/cachewrappers/EHCacheWrapper.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/java/org/cachebench/cachewrappers/EHCacheWrapper.java (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/java/org/cachebench/cachewrappers/EHCacheWrapper.java 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,148 @@ +package org.cachebench.cachewrappers; + +import net.sf.ehcache.CacheManager; +import net.sf.ehcache.Ehcache; +import net.sf.ehcache.Element; +import net.sf.ehcache.config.Configuration; +import net.sf.ehcache.config.ConfigurationFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.cachebench.CacheWrapper; + +import java.io.Serializable; +import java.net.URL; +import java.util.List; +import java.util.Map; + + +/** + * An implementation of SerializableCacheWrapper that uses EHCache as an underlying implementation. + * <p/> + * Pass in a -Dbind.address=IP_ADDRESS + * ehcache propery files allows referencing system properties through syntax ${bind.address}. + * + * @author Manik Surtani (manik(a)surtani.org) + * @version $Id$ + */ +public class EHCacheWrapper implements CacheWrapper +{ + private CacheManager manager; + private Ehcache cache; + private Log log = LogFactory.getLog("org.cachebench.cachewrappers.EHCacheWrapper"); + boolean localmode; + + /* (non-Javadoc) + * @see org.cachebench.CacheWrapper#init(java.util.Properties) + */ + public void init(Map parameters) throws Exception + { + if (log.isTraceEnabled()) log.trace("Entering EHCacheWrapper.init()"); + localmode = (Boolean.parseBoolean((String) parameters.get("localOnly"))); + log.debug("Initializing the cache with props " + parameters); + URL url = getClass().getClassLoader().getResource((String) parameters.get("config")); + log.debug("Config URL = " + url); + Configuration c = ConfigurationFactory.parseConfiguration(url); + c.setSource("URL of " + url); + + manager = new CacheManager(c); + setUp(); + log.debug("Finish Initializing the cache"); + } + + /* (non-Javadoc) + * @see org.cachebench.CacheWrapper#setUp() + */ + public void setUp() throws Exception + { + log.info("Caches avbl:"); + for (String s : manager.getCacheNames()) log.info(" * " + s); + cache = manager.getCache("cache"); + log.info("Using named cache " + cache); + if (!localmode) + { + log.info("Bounded peers: " + manager.getCachePeerListener("RMI").getBoundCachePeers()); + log.info("Remote peers: " + manager.getCacheManagerPeerProvider("RMI").listRemoteCachePeers(cache)); + } + } + + /* (non-Javadoc) + * @see org.cachebench.CacheWrapper#tearDown() + */ + public void tearDown() throws Exception + { + manager.shutdown(); + } + + /* (non-Javadoc) + * @see org.cachebench.SerializableCacheWrapper#putSerializable(java.io.Serializable, java.io.Serializable) + */ + public void putSerializable(Serializable key, Serializable value) throws Exception + { + Element element = new Element(key, value); + cache.put(element); + } + + /* (non-Javadoc) + * @see org.cachebench.SerializableCacheWrapper#getSerializable(java.io.Serializable) + */ + public Object getSerializable(Serializable key) throws Exception + { + return cache.get(key); + } + + public void empty() throws Exception + { + cache.removeAll(); + } + + /* (non-Javadoc) + * @see org.cachebench.CacheWrapper#put(java.lang.Object, java.lang.Object) + */ + public void put(List<String> path, Object key, Object value) throws Exception + { + putSerializable((Serializable) key, (Serializable) value); + } + + /* (non-Javadoc) + * @see org.cachebench.CacheWrapper#get(java.lang.Object) + */ + public Object get(List<String> path, Object key) throws Exception + { + Object s = getSerializable((Serializable) key); + if (s instanceof Element) + { + return ((Element) s).getValue(); + } + else return s; + } + + public int getNumMembers() + { + return localmode ? 0 : manager.getCacheManagerPeerProvider("RMI").listRemoteCachePeers(cache).size(); + } + + public String getInfo() + { + return cache.getKeys().toString() + (localmode ? "" : (" remote peers: " + manager.getCachePeerListener("RMI").getBoundCachePeers())); + } + + public Object getReplicatedData(List<String> path, String key) throws Exception + { + Object o = get(path, key); + if (log.isTraceEnabled()) + { + log.trace("Result for the key: '" + key + "' is value '" + o + "'"); + } + return o; + } + + public Object startTransaction() + { + throw new UnsupportedOperationException("Does not support JTA!"); + } + + public void endTransaction(boolean successful) + { + throw new UnsupportedOperationException("Does not support JTA!"); + } +} \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/java/org/cachebench/cachewrappers/EHCacheWrapper.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/java/org/cachebench/cachewrappers/HazelcastCacheWrapper.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/java/org/cachebench/cachewrappers/HazelcastCacheWrapper.java (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/java/org/cachebench/cachewrappers/HazelcastCacheWrapper.java 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,55 @@ +package org.cachebench.cachewrappers; + +import com.hazelcast.core.IMap; +import org.cachebench.CacheWrapper; + +import java.util.List; +import java.util.Map; + +public class HazelcastCacheWrapper implements CacheWrapper { + IMap map; + + public void init(Map parameters) throws Exception { + // TODO: Customise this generated block + } + + public void setUp() throws Exception { + // TODO: Customise this generated block + } + + public void tearDown() throws Exception { + // TODO: Customise this generated block + } + + public void put(List<String> path, Object key, Object value) throws Exception { + // TODO: Customise this generated block + } + + public Object get(List<String> path, Object key) throws Exception { + return null; // TODO: Customise this generated block + } + + public void empty() throws Exception { + // TODO: Customise this generated block + } + + public int getNumMembers() { + return 0; // TODO: Customise this generated block + } + + public String getInfo() { + return null; // TODO: Customise this generated block + } + + public Object getReplicatedData(List<String> path, String key) throws Exception { + return null; // TODO: Customise this generated block + } + + public Object startTransaction() { + return null; // TODO: Customise this generated block + } + + public void endTransaction(boolean successful) { + // TODO: Customise this generated block + } +} Property changes on: benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/java/org/cachebench/cachewrappers/HazelcastCacheWrapper.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/pom.xml 2009-04-30 13:27:45 UTC (rev 8036) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/pom.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -24,21 +24,7 @@ <version>2.0.0-SNAPSHOT</version> </dependency> - <!-- depend on the jbosscache30 wrapper since the wrapper is essentially the same --> <dependency> - <groupId>org.cachebench.wrappers</groupId> - <artifactId>wrapper-jbosscache30</artifactId> - <version>2.0.0-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - </exclusion> - </exclusions> - - </dependency> - - <dependency> <groupId>org.jboss.cache</groupId> <artifactId>jbosscache-core</artifactId> <version>3.1.0.CR1</version> Added: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/java/org/cachebench/cachewrappers/JBossCache310Wrapper.java =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/java/org/cachebench/cachewrappers/JBossCache310Wrapper.java (rev 0) +++ benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/java/org/cachebench/cachewrappers/JBossCache310Wrapper.java 2009-04-30 14:48:13 UTC (rev 8037) @@ -0,0 +1,137 @@ +package org.cachebench.cachewrappers; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.cachebench.CacheWrapper; +import org.jboss.cache.Cache; +import org.jboss.cache.DefaultCacheFactory; +import org.jboss.cache.Fqn; +import org.jboss.cache.config.Option; +import org.jboss.cache.transaction.DummyTransactionManager; +import org.jboss.cache.util.Caches; + +import javax.transaction.Transaction; +import java.util.List; +import java.util.Map; + +/** + * @author Mircea.Markus(a)jboss.com + */ +public class JBossCache310Wrapper implements CacheWrapper +{ + private Cache cache; + private Map flatCache; + private Log log = LogFactory.getLog(JBossCache310Wrapper.class); + private final boolean FLAT; // this is final so that the compiler inlines it and it doesn't become a reason for a perf bottleneck + + public JBossCache310Wrapper() + { + FLAT = Boolean.getBoolean("cacheBenchFwk.useFlatCache"); + } + + public void init(Map parameters) throws Exception + { + log.info("Creating cache with the following configuration: " + parameters); + cache = new DefaultCacheFactory().createCache((String) parameters.get("config")); + log.info("Running cache with following config: " + cache.getConfiguration()); + log.info("Running following JBossCacheVersion: " + org.jboss.cache.Version.version); + log.info("Running following JBossCacheCodeName: " + org.jboss.cache.Version.codename); + if (FLAT) + { + log.info("Using FLAT MAP wrapper"); + flatCache = Caches.asMap(cache); + } + + // test using a definite 3.1.0 API + cache.getChildrenNames(Fqn.ROOT); + } + + public void setUp() throws Exception + { + } + + public void tearDown() throws Exception + { + cache.stop(); + } + + public void put(List<String> path, Object key, Object value) throws Exception + { + if (FLAT) + flatCache.put(key, value); + else + cache.put(Fqn.fromList((List) path, true), key, value); + } + + public Object get(List<String> path, Object key) throws Exception + { + if (FLAT) + return flatCache.get(key); + else + return cache.get(Fqn.fromList((List) path, true), key); + } + + public void empty() throws Exception + { + if (FLAT) + { + flatCache.clear(); + } + else + { + //not removing root because there it fails with buddy replication: http://jira.jboss.com/jira/browse/JBCACHE-1241 + cache.removeNode(Fqn.fromElements("test")); + } + } + + public int getNumMembers() + { + return cache.getMembers() == null ? 0 : cache.getMembers().size(); + } + + public String getInfo() + { + return "Num direct children: " + cache.getRoot().getChildren().size(); + } + + public Object getReplicatedData(List<String> path, String key) throws Exception + { + if (!cache.getConfiguration().getCacheMode().isSynchronous()) + { + log.info("Sleeping 5 seconds because the cache is replicated asynchronious!"); + Thread.sleep(5000); + } + Option option = cache.getInvocationContext().getOptionOverrides(); + option.setForceDataGravitation(true); + return get(path, key); + } + + + public Transaction startTransaction() + { + try + { + DummyTransactionManager.getInstance().begin(); + return DummyTransactionManager.getInstance().getTransaction(); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + + public void endTransaction(boolean successful) + { + try + { + if (successful) + DummyTransactionManager.getInstance().commit(); + else + DummyTransactionManager.getInstance().rollback(); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } +} \ No newline at end of file Property changes on: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/java/org/cachebench/cachewrappers/JBossCache310Wrapper.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: benchmarks/benchmark-fwk/branches/mavenized/framework/src/main/resources/bin (from rev 8028, benchmarks/benchmark-fwk/branches/mavenized/bin) Modified: benchmarks/benchmark-fwk/branches/mavenized/pom.xml =================================================================== --- benchmarks/benchmark-fwk/branches/mavenized/pom.xml 2009-04-30 13:27:45 UTC (rev 8036) +++ benchmarks/benchmark-fwk/branches/mavenized/pom.xml 2009-04-30 14:48:13 UTC (rev 8037) @@ -27,7 +27,8 @@ <module>caches/jbosscache31</module> <module>caches/ehcache15</module> <module>caches/ehcache16</module> - <module>caches/infinispan</module> + <module>caches/infinispan40</module> + <module>caches/hazelcast15</module> <!-- To enable this you need to have coherence in your local repo --> <!-- <module>caches/coherence34</module> --> </modules> @@ -50,13 +51,87 @@ </executions> <configuration> <descriptors> - <descriptor>assembly/assembly.xml</descriptor> + <descriptor>assembly/framework.xml</descriptor> + <descriptor>assembly/jbosscache21.xml</descriptor> + <descriptor>assembly/jbosscache22.xml</descriptor> + <descriptor>assembly/jbosscache30.xml</descriptor> + <descriptor>assembly/jbosscache31.xml</descriptor> + <!-- <descriptor>assembly/coherence34.xml</descriptor> --> + <descriptor>assembly/hazelcast15.xml</descriptor> + <descriptor>assembly/infinispan40.xml</descriptor> + <descriptor>assembly/ehcache15.xml</descriptor> + <descriptor>assembly/ehcache16.xml</descriptor> </descriptors> - <finalName>packaged</finalName> - <outputDirectory>target</outputDirectory> + <finalName>cbf</finalName> + <outputDirectory>target/out</outputDirectory> <workDirectory>target/assembly/work</workDirectory> </configuration> </plugin> + + <!-- now to fix this using ANT! --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>create-consolidated-jar</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <!-- this is a dependency of single_jar assembly --> + <mkdir dir="target/cache-bench-fwk"/> + <mkdir dir="target/cache-bench-fwk/bin"/> + <mkdir dir="target/cache-bench-fwk/conf"/> + <mkdir dir="target/cache-bench-fwk/lib"/> + <mkdir dir="target/cache-bench-fwk/caches"/> + + <copy todir="target/cache-bench-fwk/bin"> + <fileset dir="target/out/cbf-framework/cbf/main/resources/bin"> + <include name="**" /> + </fileset> + </copy> + + <copy todir="target/cache-bench-fwk/conf"> + <fileset dir="target/out/cbf-framework/cbf/main/resources/conf"> + <include name="**" /> + </fileset> + </copy> + + <copy todir="target/cache-bench-fwk/lib"> + <fileset dir="target/out/cbf-framework/cbf/lib"> + <include name="**" /> + </fileset> + </copy> + + <!-- now the modules --> + <mkdir dir="target/cache-bench-fwk/caches/ehcache15"/> + <mkdir dir="target/cache-bench-fwk/caches/ehcache16"/> + <mkdir dir="target/cache-bench-fwk/caches/hazelcast15"/> + <mkdir dir="target/cache-bench-fwk/caches/coherence34"/> + <mkdir dir="target/cache-bench-fwk/caches/ehcache15"/> + <mkdir dir="target/cache-bench-fwk/caches/ehcache15"/> + + + + + <zip destfile="target/infinispan-all.jar"> + <fileset dir="cachestore/bdbje/target/classes"/> + <fileset dir="cachestore/jdbc/target/classes"/> + <fileset dir="cachestore/s3/target/classes"/> + <fileset dir="core/target/classes"/> + <fileset dir="tree/target/classes"/> + </zip> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> </build> </project>