Merge remote-tracking branch 'remotes/upstream/gridgain-7.6.1'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f633eea5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f633eea5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f633eea5 Branch: refs/heads/master Commit: f633eea5acfb669933f1e13f1f3e709ae5111720 Parents: 4cc1098 1da1436 Author: Anton Vinogradov <[email protected]> Authored: Thu Jun 2 17:03:12 2016 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Jun 2 17:03:12 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 43 +- .../processors/cache/GridCacheContext.java | 7 +- .../processors/cache/GridCacheEntryEx.java | 3 +- .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheSwapManager.java | 67 ++- .../distributed/dht/GridDhtCacheAdapter.java | 11 +- .../cache/query/GridCacheQueryManager.java | 9 +- .../processors/cache/GridCacheTestEntryEx.java | 2 +- .../cache/IgniteCachePeekModesAbstractTest.java | 8 +- ...CacheKeepBinaryIterationNearEnabledTest.java | 44 ++ ...acheKeepBinaryIterationStoreEnabledTest.java | 90 ++++ ...CacheKeepBinaryIterationSwapEnabledTest.java | 56 +++ .../CacheKeepBinaryIterationTest.java | 471 +++++++++++++++++++ .../IgniteCacheQuerySelfTestSuite3.java | 8 + 15 files changed, 762 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f633eea5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ----------------------------------------------------------------------
