Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-release-test-no-mod
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/89f7544a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/89f7544a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/89f7544a Branch: refs/heads/ignite-565 Commit: 89f7544a83b8007ca8e7966a89170a5e1aa7c551 Parents: 3da4a36 36bc59a Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Mar 24 19:59:19 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Mar 24 19:59:19 2015 +0300 ---------------------------------------------------------------------- .../src/test/resources/spring-server-node.xml | 4 +- .../test/resources/spring-server-ssl-node.xml | 4 +- .../ignite/cache/CacheDistributionMode.java | 69 ------- .../java/org/apache/ignite/cache/CacheMode.java | 3 +- .../cache/eviction/CacheEvictableEntry.java | 96 +++++++++ .../cache/eviction/CacheEvictionFilter.java | 4 +- .../cache/eviction/CacheEvictionPolicy.java | 6 +- .../ignite/cache/eviction/EvictableEntry.java | 96 --------- .../eviction/fifo/CacheFifoEvictionPolicy.java | 14 +- .../CacheIgfsPerBlockLruEvictionPolicy.java | 24 +-- .../eviction/lru/CacheLruEvictionPolicy.java | 16 +- .../random/CacheRandomEvictionPolicy.java | 4 +- .../processors/cache/CacheDistributionMode.java | 67 +++++++ .../cache/CacheEvictableEntryImpl.java | 197 +++++++++++++++++++ .../processors/cache/EvictableEntryImpl.java | 197 ------------------- .../processors/cache/GridCacheEntryEx.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 6 +- .../processors/cache/GridCacheStoreManager.java | 61 ++++-- .../processors/cache/GridCacheUtils.java | 4 +- .../cache/GridCacheWriteBehindStore.java | 36 ++-- .../dht/GridClientPartitionTopology.java | 4 +- .../distributed/near/GridNearCacheEntry.java | 64 +++--- .../apache/ignite/transactions/Transaction.java | 1 - .../resources/META-INF/classnames.properties | 2 +- .../spring-cache-client-benchmark-1.xml | 4 +- .../spring-cache-client-benchmark-2.xml | 4 +- .../spring-cache-client-benchmark-3.xml | 4 +- .../core/src/test/config/discovery-stress.xml | 1 - .../src/test/config/load/cache-benchmark.xml | 2 - .../config/load/dsi-49-server-production.xml | 2 - .../src/test/config/load/dsi-load-server.xml | 5 +- .../cache/GridCacheAlwaysEvictionPolicy.java | 2 +- .../cache/GridCacheBasicStoreAbstractTest.java | 2 - .../cache/GridCacheLifecycleAwareSelfTest.java | 2 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 1 - ...hePartitionedProjectionAffinitySelfTest.java | 1 - .../processors/cache/GridCacheTestEntryEx.java | 3 +- .../IgniteCollectionAbstractTest.java | 3 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 17 +- ...tNearPartitionedByteArrayValuesSelfTest.java | 3 - ...GridCacheAtomicMultiNodeFullApiSelfTest.java | 1 - ...dCacheNearExpiredEntriesPreloadSelfTest.java | 2 - .../near/GridCacheNearTxPreloadSelfTest.java | 1 - ...ePartitionedBasicStoreMultiNodeSelfTest.java | 3 +- ...titionedExplicitLockNodeFailureSelfTest.java | 1 - ...NearDisabledBasicStoreMultiNodeSelfTest.java | 4 +- ...heConcurrentEvictionConsistencySelfTest.java | 4 +- .../eviction/GridCacheEvictionAbstractTest.java | 4 +- .../GridCacheEvictionFilterSelfTest.java | 2 +- .../GridCacheEvictionLockUnlockSelfTest.java | 2 +- .../cache/eviction/GridCacheMockEntry.java | 2 +- .../GridCacheFifoEvictionPolicySelfTest.java | 2 +- .../lru/GridCacheLruEvictionPolicySelfTest.java | 2 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 1 - .../IgniteCacheTxLocalLoadAllTest.java | 1 - .../capacity/spring-capacity-cache.xml | 2 - .../loadtests/colocation/spring-colocation.xml | 2 - .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../cache/IgniteCacheAbstractQuerySelfTest.java | 2 +- ...niteCacheAtomicNearEnabledQuerySelfTest.java | 3 +- .../near/IgniteCacheAtomicQuerySelfTest.java | 3 +- ...niteCachePartitionedFieldsQuerySelfTest.java | 1 - .../query/h2/sql/GridQueryParsingTest.java | 2 - .../schema/test/model/ignite-type-metadata.xml | 28 --- .../yardstick/IgniteAbstractBenchmark.java | 2 +- .../yardstick/IgniteBenchmarkArguments.java | 1 + .../org/apache/ignite/yardstick/IgniteNode.java | 4 +- 67 files changed, 565 insertions(+), 556 deletions(-) ----------------------------------------------------------------------
