You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/03 13:58:25 UTC

[49/50] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-349

Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-349


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3015458c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3015458c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3015458c

Branch: refs/heads/ignite-349
Commit: 3015458c3894c5772662164e8ce4cfb7b8c50d3c
Parents: b88be85 2a68e64
Author: iveselovskiy <iv...@gridgain.com>
Authored: Tue Mar 3 14:36:12 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Tue Mar 3 14:36:12 2015 +0300

----------------------------------------------------------------------
 .../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 +-
 .../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 +-
 84 files changed, 349 insertions(+), 1905 deletions(-)
----------------------------------------------------------------------