Merge branch 'ignite-645' 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/7cb512ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7cb512ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7cb512ac Branch: refs/heads/ignite-tests-todo Commit: 7cb512acae1476f6d740e8cb79cbd8fa9f8314a0 Parents: d173f37 6a721d7 Author: Andrey Gura <ag...@gridgain.com> Authored: Fri Apr 3 12:04:43 2015 +0300 Committer: Andrey Gura <ag...@gridgain.com> Committed: Fri Apr 3 12:04:43 2015 +0300 ---------------------------------------------------------------------- .../cache/CacheEvictableEntryImpl.java | 11 +- .../processors/cache/CacheProjection.java | 36 --- .../processors/cache/GridCacheAdapter.java | 257 +------------------ .../cache/GridCacheDeploymentManager.java | 7 +- .../processors/cache/GridCacheEntryEx.java | 55 +--- .../processors/cache/GridCacheMapEntry.java | 232 +---------------- .../processors/cache/GridCachePeekMode.java | 81 ------ .../cache/GridCacheProjectionImpl.java | 11 - .../processors/cache/GridCacheProxyImpl.java | 24 -- .../processors/cache/GridCacheUtils.java | 11 - .../distributed/dht/GridDhtCacheAdapter.java | 9 +- .../dht/atomic/GridDhtAtomicCache.java | 29 +-- .../dht/colocated/GridDhtColocatedCache.java | 30 +-- .../distributed/near/GridNearCacheAdapter.java | 72 +----- .../distributed/near/GridNearTxRemote.java | 11 +- .../processors/task/GridTaskProcessor.java | 9 +- .../resources/META-INF/classnames.properties | 1 - .../GridCachePreloadingEvictionsSelfTest.java | 4 +- .../processors/cache/GridCacheTestEntryEx.java | 40 +-- ...GridCacheDhtEvictionNearReadersSelfTest.java | 14 +- .../dht/GridCacheDhtEvictionSelfTest.java | 24 +- .../dht/GridCacheDhtMappingSelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 103 +++----- .../near/GridCacheNearOneNodeSelfTest.java | 33 +-- .../near/GridCacheNearReadersSelfTest.java | 154 +++++------ .../GridCacheReplicatedPreloadSelfTest.java | 11 +- .../processors/igfs/IgfsProcessorSelfTest.java | 3 +- .../processors/igfs/IgfsSizeSelfTest.java | 46 +--- .../junits/common/GridCommonAbstractTest.java | 42 +++ .../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +- 30 files changed, 291 insertions(+), 1073 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cb512ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cb512ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cb512ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cb512ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cb512ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cb512ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cb512ac/modules/core/src/main/resources/META-INF/classnames.properties ----------------------------------------------------------------------