Merge remote-tracking branch 'origin/ignite-sprint-5' 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/2a8e2abe Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a8e2abe Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a8e2abe Branch: refs/heads/ignite-389 Commit: 2a8e2abe4081334802f9950757b7d3776a3a6179 Parents: 837462f 015afdb Author: sboikov <sboi...@gridgain.com> Authored: Mon Jun 8 14:55:48 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jun 8 14:55:48 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 26 +- .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../internal/MarshallerContextAdapter.java | 36 +- .../internal/managers/GridManagerAdapter.java | 9 + .../checkpoint/GridCheckpointManager.java | 52 +- .../discovery/GridDiscoveryManager.java | 28 +- .../processors/cache/GridCacheAdapter.java | 4 + .../GridCachePartitionExchangeManager.java | 26 +- .../processors/cache/GridCacheTtlManager.java | 9 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../GridDhtPartitionsExchangeFuture.java | 50 +- .../cache/transactions/IgniteTxManager.java | 3 - .../datastructures/DataStructuresProcessor.java | 107 +++- .../service/GridServiceProcessor.java | 4 +- .../timeout/GridSpiTimeoutObject.java | 73 +++ .../timeout/GridTimeoutProcessor.java | 105 +++- .../util/nio/GridCommunicationClient.java | 30 +- .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../util/nio/GridTcpCommunicationClient.java | 554 ------------------- .../util/nio/GridTcpNioCommunicationClient.java | 8 - .../org/apache/ignite/spi/IgniteSpiAdapter.java | 27 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 10 + .../ignite/spi/IgniteSpiTimeoutObject.java | 44 ++ .../spi/checkpoint/noop/NoopCheckpointSpi.java | 3 +- .../communication/tcp/TcpCommunicationSpi.java | 438 ++++----------- .../tcp/TcpCommunicationSpiMBean.java | 2 - .../ignite/spi/discovery/tcp/ClientImpl.java | 3 - .../ignite/spi/discovery/tcp/ServerImpl.java | 10 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 156 +----- .../IgniteCountDownLatchAbstractSelfTest.java | 102 ++++ .../IgniteCacheClientNearCacheExpiryTest.java | 103 ++++ .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../internal/util/nio/GridNioSelfTest.java | 2 +- .../GridTcpCommunicationSpiAbstractTest.java | 4 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 2 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../discovery/AbstractDiscoverySelfTest.java | 13 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 25 + .../testframework/GridSpiTestContext.java | 10 + 40 files changed, 920 insertions(+), 1203 deletions(-) ----------------------------------------------------------------------
