# IGNITE-102. Fixes to make benchmarks runnable.

apache · Jan 28, 2015 · aee11a0 · aee11a0
1 parent c9aadf0
commit aee11a0
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 38 deletions.
diff --git a/modules/yardstick/config/benchmark-atomic-win.properties b/modules/yardstick/config/benchmark-atomic-win.properties
@@ -21,7 +21,7 @@ set JVM_OPTS=%JVM_OPTS% -DGRIDGAIN_QUIET=false
 BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
 
 :: Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
 
 :: Probe point writer class name.
 :: BENCHMARK_WRITER=

diff --git a/modules/yardstick/config/benchmark-atomic.properties b/modules/yardstick/config/benchmark-atomic.properties
@@ -23,7 +23,7 @@ JVM_OPTS=${JVM_OPTS}" -DGRIDGAIN_QUIET=false"
 BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
 
 # Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
 
 # Probe point writer class name.
 # BENCHMARK_WRITER=

diff --git a/modules/yardstick/config/benchmark-compute-win.properties b/modules/yardstick/config/benchmark-compute-win.properties
@@ -21,7 +21,7 @@ set JVM_OPTS=%JVM_OPTS% -DGRIDGAIN_QUIET=false
 BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
 
 :: Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
 
 :: Probe point writer class name.
 :: BENCHMARK_WRITER=

diff --git a/modules/yardstick/config/benchmark-compute.properties b/modules/yardstick/config/benchmark-compute.properties
@@ -23,7 +23,7 @@ JVM_OPTS=${JVM_OPTS}" -DGRIDGAIN_QUIET=false"
 BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
 
 # Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
 
 # Probe point writer class name.
 # BENCHMARK_WRITER=

diff --git a/modules/yardstick/config/benchmark-query-win.properties b/modules/yardstick/config/benchmark-query-win.properties
@@ -21,7 +21,7 @@ set JVM_OPTS=%JVM_OPTS%^
 BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
 
 :: Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
 
 :: Probe point writer class name.
 :: BENCHMARK_WRITER=

diff --git a/modules/yardstick/config/benchmark-query.properties b/modules/yardstick/config/benchmark-query.properties
@@ -23,7 +23,7 @@ JVM_OPTS=${JVM_OPTS}" -DGRIDGAIN_QUIET=false" \
 BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
 
 # Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
 
 # Probe point writer class name.
 # BENCHMARK_WRITER=

diff --git a/modules/yardstick/config/benchmark-tx-win.properties b/modules/yardstick/config/benchmark-tx-win.properties
@@ -21,7 +21,7 @@ set JVM_OPTS=%JVM_OPTS% -DGRIDGAIN_QUIET=false
 BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
 
 :: Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
 
 :: Probe point writer class name.
 :: BENCHMARK_WRITER=

diff --git a/modules/yardstick/config/benchmark-tx.properties b/modules/yardstick/config/benchmark-tx.properties
@@ -23,7 +23,7 @@ JVM_OPTS=${JVM_OPTS}" -DGRIDGAIN_QUIET=false"
 BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
 
 # Packages where the specified benchmark is searched by reflection mechanism, comma separated.
-BENCHMARK_PACKAGES=org.yardstickframework
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
 
 # Probe point writer class name.
 # BENCHMARK_WRITER=

diff --git a/modules/yardstick/config/benchmark-win.properties b/modules/yardstick/config/benchmark-win.properties
@@ -24,7 +24,7 @@ set JVM_OPTS=%JVM_OPTS% -DGRIDGAIN_QUIET=false
 BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
 
 :: Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
 
 :: Probe point writer class name.
 :: BENCHMARK_WRITER=

diff --git a/modules/yardstick/config/benchmark.properties b/modules/yardstick/config/benchmark.properties
@@ -26,7 +26,7 @@ JVM_OPTS=${JVM_OPTS}" -DGRIDGAIN_QUIET=false"
 BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
 
 # Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework
+BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
 
 # Probe point writer class name.
 # BENCHMARK_WRITER=

diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml
@@ -24,7 +24,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    <bean id="base-grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" abstract="true">
+    <bean id="base-ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" abstract="true">
         <property name="peerClassLoadingEnabled" value="false"/>
 
         <!--property name="marshaller">
@@ -46,7 +46,7 @@
 
         <property name="cacheConfiguration">
             <list>
-                <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+                <bean class="org.apache.ignite.cache.CacheConfiguration">
                     <property name="name" value="atomic"/>
 
                     <property name="cacheMode" value="PARTITIONED"/>
@@ -58,7 +58,7 @@
                     <property name="queryIndexEnabled" value="false"/>
                 </bean>
 
-                <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+                <bean class="org.apache.ignite.cache.CacheConfiguration">
                     <property name="name" value="tx"/>
 
                     <property name="cacheMode" value="PARTITIONED"/>
