Merge branches 'ignite-4535-master' and 'ignite-4851' of https://github.com/gridgain/apache-ignite into ignite-4851
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2999d998 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2999d998 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2999d998 Branch: refs/heads/ignite-3477-master Commit: 2999d99823dd888d17f5b66295a89f6a96f1d076 Parents: c61d138 3b5a745 Author: Ilya Lantukh <[email protected]> Authored: Thu Apr 6 18:04:38 2017 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Thu Apr 6 18:04:38 2017 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 200 +++---------------- .../configuration/NearCacheConfiguration.java | 1 - .../processors/cache/GridCacheAttributes.java | 14 -- .../cache/GridCacheEvictionManager.java | 18 -- .../processors/cache/GridCacheProcessor.java | 21 +- .../utils/PlatformConfigurationUtils.java | 13 +- .../cache/VisorCacheEvictionConfiguration.java | 55 ----- .../internal/ClusterNodeMetricsSelfTest.java | 1 + .../cache/CacheConfigurationLeakTest.java | 1 + .../CacheSerializableTransactionsTest.java | 2 + .../cache/GridCacheAbstractSelfTest.java | 10 +- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- ...idCacheConfigurationConsistencySelfTest.java | 41 +--- .../GridCacheEvictionEventAbstractTest.java | 3 + .../cache/GridCacheLifecycleAwareSelfTest.java | 1 + .../cache/GridCacheObjectToStringSelfTest.java | 1 + .../cache/GridCachePartitionedGetSelfTest.java | 1 - .../GridCachePreloadingEvictionsSelfTest.java | 3 - .../cache/GridCacheReloadSelfTest.java | 1 + .../cache/GridCacheSwapPreloadSelfTest.java | 1 - .../GridCacheTtlManagerEvictionSelfTest.java | 1 + .../cache/IgniteCacheAbstractTest.java | 6 +- ...gniteCacheLoadRebalanceEvictionSelfTest.java | 2 +- ...gniteCacheP2pUnmarshallingNearErrorTest.java | 4 +- .../cache/IgniteCachePeekModesAbstractTest.java | 6 +- .../IgniteCacheReadThroughEvictionSelfTest.java | 1 + .../IgniteCacheStoreValueAbstractTest.java | 5 - .../GridCacheBinaryObjectsAbstractSelfTest.java | 8 + ...ObjectsAtomicNearDisabledOnheapSelfTest.java | 8 + ...dCacheBinaryObjectsAtomicOnheapSelfTest.java | 8 + ...tsPartitionedNearDisabledOnheapSelfTest.java | 8 + ...eBinaryObjectsPartitionedOnheapSelfTest.java | 8 + ...idCacheBinaryObjectsLocalOnheapSelfTest.java | 26 +++ .../GridCacheAbstractNodeRestartSelfTest.java | 1 + ...tractPartitionedByteArrayValuesSelfTest.java | 1 - .../IgniteCacheTxIteratorSelfTest.java | 1 + ...eColocatedOptimisticTransactionSelfTest.java | 1 - ...GridCacheDhtEvictionNearReadersSelfTest.java | 6 +- .../dht/GridCacheDhtEvictionSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadOnheapSelfTest.java | 26 +++ .../dht/GridCacheDhtPreloadSelfTest.java | 38 ++-- ...NearDisabledAtomicOnheapFullApiSelfTest.java | 28 +++ ...ledAtomicOnheapMultiNodeFullApiSelfTest.java | 28 +++ ...tionedNearDisabledOnheapFullApiSelfTest.java | 27 +++ ...rDisabledOnheapMultiNodeFullApiSelfTest.java | 27 +++ .../dht/IgniteCacheMultiTxLockSelfTest.java | 1 + .../IgniteCachePutRetryAbstractSelfTest.java | 2 + .../near/GridCacheNearReadersSelfTest.java | 1 - ...ePartitionedAtomicOnheapFullApiSelfTest.java | 28 +++ ...nedAtomicOnheapMultiNodeFullApiSelfTest.java | 28 +++ .../GridCachePartitionedEvictionSelfTest.java | 1 + .../GridCachePartitionedFullApiSelfTest.java | 2 - ...ePartitionedMultiThreadedPutGetSelfTest.java | 2 +- ...idCachePartitionedOnheapFullApiSelfTest.java | 26 +++ ...rtitionedOnheapMultiNodeFullApiSelfTest.java | 26 +++ ...stractReplicatedByteArrayValuesSelfTest.java | 1 - .../GridCacheReplicatedEvictionSelfTest.java | 135 ------------- ...ridCacheReplicatedOnheapFullApiSelfTest.java | 26 +++ ...eplicatedOnheapMultiNodeFullApiSelfTest.java | 26 +++ .../cache/eviction/EvictionAbstractTest.java | 35 +--- ...heConcurrentEvictionConsistencySelfTest.java | 1 + .../GridCacheConcurrentEvictionsSelfTest.java | 1 + .../GridCacheEmptyEntriesAbstractSelfTest.java | 4 +- .../GridCacheEvictableEntryEqualsSelfTest.java | 1 + .../GridCacheEvictionFilterSelfTest.java | 2 +- .../GridCacheEvictionLockUnlockSelfTest.java | 1 + .../GridCacheEvictionTouchSelfTest.java | 1 + .../SortedEvictionPolicyPerformanceTest.java | 2 +- ...eCacheAtomicLocalOnheapExpiryPolicyTest.java | 26 +++ ...IgniteCacheAtomicOnheapExpiryPolicyTest.java | 26 +++ .../GridCacheLocalByteArrayValuesSelfTest.java | 1 - ...acheAtomicOnheapMultiJvmFullApiSelfTest.java | 28 +++ ...bledAtomicOnheapMultiJvmFullApiSelfTest.java | 28 +++ ...arDisabledOnheapMultiJvmFullApiSelfTest.java | 28 +++ ...artitionedOnheapMultiJvmFullApiSelfTest.java | 28 +++ ...ReplicatedOnheapMultiJvmFullApiSelfTest.java | 28 +++ .../DataStreamProcessorSelfTest.java | 2 - ...sCachePerBlockLruEvictionPolicySelfTest.java | 1 + .../loadtests/GridCacheMultiNodeLoadTest.java | 1 + .../GridCachePartitionedAtomicLongLoadTest.java | 2 +- .../configvariations/ConfigVariations.java | 6 +- ...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 11 + .../IgniteCacheFullApiSelfTestSuite.java | 18 ++ .../testsuites/IgniteCacheTestSuite2.java | 15 +- .../cache/CacheQueryEvictDataLostTest.java | 120 +++++++++++ .../CacheQueryOffheapEvictDataLostTest.java | 119 ----------- .../CacheRandomOperationsMultithreadedTest.java | 1 + .../cache/GridCacheOffheapIndexGetSelfTest.java | 2 - .../cache/GridIndexingWithNoopSwapSelfTest.java | 1 + .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 + .../cache/ttl/CacheTtlAbstractSelfTest.java | 1 + .../query/IgniteSqlSegmentedIndexSelfTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- .../commands/cache/VisorCacheCommand.scala | 5 - 94 files changed, 834 insertions(+), 695 deletions(-) ----------------------------------------------------------------------
