Merge branch 'ignite-gg-10002' 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/0180d180 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0180d180 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0180d180 Branch: refs/heads/ignite-tests-todo Commit: 0180d1803d20bfd52687a5f279b37688d616a0f8 Parents: 7e86251 5cabdf2 Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Apr 2 22:52:12 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Apr 2 22:52:12 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheTypeMetadata.java | 4 +- .../cacheobject/IgniteCacheObjectProcessor.java | 8 ++ .../IgniteCacheObjectProcessorImpl.java | 5 + .../processors/query/GridQueryProcessor.java | 143 +++++++++---------- .../messages/GridQueryNextPageResponse.java | 34 ++--- .../query/h2/twostep/GridMapQueryExecutor.java | 86 +++++++++-- .../query/h2/twostep/GridResultPage.java | 9 +- 7 files changed, 185 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0180d180/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0180d180/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ----------------------------------------------------------------------
