Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-668
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/66260cb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/66260cb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/66260cb7 Branch: refs/heads/ignite-560 Commit: 66260cb745bdcd3232c4999bb92d80e9a1dcdbc0 Parents: cd7f1a9 adba7eb Author: sboikov <sboi...@gridgain.com> Authored: Fri Apr 3 12:43:25 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Apr 3 12:43:25 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 +- .../cache/local/GridLocalCacheEntry.java | 1 - .../processors/task/GridTaskProcessor.java | 9 +- .../cache/VisorCacheDefaultConfiguration.java | 10 - .../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 +++ .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 3 + .../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +- .../commands/cache/VisorCacheCommand.scala | 3 +- 34 files changed, 295 insertions(+), 1086 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/66260cb7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/66260cb7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ----------------------------------------------------------------------