@@ -70,7 +70,7 @@
                     <property name="queryIndexEnabled" value="false"/>
                 </bean>
 
-                <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+                <bean class="org.apache.ignite.cache.CacheConfiguration">
                     <property name="name" value="query"/>
 
                     <property name="cacheMode" value="PARTITIONED"/>
@@ -83,7 +83,7 @@
                     <property name="queryIndexEnabled" value="true"/>
                 </bean>
 
-                <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+                <bean class="org.apache.ignite.cache.CacheConfiguration">
                     <property name="name" value="compute"/>
 
                     <property name="cacheMode" value="PARTITIONED"/>

diff --git a/modules/yardstick/config/ignite-localhost-config.xml b/modules/yardstick/config/ignite-localhost-config.xml
@@ -24,9 +24,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    <import resource="gridgain-base-config.xml"/>
+    <import resource="ignite-base-config.xml"/>
 
-    <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" parent="base-grid.cfg">
+    <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" parent="base-ignite.cfg">
         <property name="localHost" value="127.0.0.1"/>
 
         <property name="discoverySpi">

diff --git a/modules/yardstick/config/ignite-multicast-config.xml b/modules/yardstick/config/ignite-multicast-config.xml
@@ -24,9 +24,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    <import resource="gridgain-base-config.xml"/>
+    <import resource="ignite-base-config.xml"/>
 
-    <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" parent="base-grid.cfg">
+    <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" parent="base-ignite.cfg">
         <property name="discoverySpi">
             <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
                 <property name="ipFinder">

diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
@@ -172,6 +172,14 @@
                     </filesets>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
@@ -24,8 +24,8 @@
 
 import java.util.concurrent.*;
 
-import static org.apache.ignite.events.IgniteEventType.*;
 import static org.apache.ignite.cache.CacheDistributionMode.*;
