Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc30dc7c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc30dc7c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc30dc7c Branch: refs/heads/master Commit: bc30dc7ccd09763c7e392d911fe62f529e36ae3b Parents: 802562e 409f6e5 Author: devozerov <[email protected]> Authored: Thu Jun 1 16:13:33 2017 +0300 Committer: devozerov <[email protected]> Committed: Thu Jun 1 16:13:33 2017 +0300 ---------------------------------------------------------------------- .../utils/PlatformConfigurationUtils.java | 40 +--- .../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 | 46 +++- .../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 ++++++ 23 files changed, 1287 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
