Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/30de9162 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/30de9162 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/30de9162 Branch: refs/heads/ignite-128 Commit: 30de91622af485be929c2b61ebb13b9fd4eb1230 Parents: 752a802 98adbfa Author: sboikov <sboi...@gridgain.com> Authored: Tue Feb 3 12:21:18 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Feb 3 12:21:18 2015 +0300 ---------------------------------------------------------------------- .../config/benchmark-atomic-win.properties | 9 +- .../config/benchmark-atomic.properties | 9 +- .../config/benchmark-query-win.properties | 5 +- .../yardstick/config/benchmark-query.properties | 5 +- .../config/benchmark-tx-win.properties | 6 +- .../yardstick/config/benchmark-tx.properties | 6 +- modules/yardstick/config/ignite-base-config.xml | 93 +++++++++++++++++++- .../cache/IgniteGetOffHeapBenchmark.java | 32 +++++++ .../cache/IgniteGetOffHeapValuesBenchmark.java | 32 +++++++ .../cache/IgnitePutGetOffHeapBenchmark.java | 32 +++++++ .../IgnitePutGetOffHeapValuesBenchmark.java | 32 +++++++ .../cache/IgnitePutGetTxOffHeapBenchmark.java | 32 +++++++ .../IgnitePutGetTxOffHeapValuesBenchmark.java | 32 +++++++ .../cache/IgnitePutOffHeapBenchmark.java | 32 +++++++ .../cache/IgnitePutOffHeapValuesBenchmark.java | 32 +++++++ .../cache/IgnitePutTxOffHeapBenchmark.java | 32 +++++++ .../IgnitePutTxOffHeapValuesBenchmark.java | 32 +++++++ .../IgniteSqlQueryJoinOffHeapBenchmark.java | 32 +++++++ .../cache/IgniteSqlQueryOffHeapBenchmark.java | 32 +++++++ .../IgniteSqlQueryPutOffHeapBenchmark.java | 32 +++++++ 20 files changed, 540 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
