You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/06/01 14:53:51 UTC
ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5075
Repository: ignite
Updated Branches:
refs/heads/ignite-5075 960868561 -> f270533b5
Merge remote-tracking branch 'remotes/origin/master' into ignite-5075
# Conflicts:
# modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f270533b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f270533b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f270533b
Branch: refs/heads/ignite-5075
Commit: f270533b5351c52365a544cb1867b1d56fd718f2
Parents: 9608685
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jun 1 17:53:43 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jun 1 17:53:43 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java | 2 +-
.../apache/ignite/yardstick/cache/jdbc/JdbcPutGetBenchmark.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f270533b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java
index 607be8a..96a99ff 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetBenchmark.java
@@ -38,7 +38,7 @@ public class IgniteGetBenchmark extends IgniteCacheAbstractBenchmark<Integer, Ob
/** {@inheritDoc} */
@Override protected void loadCacheData(String cacheName) {
- loadSampleValues(cacheName, args.preloadAmount);
+ loadSampleValues(cacheName, args.preloadAmount());
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/f270533b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/JdbcPutGetBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/JdbcPutGetBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/JdbcPutGetBenchmark.java
index 8ee7679..a68b2b2 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/JdbcPutGetBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/JdbcPutGetBenchmark.java
@@ -28,8 +28,8 @@ import static org.apache.ignite.yardstick.cache.jdbc.JdbcPutBenchmark.createUpse
public class JdbcPutGetBenchmark extends JdbcAbstractBenchmark {
/** {@inheritDoc} */
@Override public boolean test(Map<Object, Object> ctx) throws Exception {
- int newKey = nextRandom(args.range);
- int newVal = nextRandom(args.range);
+ int newKey = nextRandom(args.range());
+ int newVal = nextRandom(args.range());
try (PreparedStatement stmt = createUpsertStatement(conn.get(), newKey, newVal)) {
if (stmt.executeUpdate() <= 0)