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:27 UTC
[10/10] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5075
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/96086856
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/96086856
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/96086856
Branch: refs/heads/ignite-5075
Commit: 960868561b0d1f8d453815e1a1d797e09b1fc3ad
Parents: 781e33e bc30dc7
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jun 1 17:53:09 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jun 1 17:53:09 2017 +0300
----------------------------------------------------------------------
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 5 +-
.../MemoryPolicyConfiguration.java | 20 +-
.../discovery/GridDiscoveryManager.java | 26 ++-
.../IgniteCacheDatabaseSharedManager.java | 6 +
.../cache/database/MemoryMetricsImpl.java | 20 +-
.../cache/database/MemoryMetricsMXBeanImpl.java | 10 +-
.../utils/PlatformConfigurationUtils.java | 40 +---
.../processors/query/GridQueryProcessor.java | 10 +
.../ignite/mxbean/MemoryMetricsMXBean.java | 8 +-
...dManagerMxBeanIllegalArgumentHandleTest.java | 125 +++++++++++
.../database/MemoryMetricsSelfTest.java | 10 +-
.../testsuites/IgniteBinaryBasicTestSuite.java | 35 ---
.../IgniteBinaryObjectsCacheTestSuite3.java | 13 ++
.../processors/query/h2/IgniteH2Indexing.java | 32 +--
.../query/h2/ddl/DdlStatementsProcessor.java | 42 +++-
.../query/h2/twostep/GridMapQueryExecutor.java | 2 +-
.../h2/twostep/GridReduceQueryExecutor.java | 15 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 42 ++--
.../IgniteCacheInsertSqlQuerySelfTest.java | 30 +--
.../cache/index/AbstractSchemaSelfTest.java | 28 +++
.../DynamicIndexAbstractBasicSelfTest.java | 82 ++++++-
.../DynamicIndexAbstractConcurrentSelfTest.java | 50 +++--
.../index/DynamicIndexAbstractSelfTest.java | 7 +-
.../index/H2DynamicIndexAbstractSelfTest.java | 4 +-
.../cache/index/SchemaExchangeSelfTest.java | 14 +-
.../IgniteH2IndexingSpiTestSuite.java | 37 ----
.../yardstick/config/ignite-db-base-config.xml | 118 ++++++++++
.../config/ignite-db-localhost-config.xml | 53 +++++
.../yardstick/config/ignite-rdbms-config.xml | 70 ++++++
.../config/sql/benchmark-jdbc-ignite.properties | 64 ++++++
.../sql/benchmark-mysql-ignite.properties | 66 ++++++
.../config/sql/benchmark-native.properties | 62 ++++++
.../sql/benchmark-pgsql-ignite.properties | 66 ++++++
modules/yardstick/config/sql/db-h2-queries.sql | 9 +
.../yardstick/config/sql/db-mysql-queries.sql | 14 ++
.../yardstick/config/sql/db-pgsql-queries.sql | 14 ++
.../yardstick/config/sql/h2-insert-query.sql | 1 +
.../yardstick/config/sql/rdbms-mysql-schema.sql | 5 +
.../yardstick/config/sql/rdbms-pgsql-schema.sql | 10 +
.../yardstick/IgniteBenchmarkArguments.java | 49 ++++-
.../cache/jdbc/IgniteNativeTxBenchmark.java | 169 ++++++++++++++
.../cache/jdbc/JdbcAbstractBenchmark.java | 51 ++++-
.../yardstick/cache/jdbc/JdbcPutBenchmark.java | 3 -
.../yardstick/cache/jdbc/RdbmsBenchmark.java | 220 +++++++++++++++++++
.../ignite/yardstick/cache/model/Accounts.java | 62 ++++++
.../ignite/yardstick/cache/model/Branches.java | 62 ++++++
.../ignite/yardstick/cache/model/History.java | 69 ++++++
.../ignite/yardstick/cache/model/Tellers.java | 62 ++++++
48 files changed, 1746 insertions(+), 266 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/96086856/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/96086856/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/96086856/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/96086856/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
----------------------------------------------------------------------
diff --cc modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
index 0827780,11f9472..3ba39c1
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
@@@ -84,8 -82,15 +84,16 @@@ public class IgniteBenchmarkArguments
/** */
@Parameter(names = {"-r", "--range"}, description = "Key range")
- public int range = 1_000_000;
+ @GridToStringInclude
- public int range = 1_000_000;
++ private int range = 1_000_000;
+
+ /** */
+ @Parameter(names = {"-sf", "--scaleFactor"}, description = "Scale factor")
+ private int scaleFactor = 1;
+
+ /** */
+ @Parameter(names = {"-ntv", "--native"}, description = "Native benchmarking flag")
+ private boolean ntv = false;
/** */
@Parameter(names = {"-pa", "--preloadAmount"}, description = "Data pre-loading amount for load tests")