Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b409b8de Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b409b8de Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b409b8de Branch: refs/heads/ignite-2236 Commit: b409b8dee64d297fe03869533182109c8e40c7a4 Parents: 59cfbfd 2d10630 Author: Yakov Zhdanov <[email protected]> Authored: Thu Jan 14 12:55:10 2016 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Thu Jan 14 12:55:10 2016 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/IgniteTransactions.java | 4 +- .../apache/ignite/internal/GridComponent.java | 5 +- .../ignite/internal/GridUpdateNotifier.java | 454 ------------------ .../apache/ignite/internal/IgniteKernal.java | 221 ++++----- .../ignite/internal/IgniteVersionUtils.java | 4 +- .../ignite/internal/MarshallerContextImpl.java | 86 +++- .../discovery/GridDiscoveryManager.java | 6 +- .../cache/CacheEntrySerializablePredicate.java | 3 +- .../cache/CacheInvokeDirectResult.java | 4 +- .../processors/cache/GridCacheIoManager.java | 23 + .../processors/cache/GridCacheProcessor.java | 52 ++- .../processors/cache/GridCacheReturn.java | 2 + .../processors/cache/IgniteCacheProxy.java | 2 +- .../GridDistributedLockResponse.java | 2 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java | 2 +- .../GridDistributedTxPrepareResponse.java | 4 +- .../dht/GridDhtAffinityAssignmentResponse.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 44 +- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../distributed/dht/GridDhtTxFinishRequest.java | 90 ++-- .../dht/GridDhtTxFinishResponse.java | 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 1 + .../dht/GridDhtTxPrepareRequest.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 21 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 22 +- .../atomic/GridNearAtomicUpdateResponse.java | 4 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionDemandMessage.java | 6 +- .../GridDhtPartitionSupplyMessageV2.java | 6 +- .../preloader/GridDhtPartitionsFullMessage.java | 2 +- .../GridDhtPartitionsSingleMessage.java | 4 +- .../distributed/near/GridNearGetResponse.java | 4 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../near/GridNearSingleGetResponse.java | 2 +- .../near/GridNearTxFinishFuture.java | 432 +++++++++++++----- .../near/GridNearTxFinishRequest.java | 5 + .../near/GridNearTxFinishResponse.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../near/GridNearTxPrepareResponse.java | 4 +- .../cache/query/GridCacheQueryRequest.java | 16 +- .../cache/query/GridCacheQueryResponse.java | 18 +- .../cache/transactions/IgniteInternalTx.java | 6 + .../cache/transactions/IgniteTxAdapter.java | 23 +- .../cache/transactions/IgniteTxEntry.java | 11 +- .../cache/transactions/IgniteTxHandler.java | 26 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 20 + .../processors/cluster/ClusterProcessor.java | 174 +++++++ .../processors/cluster/GridUpdateNotifier.java | 457 +++++++++++++++++++ .../datastreamer/DataStreamerRequest.java | 1 + .../datastructures/DataStructuresProcessor.java | 11 +- .../processors/igfs/IgfsAckMessage.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 6 +- .../ignite/spi/discovery/DiscoverySpi.java | 2 + .../ignite/stream/socket/SocketStreamer.java | 3 +- .../internal/GridUpdateNotifierSelfTest.java | 137 ------ ...UpdateNotifierPerClusterSettingSelfTest.java | 130 ++++++ ...cheAbstractFullApiMultithreadedSelfTest.java | 13 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../processors/cache/GridCacheStopSelfTest.java | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 30 +- ...eMarshallerCacheConcurrentReadWriteTest.java | 189 ++++++++ .../IgniteClientDataStructuresAbstractTest.java | 3 + .../dht/GridCacheTxNodeFailureSelfTest.java | 13 +- .../IgniteCacheCommitDelayTxRecoveryTest.java | 376 +++++++++++++++ .../IgniteCachePutRetryAbstractSelfTest.java | 36 +- ...gniteCachePutRetryTransactionalSelfTest.java | 21 + .../cluster/GridUpdateNotifierSelfTest.java | 140 ++++++ .../continuous/GridEventConsumeSelfTest.java | 3 + .../internal/util/nio/GridNioSelfTest.java | 11 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 - ...CommunicationRecoveryAckClosureSelfTest.java | 19 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 + .../startup/GridRandomCommandLineLoader.java | 4 +- .../junits/common/GridCommonAbstractTest.java | 34 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheTxRecoverySelfTestSuite.java | 3 + .../testsuites/IgniteKernalSelfTestSuite.java | 4 +- .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 69 ++- 81 files changed, 2502 insertions(+), 1094 deletions(-) ----------------------------------------------------------------------
