Merge branches 'ignite-699' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b9273d05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b9273d05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b9273d05 Branch: refs/heads/ignite-683-2 Commit: b9273d05f058fd8da0faa10ca4787c25dfe7820a Parents: c8ffaab 9a28a15 Author: S.Vladykin <svlady...@gridgain.com> Authored: Sun Apr 12 13:00:33 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Sun Apr 12 13:00:33 2015 +0300 ---------------------------------------------------------------------- .../ignite/cache/query/SqlFieldsQuery.java | 24 +++ .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../query/h2/sql/GridSqlQuerySplitter.java | 18 +- .../IgniteCacheColocatedQuerySelfTest.java | 209 +++++++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 1 + 5 files changed, 246 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
