Merge branch 'ignite-237' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-237
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6531cbd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6531cbd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6531cbd1 Branch: refs/heads/ignite-185 Commit: 6531cbd1d7e6fa937f8536e349c8e8dd9631c17c Parents: b378307 10ac88a Author: ivasilinets <vasilinetc....@gmail.com> Authored: Sun Mar 1 21:23:31 2015 +0300 Committer: ivasilinets <vasilinetc....@gmail.com> Committed: Sun Mar 1 21:23:31 2015 +0300 ---------------------------------------------------------------------- .../ClientAbstractMultiThreadedSelfTest.java | 38 +- .../impl/ClientPartitionAffinitySelfTest.java | 87 +-- .../ClientAbstractMultiNodeSelfTest.java | 53 +- .../integration/ClientAbstractSelfTest.java | 8 - .../src/test/resources/spring-server-node.xml | 2 +- .../test/resources/spring-server-ssl-node.xml | 2 +- .../java/org/apache/ignite/cache/GridCache.java | 2 +- .../CacheConsistentHashAffinityFunction.java | 703 ------------------- .../cache/affinity/consistenthash/package.html | 24 - .../CacheRendezvousAffinityFunction.java | 2 +- .../configuration/CacheConfiguration.java | 2 +- .../processors/cache/GridCacheAttributes.java | 32 +- .../processors/cache/GridCacheProcessor.java | 21 +- .../top/GridTopologyCommandHandler.java | 8 - .../cache/VisorCacheAffinityConfiguration.java | 9 +- .../config/load/dsi-49-server-production.xml | 2 +- .../GridCacheAffinityBackupsSelfTest.java | 9 - .../ignite/IgniteCacheAffinitySelfTest.java | 30 +- ...AffinityProcessorConsistentHashSelfTest.java | 31 - ...idCacheConfigurationConsistencySelfTest.java | 46 +- ...ridCacheConfigurationValidationSelfTest.java | 8 +- .../GridCachePartitionedAffinitySpreadTest.java | 16 +- .../IgniteClientAffinityAssignmentSelfTest.java | 16 +- .../GridCacheClientModesAbstractSelfTest.java | 4 +- ...dCachePartitionedAffinityFilterSelfTest.java | 6 +- ...GridCachePreloadRestartAbstractSelfTest.java | 4 +- .../dht/GridCacheColocatedDebugTest.java | 4 +- .../dht/GridCacheDhtEntrySelfTest.java | 4 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 6 +- .../dht/GridCacheDhtEvictionSelfTest.java | 14 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 4 +- .../GridCacheDhtPreloadDisabledSelfTest.java | 4 +- .../GridCacheDhtPreloadMessageCountTest.java | 4 +- ...ridCacheDhtPreloadMultiThreadedSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadSelfTest.java | 4 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 4 +- .../distributed/dht/GridCacheDhtTestUtils.java | 6 +- ...dCachePartitionedTopologyChangeSelfTest.java | 7 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 5 +- ...ffinityFunctionExcludeNeighborsSelfTest.java | 32 - ...AffinityExcludeNeighborsPerformanceTest.java | 4 +- ...rtitionedAffinityHashIdResolverSelfTest.java | 4 +- .../GridCachePartitionedAffinitySelfTest.java | 226 ------ .../GridCachePartitionedFullApiSelfTest.java | 6 +- .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 4 +- ...cheSynchronousEvictionsFailoverSelfTest.java | 4 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 19 +- ...idOffHeapPartitionedMapAbstractSelfTest.java | 4 +- ...apPartitionedMapPerformanceAbstractTest.java | 4 +- ...GridUnsafePartitionedMapPerformanceTest.java | 4 +- .../capacity/spring-capacity-cache.xml | 2 +- .../loadtests/colocation/spring-colocation.xml | 2 +- .../GridCachePartitionedAtomicLongLoadTest.java | 4 +- ...apPartitionedMapPerformanceAbstractTest.java | 4 +- ...GridUnsafePartitionedMapPerformanceTest.java | 4 +- .../ignite/testframework/GridTestUtils.java | 11 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 - .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - .../hibernate/HibernateL2CacheSelfTest.java | 8 +- 64 files changed, 149 insertions(+), 1454 deletions(-) ----------------------------------------------------------------------
