Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd246e54 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd246e54 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd246e54 Branch: refs/heads/ignite-1121 Commit: dd246e5489834b6e6d012bfdf6dc0577aae0af30 Parents: 700600d 57ac2b3 Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Thu Jul 16 13:17:06 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Thu Jul 16 13:17:06 2015 +0300 ---------------------------------------------------------------------- .../IgniteClientDisconnectedException.java | 61 + .../java/org/apache/ignite/IgniteCluster.java | 5 + .../apache/ignite/internal/GridComponent.java | 18 + .../ignite/internal/GridJobSiblingImpl.java | 2 +- .../ignite/internal/GridKernalContext.java | 5 + .../ignite/internal/GridKernalContextImpl.java | 31 +- .../ignite/internal/GridKernalGateway.java | 46 +- .../ignite/internal/GridKernalGatewayImpl.java | 85 +- .../apache/ignite/internal/GridKernalState.java | 3 + .../ignite/internal/GridPluginComponent.java | 11 + ...gniteClientDisconnectedCheckedException.java | 49 + .../apache/ignite/internal/IgniteKernal.java | 222 +++- .../cluster/IgniteClusterAsyncImpl.java | 5 + .../internal/cluster/IgniteClusterImpl.java | 18 + .../internal/managers/GridManagerAdapter.java | 19 +- .../deployment/GridDeploymentCommunication.java | 2 +- .../deployment/GridDeploymentManager.java | 95 +- .../discovery/GridDiscoveryManager.java | 163 ++- .../processors/GridProcessorAdapter.java | 11 + .../affinity/GridAffinityAssignmentCache.java | 26 +- .../cache/CacheOsConflictResolutionManager.java | 6 + .../cache/DynamicCacheChangeBatch.java | 17 + .../processors/cache/GridCacheAdapter.java | 25 +- .../cache/GridCacheAffinityManager.java | 21 +- .../cache/GridCacheConcurrentMap.java | 15 +- .../processors/cache/GridCacheGateway.java | 116 +- .../processors/cache/GridCacheIoManager.java | 8 + .../processors/cache/GridCacheManager.java | 6 + .../cache/GridCacheManagerAdapter.java | 6 + .../processors/cache/GridCacheMvccManager.java | 41 +- .../GridCachePartitionExchangeManager.java | 81 +- .../processors/cache/GridCachePreloader.java | 5 + .../cache/GridCachePreloaderAdapter.java | 5 + .../processors/cache/GridCacheProcessor.java | 311 ++++- .../cache/GridCacheSharedContext.java | 113 +- .../cache/GridCacheSharedManager.java | 11 +- .../cache/GridCacheSharedManagerAdapter.java | 20 +- .../processors/cache/GridCacheUtils.java | 11 + .../processors/cache/IgniteCacheFutureImpl.java | 5 + .../processors/cache/IgniteCacheProxy.java | 2 +- .../CacheDataStructuresManager.java | 35 + .../distributed/GridCacheTxFinishSync.java | 46 + .../distributed/dht/GridDhtCacheAdapter.java | 14 +- .../dht/GridDhtPartitionTopologyImpl.java | 24 + .../dht/GridPartitionedGetFuture.java | 13 +- .../dht/preloader/GridDhtPreloader.java | 16 +- .../distributed/near/GridNearCacheAdapter.java | 8 + .../distributed/near/GridNearGetFuture.java | 13 +- .../cache/dr/GridOsCacheDrManager.java | 7 +- .../query/GridCacheDistributedQueryManager.java | 22 + .../cache/query/GridCacheQueryAdapter.java | 11 +- .../query/GridCacheQueryFutureAdapter.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 5 + .../transactions/IgniteTransactionsImpl.java | 59 +- .../cache/transactions/IgniteTxManager.java | 19 +- .../transactions/TransactionProxyImpl.java | 2 +- .../cache/version/GridCacheVersionManager.java | 9 +- .../clock/GridClockSyncProcessor.java | 6 +- .../processors/cluster/ClusterProcessor.java | 11 + .../continuous/GridContinuousHandler.java | 9 +- .../continuous/GridContinuousProcessor.java | 127 +- .../datastreamer/DataStreamProcessor.java | 24 +- .../datastreamer/DataStreamerImpl.java | 90 +- .../datastructures/DataStructuresProcessor.java | 33 +- .../datastructures/GridCacheAtomicLongImpl.java | 33 +- .../GridCacheAtomicReferenceImpl.java | 34 +- .../GridCacheAtomicSequenceImpl.java | 33 +- .../GridCacheAtomicStampedImpl.java | 33 +- .../GridCacheCountDownLatchImpl.java | 51 +- .../datastructures/GridCacheRemovable.java | 6 +- .../datastructures/GridCacheSetImpl.java | 15 +- .../datastructures/GridCacheSetProxy.java | 47 +- .../processors/job/GridJobProcessor.java | 2 +- .../internal/processors/job/GridJobWorker.java | 2 +- .../processors/query/GridQueryIndexing.java | 7 + .../processors/query/GridQueryProcessor.java | 6 + .../service/GridServiceProcessor.java | 45 +- .../processors/service/GridServiceProxy.java | 13 +- .../processors/task/GridTaskProcessor.java | 55 +- .../processors/task/GridTaskWorker.java | 59 +- .../ignite/internal/util/IgniteUtils.java | 28 + .../shmem/IpcSharedMemoryClientEndpoint.java | 5 +- .../ignite/internal/util/lang/GridFunc.java | 2 + .../java/org/apache/ignite/spi/IgniteSpi.java | 15 + .../org/apache/ignite/spi/IgniteSpiAdapter.java | 37 +- .../communication/tcp/TcpCommunicationSpi.java | 354 ++++-- .../spi/discovery/DiscoverySpiDataExchange.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 408 ++++-- .../ignite/spi/discovery/tcp/ServerImpl.java | 134 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 9 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 33 +- .../tcp/internal/TcpDiscoveryNode.java | 19 + .../messages/TcpDiscoveryAbstractMessage.java | 3 + .../messages/TcpDiscoveryClientAckResponse.java | 64 + .../messages/TcpDiscoveryHandshakeResponse.java | 14 + .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 15 +- .../IgniteClientReconnectAbstractTest.java | 363 ++++++ .../IgniteClientReconnectApiExceptionTest.java | 846 ++++++++++++ .../IgniteClientReconnectAtomicsTest.java | 672 ++++++++++ .../IgniteClientReconnectCacheTest.java | 1202 ++++++++++++++++++ .../IgniteClientReconnectCollectionsTest.java | 443 +++++++ .../IgniteClientReconnectComputeTest.java | 192 +++ ...eClientReconnectContinuousProcessorTest.java | 372 ++++++ ...IgniteClientReconnectDiscoveryStateTest.java | 123 ++ ...niteClientReconnectFailoverAbstractTest.java | 231 ++++ .../IgniteClientReconnectFailoverTest.java | 212 +++ .../IgniteClientReconnectServicesTest.java | 260 ++++ .../internal/IgniteClientReconnectStopTest.java | 106 ++ .../IgniteClientReconnectStreamerTest.java | 233 ++++ .../IgniteSlowClientDetectionSelfTest.java | 1 + .../GridDeploymentManagerStopSelfTest.java | 7 + .../IgniteCacheAbstractStopBusySelfTest.java | 2 +- .../cache/IgniteCacheDynamicStopSelfTest.java | 6 +- .../IgniteTxExceptionAbstractSelfTest.java | 1 + .../IgniteCacheSystemTransactionsSelfTest.java | 2 +- .../GridCacheReplicatedInvalidateSelfTest.java | 3 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 562 +++++++- .../multijvm/IgniteClusterProcessProxy.java | 5 + .../IgniteClientReconnectTestSuite.java | 48 + .../processors/query/h2/IgniteH2Indexing.java | 5 + .../query/h2/twostep/GridMergeIndex.java | 45 +- .../h2/twostep/GridReduceQueryExecutor.java | 70 +- ...ClientReconnectCacheQueriesFailoverTest.java | 225 ++++ .../cache/IgniteClientReconnectQueriesTest.java | 427 +++++++ ...dCacheAbstractReduceFieldsQuerySelfTest.java | 4 + .../IgniteCacheWithIndexingTestSuite.java | 1 + 128 files changed, 9751 insertions(+), 815 deletions(-) ----------------------------------------------------------------------