Merge branch 'sprint-1' into ignite-49
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6a17d4a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a17d4a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a17d4a1 Branch: refs/heads/ignite-49 Commit: 6a17d4a1bc4328fad014948581e69b57aeecc781 Parents: eb75571 7f370b8 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Mon Jan 26 08:53:14 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Mon Jan 26 08:53:14 2015 +0300 ---------------------------------------------------------------------- LICENSE.txt | 27 +++ NOTICE.txt | 15 ++ examples/pom-standalone.xml | 32 +-- .../apache/ignite/IgniteCachingProvider.java | 3 +- .../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 +++++++++++++++ 16 files changed, 586 insertions(+), 209 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a17d4a1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a17d4a1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
