Merge remote-tracking branch 'remotes/origin/ignite-53' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/906b55cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/906b55cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/906b55cb Branch: refs/heads/ignite-94 Commit: 906b55cb665e5a50f5689b7df09d39396eb578da Parents: e9ea63e 3362a61 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Jan 23 20:16:59 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Jan 23 20:16:59 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheEntryImpl.java | 8 +- .../processors/cache/GridCacheAdapter.java | 32 +++ .../processors/cache/GridCacheContext.java | 13 ++ .../processors/cache/GridCacheGateway.java | 2 + .../processors/cache/IgniteCacheProxy.java | 19 +- .../cache/datastructures/GridCacheSetImpl.java | 174 ++------------ .../cache/query/GridCacheQueryAdapter.java | 14 +- .../query/GridCacheQueryFutureAdapter.java | 7 +- .../cache/query/GridCacheQueryManager.java | 4 +- .../cache/CacheIteratorConverter.java | 39 ++++ .../cache/CacheWeakQueryIteratorsHolder.java | 228 +++++++++++++++++++ .../cache/GridCacheAbstractFullApiSelfTest.java | 178 +++++++++++++++ 12 files changed, 526 insertions(+), 192 deletions(-) ----------------------------------------------------------------------
