Merge branches 'ignite-593' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-593
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d36e301c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d36e301c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d36e301c Branch: refs/heads/ignite-639 Commit: d36e301c4566d5a231b95046c7c8098f9a05d974 Parents: 44b1bb2 6c3f101 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Apr 3 14:19:25 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Apr 3 14:19:25 2015 +0700 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 29 -- .../processors/cache/GridCacheAdapter.java | 3 +- .../processors/cache/GridCacheAttributes.java | 8 - .../cache/GridCacheConcurrentMap.java | 34 +- .../processors/cache/GridCacheMapEntry.java | 28 +- .../cache/GridCacheMapEntryFactory.java | 2 - .../processors/cache/GridCacheProcessor.java | 3 - .../distributed/GridDistributedCacheEntry.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java | 16 +- .../distributed/dht/GridDhtCacheEntry.java | 4 +- .../distributed/dht/GridNoStorageCacheMap.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../dht/atomic/GridDhtAtomicCacheEntry.java | 4 +- .../dht/colocated/GridDhtColocatedCache.java | 5 +- .../colocated/GridDhtColocatedCacheEntry.java | 4 +- .../colocated/GridDhtDetachedCacheEntry.java | 5 +- .../distributed/near/GridNearCacheAdapter.java | 3 +- .../distributed/near/GridNearCacheEntry.java | 4 +- .../processors/cache/local/GridLocalCache.java | 3 +- .../cache/local/GridLocalCacheEntry.java | 3 +- .../local/atomic/GridLocalAtomicCache.java | 3 +- .../datastreamer/DataStreamerImpl.java | 21 +- .../cache/VisorCacheDefaultConfiguration.java | 11 - ...idCacheConfigurationConsistencySelfTest.java | 3 - .../GridCacheDhtEvictionsDisabledSelfTest.java | 8 +- .../distributed/dht/GridCacheDhtTestUtils.java | 2 +- .../loadtests/hashmap/GridHashMapLoadTest.java | 2 +- .../cache/ttl/CacheTtlAbstractSelfTest.java | 368 +++++++++++++++++++ .../ttl/CacheTtlOffheapAbstractSelfTest.java | 29 ++ .../CacheTtlOffheapAtomicAbstractSelfTest.java | 29 ++ .../ttl/CacheTtlOffheapAtomicLocalSelfTest.java | 34 ++ ...acheTtlOffheapAtomicPartitionedSelfTest.java | 34 ++ ...TtlOffheapTransactionalAbstractSelfTest.java | 29 ++ ...cheTtlOffheapTransactionalLocalSelfTest.java | 34 ++ ...OffheapTransactionalPartitionedSelfTest.java | 34 ++ .../ttl/CacheTtlOnheapAbstractSelfTest.java | 29 ++ .../CacheTtlOnheapAtomicAbstractSelfTest.java | 29 ++ .../ttl/CacheTtlOnheapAtomicLocalSelfTest.java | 34 ++ ...CacheTtlOnheapAtomicPartitionedSelfTest.java | 34 ++ ...eTtlOnheapTransactionalAbstractSelfTest.java | 29 ++ ...acheTtlOnheapTransactionalLocalSelfTest.java | 34 ++ ...lOnheapTransactionalPartitionedSelfTest.java | 34 ++ .../IgniteCacheWithIndexingTestSuite.java | 51 +++ .../IgniteH2IndexingSpiTestSuite.java | 7 - .../commands/cache/VisorCacheCommand.scala | 1 - 45 files changed, 950 insertions(+), 149 deletions(-) ----------------------------------------------------------------------
