Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-929
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/921057f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/921057f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/921057f1 Branch: refs/heads/ignite-929 Commit: 921057f1fd0e9c93386b265206e9f6fcace66b54 Parents: 39d9b8f 97d0bc1 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Jun 4 12:53:58 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Jun 4 12:53:58 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-visor-console.xml | 6 +- .../ignite/cache/eviction/EvictableEntry.java | 7 + .../ignite/cache/eviction/EvictionPolicy.java | 2 + .../cache/eviction/fifo/FifoEvictionPolicy.java | 117 +- .../eviction/fifo/FifoEvictionPolicyMBean.java | 22 + .../cache/eviction/lru/LruEvictionPolicy.java | 135 ++- .../eviction/lru/LruEvictionPolicyMBean.java | 38 + .../eviction/random/RandomEvictionPolicy.java | 10 +- .../eviction/sorted/SortedEvictionPolicy.java | 141 ++- .../sorted/SortedEvictionPolicyMBean.java | 22 + .../apache/ignite/cache/query/QueryMetrics.java | 6 +- .../discovery/GridDiscoveryManager.java | 4 +- .../cache/CacheEvictableEntryImpl.java | 31 + .../processors/cache/CacheMetricsImpl.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 64 +- .../cache/distributed/dht/GridDhtGetFuture.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 13 +- .../GridDhtPartitionsExchangeFuture.java | 46 +- .../dht/preloader/GridDhtPreloader.java | 9 +- .../local/atomic/GridLocalAtomicCache.java | 25 +- .../cache/query/GridCacheQueryAdapter.java | 12 +- .../processors/query/GridQueryProcessor.java | 305 +++-- .../cache/GridCacheAbstractFullApiSelfTest.java | 27 + .../cache/GridCacheAbstractMetricsSelfTest.java | 48 +- .../GridCacheConcurrentTxMultiNodeTest.java | 8 +- ...idCacheConfigurationConsistencySelfTest.java | 14 +- .../cache/GridCacheMemoryModeSelfTest.java | 23 +- .../processors/cache/GridCacheOffHeapTest.java | 5 +- .../cache/GridCacheReloadSelfTest.java | 6 +- .../cache/IgniteCachePeekModesAbstractTest.java | 5 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 11 +- .../dht/GridCacheDhtEvictionSelfTest.java | 11 +- .../dht/IgniteCacheMultiTxLockSelfTest.java | 6 +- .../GridCachePartitionedEvictionSelfTest.java | 11 +- .../GridCachePartitionedFullApiSelfTest.java | 32 + ...ePartitionedMultiThreadedPutGetSelfTest.java | 6 +- ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 2 +- .../cache/eviction/EvictionAbstractTest.java | 1056 ++++++++++++++++++ .../GridCacheBatchEvictUnswapSelfTest.java | 5 +- ...heConcurrentEvictionConsistencySelfTest.java | 82 +- .../GridCacheConcurrentEvictionsSelfTest.java | 29 +- .../GridCacheDistributedEvictionsSelfTest.java | 5 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 11 +- .../eviction/GridCacheEvictionAbstractTest.java | 484 -------- .../GridCacheEvictionTouchSelfTest.java | 22 +- .../cache/eviction/GridCacheMockEntry.java | 5 + .../fifo/FifoEvictionPolicySelfTest.java | 262 +++++ ...ridCacheFifoBatchEvictionPolicySelfTest.java | 384 ------- .../GridCacheFifoEvictionPolicySelfTest.java | 372 ------ .../lru/GridCacheLruEvictionPolicySelfTest.java | 417 ------- .../GridCacheLruNearEvictionPolicySelfTest.java | 136 --- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 168 --- .../eviction/lru/LruEvictionPolicySelfTest.java | 353 ++++++ .../lru/LruNearEvictionPolicySelfTest.java | 140 +++ .../LruNearOnlyNearEvictionPolicySelfTest.java | 172 +++ .../GridCacheRandomEvictionPolicySelfTest.java | 258 ----- .../RandomEvictionPolicyCacheSizeSelfTest.java | 6 + .../random/RandomEvictionPolicySelfTest.java | 357 ++++++ ...dCacheSortedBatchEvictionPolicySelfTest.java | 385 ------- ...acheSortedEvictionPolicyPerformanceTest.java | 135 --- .../GridCacheSortedEvictionPolicySelfTest.java | 373 ------- .../SortedEvictionPolicyPerformanceTest.java | 134 +++ .../sorted/SortedEvictionPolicySelfTest.java | 266 +++++ .../loadtests/GridCacheMultiNodeLoadTest.java | 5 +- .../GridCachePartitionedAtomicLongLoadTest.java | 6 +- .../swap/GridSwapEvictAllBenchmark.java | 6 +- .../IgniteCacheEvictionSelfTestSuite.java | 14 +- .../GridCacheOffheapIndexEntryEvictTest.java | 200 ++++ .../cache/GridCacheOffheapIndexGetSelfTest.java | 18 +- .../cache/GridCacheQueryMetricsSelfTest.java | 84 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 6 +- ...QueryMultiThreadedOffHeapTieredSelfTest.java | 37 + ...eQueryMultiThreadedOffHeapTiredSelfTest.java | 37 - .../IgniteCacheQueryMultiThreadedSelfTest.java | 11 +- .../cache/ttl/CacheTtlAbstractSelfTest.java | 6 +- .../IgniteCacheQuerySelfTestSuite.java | 2 +- .../IgniteCacheWithIndexingTestSuite.java | 1 + scripts/git-apply-patch.sh | 8 +- scripts/git-format-patch.sh | 6 +- scripts/git-patch-functions.sh | 36 +- 80 files changed, 4239 insertions(+), 3506 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921057f1/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921057f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ----------------------------------------------------------------------
