Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98ad8925 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98ad8925 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98ad8925 Branch: refs/heads/ignite-426 Commit: 98ad89253b8e252d36a2e3c45d44466cb5b97d02 Parents: 2421fee 90adeae Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Aug 4 10:35:34 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Aug 4 10:35:34 2015 -0700 ---------------------------------------------------------------------- .../h2/twostep/GridReduceQueryExecutor.java | 34 ++++- ...idCacheReduceQueryMultithreadedSelfTest.java | 21 ++- .../yardstick/config/benchmark-query.properties | 3 +- modules/yardstick/config/ignite-base-config.xml | 2 - .../yardstick/IgniteBenchmarkArguments.java | 11 ++ .../cache/IgniteJdbcSqlQueryBenchmark.java | 134 +++++++++++++++++++ 6 files changed, 198 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
