Repository: incubator-ignite Updated Branches: refs/heads/ignite-929 7abb6b7b1 -> c69d9efc1
Merge branch 'ignite-921' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/381c169a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/381c169a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/381c169a Branch: refs/heads/ignite-929 Commit: 381c169a067a0bb2c02c305f77847916257eda1e Parents: c32b8ca f4cc4b6 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue May 26 11:12:51 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue May 26 11:12:51 2015 -0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 15 +- .../processors/cache/GridCacheSwapManager.java | 55 ++++- .../processors/cache/IgniteCacheProxy.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 7 + .../processors/cache/query/CacheQuery.java | 2 +- .../query/GridCacheDistributedQueryManager.java | 3 + .../cache/query/GridCacheQueryAdapter.java | 28 ++- .../cache/query/GridCacheQueryManager.java | 200 ++++++++++++------- .../cache/query/GridCacheQueryRequest.java | 31 ++- .../datastructures/GridCacheSetImpl.java | 4 +- ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 6 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 112 ++++++++--- .../cache/IgniteCacheAbstractQuerySelfTest.java | 53 ++++- 14 files changed, 384 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/381c169a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
