Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-929
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e1221f62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1221f62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1221f62 Branch: refs/heads/ignite-929 Commit: e1221f6232d5bc3d85e8113384a94deda6422797 Parents: 0663928 e0426f0 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jun 10 12:04:23 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jun 10 12:04:23 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 42 +- .../java/org/apache/ignite/IgniteCache.java | 7 +- .../apache/ignite/internal/IgniteKernal.java | 30 +- .../ignite/internal/IgniteNodeAttributes.java | 5 +- .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../internal/MarshallerContextAdapter.java | 36 +- .../internal/managers/GridManagerAdapter.java | 9 + .../checkpoint/GridCheckpointManager.java | 52 +- .../discovery/DiscoveryCustomMessage.java | 6 + .../discovery/GridDiscoveryManager.java | 60 +- .../managers/indexing/GridIndexingManager.java | 4 - .../affinity/GridAffinityAssignment.java | 12 + .../affinity/GridAffinityAssignmentCache.java | 4 +- .../cache/DynamicCacheChangeBatch.java | 19 +- .../cache/DynamicCacheDescriptor.java | 17 + .../processors/cache/GridCacheAdapter.java | 4 + .../processors/cache/GridCacheContext.java | 13 + .../GridCachePartitionExchangeManager.java | 26 +- .../processors/cache/GridCacheProcessor.java | 37 +- .../processors/cache/GridCacheTtlManager.java | 9 +- .../dht/atomic/GridDhtAtomicCache.java | 22 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +- .../dht/preloader/GridDhtForceKeysFuture.java | 40 +- .../GridDhtPartitionsExchangeFuture.java | 64 ++- .../transactions/IgniteTxLocalAdapter.java | 28 + .../cache/transactions/IgniteTxManager.java | 3 - .../continuous/AbstractContinuousMessage.java | 9 + .../continuous/GridContinuousProcessor.java | 2 + .../datastructures/DataStructuresProcessor.java | 107 +++- .../service/GridServiceProcessor.java | 4 +- .../timeout/GridSpiTimeoutObject.java | 73 +++ .../timeout/GridTimeoutProcessor.java | 105 +++- .../IgniteTxRollbackCheckedException.java | 9 + .../util/nio/GridCommunicationClient.java | 30 +- .../util/nio/GridNioDelimitedBuffer.java | 2 +- .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../util/nio/GridTcpCommunicationClient.java | 554 ------------------- .../util/nio/GridTcpNioCommunicationClient.java | 8 - .../visor/node/VisorNodeDataCollectorTask.java | 9 +- .../node/VisorNodeDataCollectorTaskResult.java | 17 +- .../node/VisorNodeSuppressedErrorsTask.java | 12 +- .../internal/visor/query/VisorQueryJob.java | 11 +- .../internal/visor/query/VisorQueryTask.java | 3 +- .../visor/util/VisorExceptionWrapper.java | 81 +++ .../internal/visor/util/VisorTaskUtils.java | 10 + .../org/apache/ignite/spi/IgniteSpiAdapter.java | 33 +- .../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 +----- ...acheReadOnlyTransactionalClientSelfTest.java | 327 +++++++++++ .../IgniteCountDownLatchAbstractSelfTest.java | 102 ++++ .../IgniteCacheClientNearCacheExpiryTest.java | 103 ++++ .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../continuous/GridEventConsumeSelfTest.java | 7 +- .../DataStreamerMultinodeCreateCacheTest.java | 97 ++++ .../nio/GridNioDelimitedBufferSelfTest.java | 112 ++++ .../util/nio/GridNioDelimitedBufferTest.java | 112 ---- .../internal/util/nio/GridNioSelfTest.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../GridTcpCommunicationSpiAbstractTest.java | 4 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 2 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../discovery/AbstractDiscoverySelfTest.java | 13 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 25 + .../stream/socket/SocketStreamerSelfTest.java | 29 +- .../testframework/GridSpiTestContext.java | 10 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 2 + .../testsuites/IgniteStreamSelfTestSuite.java | 39 ++ .../testsuites/IgniteStreamTestSuite.java | 39 -- .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- .../cache/GridCacheOffheapIndexGetSelfTest.java | 62 ++- 79 files changed, 1969 insertions(+), 1450 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1221f62/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1221f62/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1221f62/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1221f62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1221f62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1221f62/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ----------------------------------------------------------------------
