Merge branch 'ignite-750' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e954c793 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e954c793 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e954c793 Branch: refs/heads/ignite-646 Commit: e954c7931e150435135ea33b4d3df06bc27ed660 Parents: a09cc08 939e1e8 Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Apr 23 13:33:44 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Apr 23 13:33:44 2015 +0300 ---------------------------------------------------------------------- .../processors/query/GridQueryIndexing.java | 4 ++- .../processors/query/GridQueryProcessor.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 6 ++-- .../query/h2/twostep/GridMapQueryExecutor.java | 34 +++++++++++++++++--- .../h2/twostep/GridReduceQueryExecutor.java | 34 +++++++++++++++++--- .../h2/GridIndexingSpiAbstractSelfTest.java | 2 +- 6 files changed, 68 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
