Fix datastore benchmark

The benchmark slid into disrepair, fix it up again and shorten
its run length.

Change-Id: I874c0979615f289ee726e4b6926b6d9d8aba5184
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/benchmark-data-store/pom.xml b/opendaylight/md-sal/benchmark-data-store/pom.xml
index 3c16bc259a9b3b71de3e90be16ba9cf0697ff8bb..1c4dea66409c360900ab24876d47b278ad9c1319 100644 (file)
--- a/opendaylight/md-sal/benchmark-data-store/pom.xml
+++ b/opendaylight/md-sal/benchmark-data-store/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <packaging>jar</packaging>
 
   <properties>
-    <spotbugs.skip>true</spotbugs.skip>
+    <odlparent.spotbugs.skip>true</odlparent.spotbugs.skip>
   </properties>
 
   <dependencies>
@@ -33,12 +33,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.openjdk.jmh</groupId>
       <artifactId>jmh-core</artifactId>
-      <version>1.21</version>
-    </dependency>
-    <dependency>
-      <groupId>org.openjdk.jmh</groupId>
-      <artifactId>jmh-generator-annprocess</artifactId>
-      <version>1.21</version>
+      <version>1.23</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
@@ -57,6 +52,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <dependency>
+              <groupId>org.openjdk.jmh</groupId>
+              <artifactId>jmh-generator-annprocess</artifactId>
+              <version>1.23</version>
+            </dependency>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>

diff --git a/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/AbstractInMemoryWriteTransactionBenchmark.java b/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/AbstractInMemoryWriteTransactionBenchmark.java
index a2414d71ef83d228b648b68408377554058cba96..1a20e422d643ade5b98f92b18d5c86d3cb5b6331 100644 (file)
--- a/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/AbstractInMemoryWriteTransactionBenchmark.java
+++ b/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/AbstractInMemoryWriteTransactionBenchmark.java
@@ -15,7 +15,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
 public abstract class AbstractInMemoryWriteTransactionBenchmark {
     protected static final int OUTER_LIST_100K = 100000;
@@ -36,8 +36,8 @@ public abstract class AbstractInMemoryWriteTransactionBenchmark {
         return paths;
     }
 
-    protected static final int WARMUP_ITERATIONS = 20;
-    protected static final int MEASUREMENT_ITERATIONS = 20;
+    protected static final int WARMUP_ITERATIONS = 6;
+    protected static final int MEASUREMENT_ITERATIONS = 6;
 
     protected static final MapNode ONE_ITEM_INNER_LIST = initInnerListItems(1);
     protected static final MapNode TWO_ITEM_INNER_LIST = initInnerListItems(2);
@@ -73,7 +73,7 @@ public abstract class AbstractInMemoryWriteTransactionBenchmark {
         return outerListItems;
     }
 
-    protected SchemaContext schemaContext;
+    protected EffectiveModelContext schemaContext;
 
     public abstract void setUp() throws Exception;
 

diff --git a/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/BenchmarkModel.java b/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/BenchmarkModel.java
index 20e107402a2e674e44c958f239adadabfb266855..e1effd918a24767845f6b866e20de408ae7c987a 100644 (file)
--- a/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/BenchmarkModel.java
+++ b/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/BenchmarkModel.java
@@ -9,7 +9,7 @@ package org.opendaylight.controller.md.sal.dom.store.benchmark;
 
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 /**
@@ -36,7 +36,7 @@ public final class BenchmarkModel {
     private BenchmarkModel() {
     }
 
-    public static SchemaContext createTestContext() {
+    public static EffectiveModelContext createTestContext() {
         return YangParserTestUtils.parseYangResources(BenchmarkModel.class, DATASTORE_TEST_YANG);
     }
 }

diff --git a/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryBrokerWriteTransactionBenchmark.java b/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryBrokerWriteTransactionBenchmark.java
index a0a096ed33cbc256c79d3657bb777b9d336a8c90..eeeebc85f915ff1c4189908f09bbad7f40ea2ada 100644 (file)
--- a/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryBrokerWriteTransactionBenchmark.java
+++ b/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryBrokerWriteTransactionBenchmark.java
@@ -32,7 +32,7 @@ import org.openjdk.jmh.annotations.State;
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @Fork(1)
 public class InMemoryBrokerWriteTransactionBenchmark extends AbstractInMemoryBrokerWriteTransactionBenchmark {
-    private ListeningExecutorService executor;
+    private ListeningExecutorService executor = null;
 
     @Setup(Level.Trial)
     @Override
@@ -50,8 +50,8 @@ public class InMemoryBrokerWriteTransactionBenchmark extends AbstractInMemoryBro
 
         domBroker = new SerializedDOMDataBroker(datastores, executor);
         schemaContext = BenchmarkModel.createTestContext();
-        configStore.onGlobalContextUpdated(schemaContext);
-        operStore.onGlobalContextUpdated(schemaContext);
+        configStore.onModelContextUpdated(schemaContext);
+        operStore.onModelContextUpdated(schemaContext);
         initTestNode();
     }
 

diff --git a/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryDataStoreWithSameThreadedExecutorBenchmark.java b/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryDataStoreWithSameThreadedExecutorBenchmark.java
index 2e236c56e0e386cca5f941eee05eb30f853052c0..9d285985c36c9044e617b4fadd2531b3ba157e6f 100644 (file)
--- a/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryDataStoreWithSameThreadedExecutorBenchmark.java
+++ b/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryDataStoreWithSameThreadedExecutorBenchmark.java
@@ -49,7 +49,7 @@ public class InMemoryDataStoreWithSameThreadedExecutorBenchmark
 
         domStore = new InMemoryDOMDataStore("SINGLE_THREADED_DS_BENCHMARK", dataChangeListenerExecutor);
         schemaContext = BenchmarkModel.createTestContext();
-        domStore.onGlobalContextUpdated(schemaContext);
+        domStore.onModelContextUpdated(schemaContext);
         initTestNode();
     }
 

diff --git a/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryDataStoreWriteTransactionBenchmark.java b/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryDataStoreWriteTransactionBenchmark.java
index c614085fee8b15b52d881e8b87316374dbf51048..937fc67588e72e83e175f6322cc8a43e96a76e2f 100644 (file)
--- a/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryDataStoreWriteTransactionBenchmark.java
+++ b/opendaylight/md-sal/benchmark-data-store/src/main/java/org/opendaylight/controller/md/sal/dom/store/benchmark/InMemoryDataStoreWriteTransactionBenchmark.java
@@ -39,7 +39,7 @@ public class InMemoryDataStoreWriteTransactionBenchmark extends AbstractInMemory
     public void setUp() throws Exception {
         domStore = new InMemoryDOMDataStore("SINGLE_THREADED_DS_BENCHMARK", Executors.newSingleThreadExecutor());
         schemaContext = BenchmarkModel.createTestContext();
-        domStore.onGlobalContextUpdated(schemaContext);
+        domStore.onModelContextUpdated(schemaContext);
         initTestNode();
     }