Merge remote-tracking branch 'remotes/origin/ignite-943' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3c0046e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3c0046e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3c0046e8 Branch: refs/heads/ignite-916 Commit: 3c0046e8e040ab53a5f39819b1c86487f645d25f Parents: 9a16d19 ab4c18c Author: sevdokimov <sevdoki...@gridgain.com> Authored: Mon Jun 1 14:42:34 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Mon Jun 1 14:42:34 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/Ignition.java | 18 +- .../org/apache/ignite/cluster/ClusterNode.java | 24 +- .../configuration/CacheConfiguration.java | 27 +- .../configuration/IgniteConfiguration.java | 4 +- .../ignite/internal/ClusterMetricsSnapshot.java | 14 + .../internal/GridEventConsumeHandler.java | 100 +- .../ignite/internal/GridKernalContext.java | 5 + .../ignite/internal/GridKernalContextImpl.java | 5 + .../apache/ignite/internal/IgniteKernal.java | 23 +- .../org/apache/ignite/internal/IgnitionEx.java | 20 +- .../ignite/internal/MarshallerContextImpl.java | 2 +- .../internal/events/DiscoveryCustomEvent.java | 18 +- .../managers/discovery/CustomEventListener.java | 31 + .../discovery/CustomMessageWrapper.java | 63 + .../discovery/DiscoveryCustomMessage.java | 48 + .../discovery/GridDiscoveryManager.java | 214 +- .../affinity/GridAffinityAssignmentCache.java | 32 + .../cache/DynamicCacheChangeBatch.java | 20 +- .../cache/DynamicCacheDescriptor.java | 2 + .../processors/cache/GridCacheAdapter.java | 17 +- .../cache/GridCacheAffinityManager.java | 14 + .../cache/GridCacheConcurrentMap.java | 21 +- .../processors/cache/GridCacheContext.java | 6 +- .../processors/cache/GridCacheGateway.java | 2 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../processors/cache/GridCacheMvccManager.java | 32 +- .../GridCachePartitionExchangeManager.java | 71 +- .../processors/cache/GridCachePreloader.java | 6 +- .../cache/GridCachePreloaderAdapter.java | 11 +- .../processors/cache/GridCacheProcessor.java | 74 +- .../processors/cache/GridCacheProxyImpl.java | 12 + .../cache/GridCacheSharedContext.java | 1 + .../processors/cache/GridCacheUtils.java | 234 +- .../processors/cache/IgniteInternalCache.java | 5 + .../cache/affinity/GridCacheAffinityImpl.java | 10 +- .../CacheDataStructuresManager.java | 2 +- .../distributed/GridDistributedTxMapping.java | 17 + .../dht/GridClientPartitionTopology.java | 8 +- .../dht/GridDhtAssignmentFetchFuture.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java | 27 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 22 +- .../dht/GridDhtTransactionalCacheAdapter.java | 224 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 8 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 10 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 78 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 112 +- .../dht/colocated/GridDhtColocatedCache.java | 12 +- .../colocated/GridDhtColocatedLockFuture.java | 213 +- .../dht/preloader/GridDhtForceKeysFuture.java | 4 +- .../preloader/GridDhtPartitionDemandPool.java | 26 +- .../dht/preloader/GridDhtPartitionMap.java | 2 +- .../preloader/GridDhtPartitionSupplyPool.java | 29 +- .../GridDhtPartitionsExchangeFuture.java | 313 +- .../preloader/GridDhtPartitionsFullMessage.java | 4 +- .../GridDhtPartitionsSingleMessage.java | 33 +- .../dht/preloader/GridDhtPreloader.java | 28 +- .../preloader/GridDhtPreloaderAssignments.java | 3 +- .../distributed/near/GridNearAtomicCache.java | 5 + .../distributed/near/GridNearCacheAdapter.java | 2 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../distributed/near/GridNearLockFuture.java | 271 +- .../distributed/near/GridNearLockRequest.java | 68 +- .../distributed/near/GridNearLockResponse.java | 48 +- .../near/GridNearOptimisticTxPrepareFuture.java | 83 +- .../GridNearPessimisticTxPrepareFuture.java | 5 +- .../near/GridNearTransactionalCache.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 43 +- .../near/GridNearTxPrepareRequest.java | 72 +- .../near/GridNearTxPrepareResponse.java | 70 +- .../processors/cache/local/GridLocalCache.java | 6 +- .../local/atomic/GridLocalAtomicCache.java | 6 +- .../cache/query/GridCacheQueryAdapter.java | 12 +- .../cache/query/GridCacheQueryErrorFuture.java | 2 + .../cache/query/GridCacheQueryManager.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 28 +- .../cache/transactions/IgniteInternalTx.java | 5 + .../cache/transactions/IgniteTxAdapter.java | 15 +- .../cache/transactions/IgniteTxHandler.java | 148 +- .../cacheobject/IgniteCacheObjectProcessor.java | 5 +- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../continuous/AbstractContinuousMessage.java | 54 + .../continuous/GridContinuousMessageType.java | 12 - .../continuous/GridContinuousProcessor.java | 836 +-- .../processors/continuous/StartRequestData.java | 267 + .../StartRoutineAckDiscoveryMessage.java | 63 + .../StartRoutineDiscoveryMessage.java | 85 + .../StopRoutineAckDiscoveryMessage.java | 49 + .../continuous/StopRoutineDiscoveryMessage.java | 49 + .../service/GridServiceProcessor.java | 121 +- .../internal/util/future/GridFutureAdapter.java | 4 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/DiscoverySpi.java | 20 +- .../discovery/DiscoverySpiCustomMessage.java | 40 + .../spi/discovery/DiscoverySpiListener.java | 5 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 1478 +++++ .../ignite/spi/discovery/tcp/ServerImpl.java | 4766 ++++++++++++++ .../discovery/tcp/TcpClientDiscoverySpi.java | 1264 ---- .../tcp/TcpClientDiscoverySpiMBean.java | 164 - .../spi/discovery/tcp/TcpDiscoveryImpl.java | 170 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 5799 ++++-------------- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 1160 ---- .../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 9 + .../tcp/internal/TcpDiscoveryNode.java | 7 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 2 +- .../TcpDiscoveryMulticastIpFinder.java | 10 +- .../messages/TcpDiscoveryAbstractMessage.java | 24 +- .../TcpDiscoveryClientHeartbeatMessage.java | 67 + .../messages/TcpDiscoveryClientPingRequest.java | 56 + .../TcpDiscoveryClientPingResponse.java | 67 + .../TcpDiscoveryCustomEventMessage.java | 41 +- .../messages/TcpDiscoveryHeartbeatMessage.java | 28 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 43 + .../messages/TcpDiscoveryNodeAddedMessage.java | 2 +- .../tcp/messages/TcpDiscoveryPingRequest.java | 6 + .../tcp/messages/TcpDiscoveryPingResponse.java | 15 +- .../affinity/IgniteClientNodeAffinityTest.java | 182 + .../ignite/internal/GridAffinitySelfTest.java | 1 + .../internal/GridDiscoveryEventSelfTest.java | 7 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 7 +- .../internal/GridProjectionAbstractTest.java | 16 + .../GridProjectionForCachesSelfTest.java | 11 +- .../internal/GridReleaseTypeSelfTest.java | 77 +- .../apache/ignite/internal/GridSelfTest.java | 4 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 62 +- .../GridDiscoveryManagerAttributesSelfTest.java | 122 +- .../discovery/GridDiscoveryManagerSelfTest.java | 46 +- .../GridAffinityProcessorAbstractSelfTest.java | 1 + .../cache/CacheRemoveAllSelfTest.java | 2 +- .../GridCacheAbstractFailoverSelfTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 3 + .../GridCacheAbstractRemoveFailureTest.java | 23 + .../cache/GridCacheAbstractSelfTest.java | 2 +- .../GridCacheAtomicMessageCountSelfTest.java | 1 + ...GridCacheMixedPartitionExchangeSelfTest.java | 2 +- .../cache/GridCachePutAllFailoverSelfTest.java | 1 + .../GridCacheReturnValueTransferSelfTest.java | 3 + ...acheTcpClientDiscoveryMultiThreadedTest.java | 190 + .../GridCacheVariableTopologySelfTest.java | 12 +- .../IgniteCacheAbstractStopBusySelfTest.java | 6 +- .../cache/IgniteCacheAbstractTest.java | 2 +- .../IgniteCacheConfigurationTemplateTest.java | 2 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 3 + .../IgniteCacheP2pUnmarshallingErrorTest.java | 29 +- ...gniteCacheP2pUnmarshallingNearErrorTest.java | 13 +- .../IgniteCachePartitionMapUpdateTest.java | 226 + .../IgniteDynamicClientCacheStartSelfTest.java | 283 + .../cache/IgniteSystemCacheOnClientTest.java | 97 + .../GridCacheQueueApiSelfAbstractTest.java | 4 +- .../IgniteClientDataStructuresAbstractTest.java | 283 + .../IgniteClientDataStructuresTest.java | 28 + ...IgniteClientDiscoveryDataStructuresTest.java | 28 + .../GridCacheClientModesAbstractSelfTest.java | 94 +- ...ientModesTcpClientDiscoveryAbstractTest.java | 168 + .../distributed/GridCacheMixedModeSelfTest.java | 3 + ...niteCacheClientNodeChangingTopologyTest.java | 1803 ++++++ .../IgniteCacheClientNodeConcurrentStart.java | 105 + ...teCacheClientNodePartitionsExchangeTest.java | 632 ++ .../dht/GridCacheClientOnlySelfTest.java | 60 +- .../GridCacheDhtClientRemoveFailureTest.java | 28 + .../dht/IgniteCacheMultiTxLockSelfTest.java | 47 +- ...cClientInvalidPartitionHandlingSelfTest.java | 29 + .../GridCacheAtomicClientRemoveFailureTest.java | 28 + ...eAtomicInvalidPartitionHandlingSelfTest.java | 23 +- ...unctionExcludeNeighborsAbstractSelfTest.java | 3 +- .../near/GridCacheAtomicNearOnlySelfTest.java | 32 - ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 + .../near/GridCacheNearOnlySelfTest.java | 63 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 1 + ...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 5 +- ...idCacheRendezvousAffinityClientSelfTest.java | 4 + .../GridCacheReplicatedClientOnlySelfTest.java | 43 - .../GridCacheReplicatedNearOnlySelfTest.java | 43 - .../GridCacheSyncReplicatedPreloadSelfTest.java | 1 - ...heNearOnlyLruNearEvictionPolicySelfTest.java | 25 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 6 +- .../continuous/GridEventConsumeSelfTest.java | 93 +- .../DataStreamProcessorSelfTest.java | 1 + .../igfs/IgfsClientCacheSelfTest.java | 3 +- .../processors/igfs/IgfsCommonAbstractTest.java | 10 - .../processors/igfs/IgfsOneClientNodeTest.java | 8 +- .../service/ClosureServiceClientsNodesTest.java | 16 +- .../service/GridServiceClientNodeTest.java | 81 + .../OptimizedMarshallerNodeFailoverTest.java | 4 +- ...GridMessagingNoPeerClassLoadingSelfTest.java | 7 +- .../ignite/messaging/GridMessagingSelfTest.java | 13 +- .../discovery/AbstractDiscoverySelfTest.java | 8 +- ...pClientDiscoveryMarshallerCheckSelfTest.java | 76 + .../tcp/TcpClientDiscoverySelfTest.java | 700 --- .../tcp/TcpClientDiscoverySpiSelfTest.java | 1171 ++++ .../tcp/TcpDiscoveryConcurrentStartTest.java | 61 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 18 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +- .../ignite/testframework/GridTestUtils.java | 15 + .../testframework/junits/GridAbstractTest.java | 52 +- .../junits/common/GridCommonAbstractTest.java | 59 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 3 + .../IgniteCacheFailoverTestSuite.java | 4 +- .../IgniteCacheNearOnlySelfTestSuite.java | 16 +- ...gniteCacheP2pUnmarshallingErrorTestSuit.java | 41 - ...niteCacheP2pUnmarshallingErrorTestSuite.java | 41 + .../IgniteCacheTcpClientDiscoveryTestSuite.java | 47 + .../ignite/testsuites/IgniteCacheTestSuite.java | 4 + .../testsuites/IgniteCacheTestSuite2.java | 11 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../testsuites/IgniteKernalSelfTestSuite.java | 7 +- .../IgniteSpiDiscoverySelfTestSuite.java | 3 +- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 5 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 3 +- 214 files changed, 17497 insertions(+), 10220 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3c0046e8/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ----------------------------------------------------------------------