+import static org.apache.ignite.events.IgniteEventType.*;
 import static org.yardstickframework.BenchmarkUtils.*;
 
 /**
@@ -42,7 +42,7 @@ public abstract class IgniteAbstractBenchmark extends BenchmarkDriverAdapter {
     @Override public void setUp(BenchmarkConfiguration cfg) throws Exception {
         super.setUp(cfg);
 
-        jcommander(cfg.commandLineArguments(), args, "<gridgain-driver>");
+        jcommander(cfg.commandLineArguments(), args, "<ignite-driver>");
 
         if (Ignition.state() != IgniteState.STARTED) {
             node = new IgniteNode(args.distributionMode() == CLIENT_ONLY);
@@ -79,7 +79,7 @@ public abstract class IgniteAbstractBenchmark extends BenchmarkDriverAdapter {
      * @return Grid.
      */
     protected Ignite grid() {
-        return node.grid();
+        return node.ignite();
     }
 
     /**

diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -40,7 +40,7 @@
  */
 public class IgniteNode implements BenchmarkServer {
     /** Grid instance. */
-    private Ignite grid;
+    private Ignite ignite;
 
     /** Client mode. */
     private boolean clientMode;
@@ -56,16 +56,16 @@ public IgniteNode(boolean clientMode) {
     }
 
     /** */
-    public IgniteNode(boolean clientMode, Ignite grid) {
+    public IgniteNode(boolean clientMode, Ignite ignite) {
         this.clientMode = clientMode;
-        this.grid = grid;
+        this.ignite = ignite;
     }
 
     /** {@inheritDoc} */
     @Override public void start(BenchmarkConfiguration cfg) throws Exception {
         IgniteBenchmarkArguments args = new IgniteBenchmarkArguments();
 
-        BenchmarkUtils.jcommander(cfg.commandLineArguments(), args, "<gridgain-node>");
+        BenchmarkUtils.jcommander(cfg.commandLineArguments(), args, "<ignite-node>");
 
         IgniteConfiguration c = loadConfiguration(args.configuration());
 
@@ -119,7 +119,7 @@ public IgniteNode(boolean clientMode, Ignite grid) {
 
         c.setCommunicationSpi(commSpi);
 
-        grid = Ignition.start(c);
+        ignite = Ignition.start(c);
     }
 
     /**
@@ -167,7 +167,7 @@ private static IgniteConfiguration loadConfiguration(String springCfgPath) throw
         }
 
         if (cfgMap == null || cfgMap.isEmpty())
-            throw new Exception("Failed to find grid configuration in: " + url);
+            throw new Exception("Failed to find ignite configuration in: " + url);
 
         return cfgMap.values().iterator().next();
     }
@@ -183,9 +183,9 @@ private static IgniteConfiguration loadConfiguration(String springCfgPath) throw
     }
 
     /**
-     * @return Grid.
+     * @return Ignite.
      */
-    public Ignite grid() {
-        return grid;
+    public Ignite ignite() {
+        return ignite;
     }
 }
diff --git a/...stick/cache/IgnitePutBenchmarkIgnite.java → ...e/yardstick/cache/IgnitePutBenchmark.java b/...stick/cache/IgnitePutBenchmarkIgnite.java → ...e/yardstick/cache/IgnitePutBenchmark.java
@@ -25,7 +25,7 @@
 /**
  * GridGain benchmark that performs put operations.
  */
-public class IgnitePutBenchmarkIgnite extends IgniteCacheAbstractBenchmark {
+public class IgnitePutBenchmark extends IgniteCacheAbstractBenchmark {
     /** {@inheritDoc} */
     @Override public boolean test(Map<Object, Object> ctx) throws Exception {
         int key = nextRandom(args.range());

diff --git a/...ck/cache/IgnitePutGetBenchmarkIgnite.java → ...ardstick/cache/IgnitePutGetBenchmark.java b/...ck/cache/IgnitePutGetBenchmarkIgnite.java → ...ardstick/cache/IgnitePutGetBenchmark.java
@@ -25,7 +25,7 @@
 /**
  * GridGain benchmark that performs put and get operations.
  */
-public class IgnitePutGetBenchmarkIgnite extends IgniteCacheAbstractBenchmark {
+public class IgnitePutGetBenchmark extends IgniteCacheAbstractBenchmark {
     /** {@inheritDoc} */
     @Override public boolean test(Map<Object, Object> ctx) throws Exception {
         int key = nextRandom(args.range());

diff --git a/.../cache/IgnitePutGetTxBenchmarkIgnite.java → ...dstick/cache/IgnitePutGetTxBenchmark.java b/.../cache/IgnitePutGetTxBenchmarkIgnite.java → ...dstick/cache/IgnitePutGetTxBenchmark.java
@@ -26,7 +26,7 @@
 /**
  * GridGain benchmark that performs transactional put and get operations.
  */
-public class IgnitePutGetTxBenchmarkIgnite extends IgniteCacheAbstractBenchmark {
+public class IgnitePutGetTxBenchmark extends IgniteCacheAbstractBenchmark {
     /** {@inheritDoc} */
     @Override public boolean test(Map<Object, Object> ctx) throws Exception {
         int key = nextRandom(0, args.range() / 2);

diff --git a/...ick/cache/IgnitePutTxBenchmarkIgnite.java → ...yardstick/cache/IgnitePutTxBenchmark.java b/...ick/cache/IgnitePutTxBenchmarkIgnite.java → ...yardstick/cache/IgnitePutTxBenchmark.java
@@ -25,7 +25,7 @@
 /**
  * GridGain benchmark that performs transactional put operations.
  */
-public class IgnitePutTxBenchmarkIgnite extends IgniteCacheAbstractBenchmark {
+public class IgnitePutTxBenchmark extends IgniteCacheAbstractBenchmark {
     /** {@inheritDoc} */
     @Override public boolean test(Map<Object, Object> ctx) throws Exception {
         int key = nextRandom(args.range());

diff --git a/.../cache/IgniteSqlQueryBenchmarkIgnite.java → ...dstick/cache/IgniteSqlQueryBenchmark.java b/.../cache/IgniteSqlQueryBenchmarkIgnite.java → ...dstick/cache/IgniteSqlQueryBenchmark.java
@@ -30,7 +30,7 @@
 /**
  * GridGain benchmark that performs query operations.
  */
-public class IgniteSqlQueryBenchmarkIgnite extends IgniteCacheAbstractBenchmark {
+public class IgniteSqlQueryBenchmark extends IgniteCacheAbstractBenchmark {
     /** */
     private CacheQuery qry;
 

diff --git a/...he/IgniteSqlQueryJoinBenchmarkIgnite.java → ...ck/cache/IgniteSqlQueryJoinBenchmark.java b/...he/IgniteSqlQueryJoinBenchmarkIgnite.java → ...ck/cache/IgniteSqlQueryJoinBenchmark.java
@@ -30,7 +30,7 @@
 /**
  * GridGain benchmark that performs query operations with joins.
  */
-public class IgniteSqlQueryJoinBenchmarkIgnite extends IgniteCacheAbstractBenchmark {
+public class IgniteSqlQueryJoinBenchmark extends IgniteCacheAbstractBenchmark {
     /** */
     private CacheQuery qry;
 

diff --git a/...che/IgniteSqlQueryPutBenchmarkIgnite.java → ...ick/cache/IgniteSqlQueryPutBenchmark.java b/...che/IgniteSqlQueryPutBenchmarkIgnite.java → ...ick/cache/IgniteSqlQueryPutBenchmark.java
@@ -28,7 +28,7 @@
 /**
  * GridGain benchmark that performs put and query operations.
  */
-public class IgniteSqlQueryPutBenchmarkIgnite extends IgniteCacheAbstractBenchmark {
+public class IgniteSqlQueryPutBenchmark extends IgniteCacheAbstractBenchmark {
     /** */
     private CacheQuery qry;