Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-542
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00b8a28e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00b8a28e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00b8a28e Branch: refs/heads/ignite-443 Commit: 00b8a28ec26952f6eeab795c5b3f1bba02dfc791 Parents: 3e1a05b 62f93c2 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Fri Mar 20 16:54:51 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Fri Mar 20 16:54:51 2015 -0700 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheTypeMetadata.java | 6 ++ .../ignite/cache/query/SqlFieldsQuery.java | 7 -- .../apache/ignite/cache/query/TextQuery.java | 14 ++-- .../processors/cache/IgniteCacheProxy.java | 10 ++- .../cache/query/GridCacheQueriesImpl.java | 2 +- .../cache/query/GridCacheTwoStepQuery.java | 20 ++++++ .../query/GridQueryCacheObjectsIterator.java | 70 ++++++++++++++++++++ .../processors/query/GridQueryIndexing.java | 20 +++--- .../processors/query/GridQueryProcessor.java | 62 ++++++++++------- .../ignite/internal/util/IgniteUtils.java | 16 +++++ .../processors/query/h2/IgniteH2Indexing.java | 32 ++++++--- .../h2/twostep/GridReduceQueryExecutor.java | 13 ++-- 12 files changed, 197 insertions(+), 75 deletions(-) ----------------------------------------------------------------------
