Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fe2985b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fe2985b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fe2985b9 Branch: refs/heads/ignite-45 Commit: fe2985b9ed475cc2bc51de81662fcb25f327eb1e Parents: 38ebb3e 6909cc4 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Mar 3 12:00:00 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Mar 3 12:00:00 2015 -0800 ---------------------------------------------------------------------- .../ClientAbstractMultiThreadedSelfTest.java | 37 +- .../impl/ClientPartitionAffinitySelfTest.java | 406 ----------- .../ClientAbstractMultiNodeSelfTest.java | 54 +- .../integration/ClientAbstractSelfTest.java | 8 - .../ClientTcpUnreachableMultiNodeSelfTest.java | 4 - .../client/suite/IgniteClientTestSuite.java | 1 - .../src/test/resources/spring-server-node.xml | 2 +- .../test/resources/spring-server-ssl-node.xml | 2 +- .../java/org/apache/ignite/IgniteEvents.java | 2 +- .../ignite/cache/CacheTypeFieldMetadata.java | 2 +- .../apache/ignite/cache/CacheTypeMetadata.java | 18 +- .../java/org/apache/ignite/cache/GridCache.java | 2 +- .../CacheConsistentHashAffinityFunction.java | 702 ------------------- .../cache/affinity/consistenthash/package.html | 24 - .../CacheRendezvousAffinityFunction.java | 2 +- .../configuration/CacheConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 6 +- .../ignite/internal/client/GridClientNode.java | 8 - .../client/GridClientPartitionAffinity.java | 2 +- .../client/impl/GridClientNodeImpl.java | 22 - .../connection/GridClientNioTcpConnection.java | 3 +- .../processors/cache/GridCacheAttributes.java | 32 +- .../processors/cache/GridCacheProcessor.java | 29 +- .../rest/client/message/GridClientNodeBean.java | 23 - .../top/GridTopologyCommandHandler.java | 8 - .../cache/VisorCacheAffinityConfiguration.java | 19 +- .../config/load/dsi-49-server-production.xml | 2 +- .../GridCacheAffinityBackupsSelfTest.java | 9 - .../ignite/IgniteCacheAffinitySelfTest.java | 30 +- ...AffinityProcessorConsistentHashSelfTest.java | 31 - ...idCacheConfigurationConsistencySelfTest.java | 46 +- ...ridCacheConfigurationValidationSelfTest.java | 8 +- .../cache/GridCacheOffHeapSelfTest.java | 12 +- .../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 | 13 +- .../dht/GridCacheDhtEvictionSelfTest.java | 13 +- .../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 | 11 +- .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 4 +- ...cheSynchronousEvictionsFailoverSelfTest.java | 4 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +- ...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 +- .../processors/cache/GridCacheSwapSelfTest.java | 12 +- .../ignite/schema/generator/PojoGenerator.java | 3 +- .../schema/generator/SnippetGenerator.java | 138 ++++ .../apache/ignite/schema/ui/SchemaLoadApp.java | 2 + .../commands/cache/VisorCacheCommand.scala | 18 +- .../commands/cache/VisorCacheScanCommand.scala | 7 +- .../config/VisorConfigurationCommand.scala | 5 +- .../visor/commands/node/VisorNodeCommand.scala | 6 +- .../scala/org/apache/ignite/visor/visor.scala | 27 +- 85 files changed, 350 insertions(+), 1906 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2985b9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2985b9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2985b9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java index 82dc76a,e9b8a23..8be08de --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java @@@ -20,9 -20,7 +20,8 @@@ package org.apache.ignite.internal.proc import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; - import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2985b9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java index 15b13c2,b8a3cc9..4b74816 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java @@@ -19,10 -19,9 +19,10 @@@ package org.apache.ignite.internal.proc import org.apache.ignite.*; import org.apache.ignite.cache.*; - import org.apache.ignite.cache.affinity.consistenthash.*; + import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe2985b9/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 3a245f7,0449e48..85a31ae --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@@ -901,8 -891,8 +892,8 @@@ public final class GridTestUtils while (true) { boolean wait = false; - for (int p = 0; p < affinity(cache).partitions(); p++) { + for (int p = 0; p < g.affinity(cacheName).partitions(); p++) { - Collection<ClusterNode> nodes = top.nodes(p, -1); + Collection<ClusterNode> nodes = top.nodes(p, AffinityTopologyVersion.NONE); if (nodes.size() > backups + 1) { LT.warn(log, null, "Partition map was not updated yet (will wait) [grid=" + g.name() +
