Merge branches 'ignite-992' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-992
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e934bcad Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e934bcad Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e934bcad Branch: refs/heads/ignite-843 Commit: e934bcad4235494986a0dd30352210255beb927e Parents: 0eee664 0fa2853 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Jun 9 12:10:23 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Jun 9 12:10:23 2015 +0700 ---------------------------------------------------------------------- DEVNOTES.txt | 42 +- .../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 +- .../dht/preloader/GridDhtForceKeysFuture.java | 40 +- .../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 + .../DataStreamerMultinodeCreateCacheTest.java | 97 ++++ .../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 + .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + 44 files changed, 1073 insertions(+), 1230 deletions(-) ----------------------------------------------------------------------
