You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/05 08:10:10 UTC
[1/5] ignite git commit: IGNITE-2540: Removed unnecessary ArrayList
from GridNioServer.DirectNioClientWorker write processing methods.
Repository: ignite
Updated Branches:
refs/heads/ignite-2523 1491c1f49 -> a18c35274
IGNITE-2540: Removed unnecessary ArrayList from GridNioServer.DirectNioClientWorker write processing methods.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/afd3bc1e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/afd3bc1e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/afd3bc1e
Branch: refs/heads/ignite-2523
Commit: afd3bc1e3c249ae86071f0d15b41c6eedbdeb050
Parents: 10a2b7a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Feb 4 11:13:36 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Feb 4 11:13:36 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/util/nio/GridNioServer.java | 28 ++------------------
1 file changed, 2 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/afd3bc1e/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 84c8157..c7679c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -980,8 +980,6 @@ public class GridNioServer<T> {
NioOperationFuture<?> req = ses.removeMeta(NIO_OPERATION.ordinal());
- List<NioOperationFuture<?>> doneFuts = null;
-
while (true) {
if (req == null) {
req = (NioOperationFuture<?>)ses.pollFuture();
@@ -1012,10 +1010,7 @@ public class GridNioServer<T> {
// Fill up as many messages as possible to write buffer.
while (finished) {
- if (doneFuts == null)
- doneFuts = new ArrayList<>();
-
- doneFuts.add(req);
+ req.onDone();
req = (NioOperationFuture<?>)ses.pollFuture();
@@ -1059,13 +1054,6 @@ public class GridNioServer<T> {
if (!skipWrite) {
int cnt = sockCh.write(buf);
- if (!F.isEmpty(doneFuts)) {
- for (int i = 0; i < doneFuts.size(); i++)
- doneFuts.get(i).onDone();
-
- doneFuts.clear();
- }
-
if (log.isTraceEnabled())
log.trace("Bytes sent [sockCh=" + sockCh + ", cnt=" + cnt + ']');
@@ -1185,13 +1173,8 @@ public class GridNioServer<T> {
}
// Fill up as many messages as possible to write buffer.
- List<NioOperationFuture<?>> doneFuts = null;
-
while (finished) {
- if (doneFuts == null)
- doneFuts = new ArrayList<>();
-
- doneFuts.add(req);
+ req.onDone();
req = (NioOperationFuture<?>)ses.pollFuture();
@@ -1218,13 +1201,6 @@ public class GridNioServer<T> {
if (!skipWrite) {
int cnt = sockCh.write(buf);
- if (!F.isEmpty(doneFuts)) {
- for (int i = 0; i < doneFuts.size(); i++)
- doneFuts.get(i).onDone();
-
- doneFuts.clear();
- }
-
if (log.isTraceEnabled())
log.trace("Bytes sent [sockCh=" + sockCh + ", cnt=" + cnt + ']');
[5/5] ignite git commit: IGNITE-2523: Minors.
Posted by vo...@apache.org.
IGNITE-2523: Minors.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a18c3527
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a18c3527
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a18c3527
Branch: refs/heads/ignite-2523
Commit: a18c352748a86ac9e48885f1b6ae93ff9ed4f4dd
Parents: 11a27f7
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Feb 5 10:09:48 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Feb 5 10:09:48 2016 +0300
----------------------------------------------------------------------
.../distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a18c3527/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 879f9f3..c1dab93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -38,6 +38,7 @@ import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedExce
import org.apache.ignite.internal.processors.cache.GridCacheAffinityManager;
import org.apache.ignite.internal.processors.cache.GridCacheAtomicFuture;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
import org.apache.ignite.internal.processors.cache.GridCacheMvccManager;
import org.apache.ignite.internal.processors.cache.GridCacheOperation;
import org.apache.ignite.internal.processors.cache.GridCacheReturn;
@@ -465,13 +466,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> implem
if (log.isDebugEnabled())
log.debug("Sending near atomic update request [nodeId=" + req.nodeId() + ", req=" + req + ']');
- if (req instanceof GridNearAtomicMultipleUpdateRequest)
- cctx.io().send(req.nodeId(), (GridNearAtomicMultipleUpdateRequest)req, cctx.ioPolicy());
- else {
- assert req instanceof GridNearAtomicSingleUpdateRequest;
-
- cctx.io().send(req.nodeId(), (GridNearAtomicSingleUpdateRequest)req, cctx.ioPolicy());
- }
+ cctx.io().send(req.nodeId(), (GridCacheMessage)req, cctx.ioPolicy());
if (syncMode == FULL_ASYNC)
onDone(new GridCacheReturn(cctx, true, true, null, true));
[4/5] ignite git commit: Merge branch 'master' into ignite-2523
Posted by vo...@apache.org.
Merge branch 'master' into ignite-2523
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11a27f74
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11a27f74
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11a27f74
Branch: refs/heads/ignite-2523
Commit: 11a27f74f5a85320f6473a4cd2e59e35459cc587
Parents: 1491c1f 532b373
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Feb 5 10:07:02 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Feb 5 10:07:02 2016 +0300
----------------------------------------------------------------------
.../jmh/cache/JmhCacheAbstractBenchmark.java | 3 +
.../benchmarks/jmh/cache/JmhCacheBenchmark.java | 145 +++++++++++++++++++
.../jmh/cache/JmhCachePutBenchmark.java | 124 ----------------
.../jmh/runner/JmhIdeBenchmarkRunner.java | 20 ++-
.../ignite/internal/util/nio/GridNioServer.java | 28 +---
.../osgi-karaf/src/main/resources/features.xml | 12 +-
6 files changed, 168 insertions(+), 164 deletions(-)
----------------------------------------------------------------------
[2/5] ignite git commit: Added cache GET benchmark.
Posted by vo...@apache.org.
Added cache GET benchmark.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e2be94e6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e2be94e6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e2be94e6
Branch: refs/heads/ignite-2523
Commit: e2be94e62aecddeb7bf3409450a5a95a314ba186
Parents: afd3bc1
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Feb 4 15:31:18 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Feb 4 15:31:18 2016 +0300
----------------------------------------------------------------------
.../jmh/cache/JmhCacheAbstractBenchmark.java | 3 +
.../benchmarks/jmh/cache/JmhCacheBenchmark.java | 145 +++++++++++++++++++
.../jmh/cache/JmhCachePutBenchmark.java | 124 ----------------
.../jmh/runner/JmhIdeBenchmarkRunner.java | 20 ++-
4 files changed, 160 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2be94e6/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheAbstractBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheAbstractBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheAbstractBenchmark.java
index e8829bb..709ab77 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheAbstractBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheAbstractBenchmark.java
@@ -58,6 +58,9 @@ public class JmhCacheAbstractBenchmark extends JmhAbstractBenchmark {
/** Default amount of nodes. */
protected static final int DFLT_DATA_NODES = 1;
+ /** Items count. */
+ protected static final int CNT = 100000;
+
/** IP finder shared across nodes. */
private static final TcpDiscoveryVmIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2be94e6/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheBenchmark.java
new file mode 100644
index 0000000..f55d16c
--- /dev/null
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheBenchmark.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.benchmarks.jmh.cache;
+
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.internal.benchmarks.jmh.runner.JmhIdeBenchmarkRunner;
+import org.apache.ignite.internal.benchmarks.model.IntValue;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.profile.GCProfiler;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * Put benchmark.
+ */
+@SuppressWarnings("unchecked")
+public class JmhCacheBenchmark extends JmhCacheAbstractBenchmark {
+ /**
+ * Set up routine.
+ *
+ * @throws Exception If failed.
+ */
+
+ public void setup() throws Exception {
+ super.setup();
+
+ IgniteDataStreamer<Integer, IntValue> dataLdr = node.dataStreamer(cache.getName());
+
+ for (int i = 0; i < CNT; i++)
+ dataLdr.addData(i, new IntValue(i));
+
+ dataLdr.close();
+
+ System.out.println("Cache populated.");
+ }
+
+ /**
+ * Test PUT operation.
+ *
+ * @throws Exception If failed.
+ */
+ @Benchmark
+ public void put() throws Exception {
+ int key = ThreadLocalRandom.current().nextInt(CNT);
+
+ cache.put(key, new IntValue(key));
+ }
+
+ /**
+ * Test PUT operation.
+ *
+ * @throws Exception If failed.
+ */
+ @Benchmark
+ public Object get() throws Exception {
+ int key = ThreadLocalRandom.current().nextInt(CNT);
+
+ return cache.get(key);
+ }
+
+ /**
+ * Run benchmarks.
+ *
+ * @param args Arguments.
+ * @throws Exception If failed.
+ */
+ public static void main(String[] args) throws Exception {
+ run("put", CacheAtomicityMode.ATOMIC);
+ run("get", CacheAtomicityMode.ATOMIC);
+ run("put", CacheAtomicityMode.TRANSACTIONAL);
+ run("get", CacheAtomicityMode.TRANSACTIONAL);
+ }
+
+ /**
+ * Run benchmarks for atomic cache.
+ *
+ * @param benchmark Benchmark name.
+ * @param atomicityMode Atomicity mode.
+ * @throws Exception If failed.
+ */
+ private static void run(String benchmark, CacheAtomicityMode atomicityMode) throws Exception {
+ run(benchmark, 4, true, atomicityMode, CacheWriteSynchronizationMode.PRIMARY_SYNC);
+ run(benchmark, 4, true, atomicityMode, CacheWriteSynchronizationMode.FULL_SYNC);
+ run(benchmark, 4, false, atomicityMode, CacheWriteSynchronizationMode.PRIMARY_SYNC);
+ run(benchmark, 4, false, atomicityMode, CacheWriteSynchronizationMode.FULL_SYNC);
+ }
+
+ /**
+ * Run benchmark.
+ *
+ * @param benchmark Benchmark to run.
+ * @param threads Amount of threads.
+ * @param client Client mode flag.
+ * @param atomicityMode Atomicity mode.
+ * @param writeSyncMode Write synchronization mode.
+ * @throws Exception If failed.
+ */
+ private static void run(String benchmark, int threads, boolean client, CacheAtomicityMode atomicityMode,
+ CacheWriteSynchronizationMode writeSyncMode) throws Exception {
+ String simpleClsName = JmhCacheBenchmark.class.getSimpleName();
+
+ String output = simpleClsName + "-" + benchmark +
+ "-" + threads + "-threads" +
+ "-" + (client ? "client" : "data") +
+ "-" + atomicityMode +
+ "-" + writeSyncMode;
+
+ JmhIdeBenchmarkRunner.create()
+ .forks(1)
+ .threads(threads)
+ .warmupIterations(10)
+ .measurementIterations(60)
+ .benchmarks(simpleClsName + "." + benchmark)
+ .output(output + ".jmh.log")
+ .profilers(GCProfiler.class)
+ .jvmArguments(
+ "-Xms4g",
+ "-Xmx4g",
+ "-XX:+UnlockCommercialFeatures",
+ "-XX:+FlightRecorder",
+ "-XX:StartFlightRecording=delay=30s,dumponexit=true,settings=alloc,filename=" + output + ".jfr",
+ JmhIdeBenchmarkRunner.createProperty(PROP_ATOMICITY_MODE, atomicityMode),
+ JmhIdeBenchmarkRunner.createProperty(PROP_WRITE_SYNC_MODE, writeSyncMode),
+ JmhIdeBenchmarkRunner.createProperty(PROP_DATA_NODES, 2),
+ JmhIdeBenchmarkRunner.createProperty(PROP_CLIENT_MODE, client))
+ .run();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2be94e6/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCachePutBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCachePutBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCachePutBenchmark.java
deleted file mode 100644
index 848e7ce..0000000
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCachePutBenchmark.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.benchmarks.jmh.cache;
-
-import org.apache.ignite.IgniteDataStreamer;
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheWriteSynchronizationMode;
-import org.apache.ignite.internal.benchmarks.jmh.runner.JmhIdeBenchmarkRunner;
-import org.apache.ignite.internal.benchmarks.model.IntValue;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.profile.GCProfiler;
-
-import java.util.concurrent.ThreadLocalRandom;
-
-/**
- * Put benchmark.
- */
-@SuppressWarnings("unchecked")
-public class JmhCachePutBenchmark extends JmhCacheAbstractBenchmark {
- /** Items count. */
- private static final int CNT = 100000;
-
- /**
- * Set up routine.
- *
- * @throws Exception If failed.
- */
-
- public void setup() throws Exception {
- super.setup();
-
- IgniteDataStreamer<Integer, IntValue> dataLdr = node.dataStreamer(cache.getName());
-
- for (int i = 0; i < CNT; i++)
- dataLdr.addData(i, new IntValue(i));
-
- dataLdr.close();
-
- System.out.println("Cache populated.");
- }
-
- /**
- * Test PUT operation.
- *
- * @throws Exception If failed.
- */
- @Benchmark
- public void testPut() throws Exception {
- int key = ThreadLocalRandom.current().nextInt(CNT);
-
- cache.put(key, new IntValue(key));
- }
-
- /**
- * Run benchmarks.
- *
- * @param args Arguments.
- * @throws Exception If failed.
- */
- public static void main(String[] args) throws Exception {
- run(CacheAtomicityMode.ATOMIC);
- }
-
- /**
- * Run benchmarks for atomic cache.
- *
- * @param atomicityMode Atomicity mode.
- * @throws Exception If failed.
- */
- private static void run(CacheAtomicityMode atomicityMode) throws Exception {
- run(4, true, atomicityMode, CacheWriteSynchronizationMode.PRIMARY_SYNC);
- run(4, true, atomicityMode, CacheWriteSynchronizationMode.FULL_SYNC);
- run(4, false, atomicityMode, CacheWriteSynchronizationMode.PRIMARY_SYNC);
- run(4, false, atomicityMode, CacheWriteSynchronizationMode.FULL_SYNC);
- }
-
- /**
- * Run benchmark.
- *
- * @param client Client mode flag.
- * @param writeSyncMode Write synchronization mode.
- * @throws Exception If failed.
- */
- private static void run(int threads, boolean client, CacheAtomicityMode atomicityMode,
- CacheWriteSynchronizationMode writeSyncMode) throws Exception {
- String output = "ignite-cache-put-" + threads + "-threads-" + (client ? "client" : "data") +
- "-" + atomicityMode + "-" + writeSyncMode;
-
- JmhIdeBenchmarkRunner.create()
- .forks(1)
- .threads(threads)
- .warmupIterations(10)
- .measurementIterations(60)
- .classes(JmhCachePutBenchmark.class)
- .output(output + ".jmh.log")
- .profilers(GCProfiler.class)
- .jvmArguments(
- "-Xms4g",
- "-Xmx4g",
- "-XX:+UnlockCommercialFeatures",
- "-XX:+FlightRecorder",
- "-XX:StartFlightRecording=delay=30s,dumponexit=true,settings=alloc,filename=" + output + ".jfr",
- JmhIdeBenchmarkRunner.createProperty(PROP_ATOMICITY_MODE, atomicityMode),
- JmhIdeBenchmarkRunner.createProperty(PROP_WRITE_SYNC_MODE, writeSyncMode),
- JmhIdeBenchmarkRunner.createProperty(PROP_DATA_NODES, 2),
- JmhIdeBenchmarkRunner.createProperty(PROP_CLIENT_MODE, client))
- .run();
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2be94e6/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/runner/JmhIdeBenchmarkRunner.java
----------------------------------------------------------------------
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/runner/JmhIdeBenchmarkRunner.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/runner/JmhIdeBenchmarkRunner.java
index af84862..0cad088 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/runner/JmhIdeBenchmarkRunner.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/runner/JmhIdeBenchmarkRunner.java
@@ -42,8 +42,8 @@ public class JmhIdeBenchmarkRunner {
/** Output time unit. */
private TimeUnit outputTimeUnit = TimeUnit.SECONDS;
- /** Classes to run. */
- private Class[] clss;
+ /** Benchmarks to run. */
+ private Object[] benchmarks;
/** JVM arguments. */
private String[] jvmArgs;
@@ -123,11 +123,11 @@ public class JmhIdeBenchmarkRunner {
}
/**
- * @param clss Classes.
+ * @param benchmarks Benchmarks.
* @return This instance.
*/
- public JmhIdeBenchmarkRunner classes(Class... clss) {
- this.clss = clss;
+ public JmhIdeBenchmarkRunner benchmarks(Object... benchmarks) {
+ this.benchmarks = benchmarks;
return this;
}
@@ -191,9 +191,13 @@ public class JmhIdeBenchmarkRunner {
builder.getBenchModes().add(benchmarkMode);
}
- if (clss != null) {
- for (Class cls : clss)
- builder.include(cls.getSimpleName());
+ if (benchmarks != null) {
+ for (Object benchmark : benchmarks) {
+ if (benchmark instanceof Class)
+ builder.include(((Class)benchmark).getSimpleName());
+ else
+ builder.include(benchmark.toString());
+ }
}
if (jvmArgs != null)
[3/5] ignite git commit: Fixed broken osgi-related Kafka tests.
Posted by vo...@apache.org.
Fixed broken osgi-related Kafka tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/532b3735
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/532b3735
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/532b3735
Branch: refs/heads/ignite-2523
Commit: 532b37358de4f5c4143b6692178dca23e37f1fda
Parents: e2be94e
Author: shtykh_roman <rs...@yahoo.com>
Authored: Fri Feb 5 12:32:06 2016 +0900
Committer: shtykh_roman <rs...@yahoo.com>
Committed: Fri Feb 5 12:32:06 2016 +0900
----------------------------------------------------------------------
modules/osgi-karaf/src/main/resources/features.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/532b3735/modules/osgi-karaf/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/modules/osgi-karaf/src/main/resources/features.xml b/modules/osgi-karaf/src/main/resources/features.xml
index 983aeed..584429d 100644
--- a/modules/osgi-karaf/src/main/resources/features.xml
+++ b/modules/osgi-karaf/src/main/resources/features.xml
@@ -154,16 +154,15 @@
<feature name="ignite-kafka" version="${project.version}" description="Apache Ignite :: Kafka">
<details>
- <![CDATA[The Apache Ignite Kafka module + dependencies. This module installs the Scala 2.10 library bundle.]]>
+ <![CDATA[The Apache Ignite Kafka module + dependencies. This module installs the Scala 2.1 library bundle.]]>
</details>
<feature prerequisite="true">wrap</feature>
- <bundle start="true" dependency="true">mvn:org.scala-lang/scala-library/${scala210.library.version}</bundle>
- <bundle start="true" dependency="true">mvn:org.apache.zookeeper/zookeeper/${zookeeper.version}</bundle>
- <bundle start="true" dependency="true">wrap:mvn:com.101tec/zkclient/${zkclient.version}$Bundle-SymbolicName=zkclient&Bundle-Version=${zkclient.version}&Export-Package=*;-noimport:=true;version=${zkclient.version}</bundle>
+ <bundle start="true" dependency="true">mvn:org.scala-lang/scala-library/${scala211.library.version}</bundle>
<bundle start="true" dependency="true">wrap:mvn:com.yammer.metrics/metrics-core/${yammer.metrics.core.version}$Bundle-SymbolicName=yammer-metrics-core&Bundle-Version=2.2.0&Export-Package=*;-noimport:=true;version=${yammer.metrics.core.version}</bundle>
<bundle start="true" dependency="true">wrap:mvn:com.yammer.metrics/metrics-annotation/${yammer.metrics.annotation.version}$Bundle-SymbolicName=yammer-metrics-annotation&Bundle-Version=2.2.0&Export-Package=*;-noimport:=true;version=${yammer.metrics.annotation.version}</bundle>
- <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/${kafka.clients.bundle.version}</bundle>
- <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka_2.10/${kafka.bundle.version}</bundle>
+ <bundle start="true" dependency="true">wrap:mvn:org.apache.kafka/connect-api/${kafka.version}$Bundle-SymbolicName=connect-api&Bundle-Version=${kafka.version}</bundle>
+ <bundle start="true" dependency="true">wrap:mvn:org.apache.kafka/kafka_2.11/${kafka.version}$Bundle-SymbolicName=kafka_2.11&Bundle-Version=${kafka.version}</bundle>
+ <bundle start="true" dependency="true">wrap:mvn:org.apache.kafka/kafka-clients/${kafka.version}$Bundle-SymbolicName=kafka-clients&Bundle-Version=${kafka.version}</bundle>
<bundle start="true">mvn:org.apache.ignite/ignite-kafka/${project.version}</bundle>
</feature>
@@ -317,6 +316,7 @@
<details>
<![CDATA[The Apache Ignite ZooKeeper module + dependencies.]]>
</details>
+ <bundle start="true" dependency="true">mvn:org.apache.zookeeper/zookeeper/${zookeeper.version}</bundle>
<bundle start="true" dependency="true">mvn:com.google.guava/guava/${guava16.version}</bundle>
<bundle start="true" dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
<bundle start="true" dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>