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/e5aed699 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5aed699 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5aed699 Branch: refs/heads/ignite-2832 Commit: e5aed699dfbf8fe5459e5ee4e15a5680331a5703 Parents: 044ca2c 339df38 Author: vozerov-gridgain <[email protected]> Authored: Fri May 6 16:12:50 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri May 6 16:12:50 2016 +0300 ---------------------------------------------------------------------- .../config/benchmark-cache-load-win.properties | 4 +- .../config/benchmark-cache-load.properties | 2 +- .../config/ignite-base-load-config.xml | 63 ++++---- .../config/ignite-cache-load-config.xml | 1 + modules/yardstick/config/queries.txt | 2 + .../yardstick/IgniteBenchmarkArguments.java | 26 ++++ .../IgniteCacheRandomOperationBenchmark.java | 148 ++++++++++++++++++- .../yardstick/cache/load/model/ModelUtil.java | 4 +- 8 files changed, 207 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
