Merge remote-tracking branch 'remotes/upstream/ignite-1.7.2'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f4bd20d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f4bd20d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f4bd20d Branch: refs/heads/master Commit: 9f4bd20d5b44eca1958475ceb3958394b1d64da6 Parents: f2f82f0 83ff7c7 Author: Anton Vinogradov <a...@apache.org> Authored: Mon Sep 19 18:39:36 2016 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Mon Sep 19 18:39:36 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 12 + .../internal/GridEventConsumeHandler.java | 5 - .../internal/GridMessageListenHandler.java | 5 - .../internal/binary/BinaryObjectExImpl.java | 161 ++++++--- .../communication/GridIoMessageFactory.java | 6 + .../processors/cache/GridCacheEntryEx.java | 8 + .../processors/cache/GridCacheMapEntry.java | 9 +- .../GridCacheReturnCompletableWrapper.java | 101 ++++++ .../cache/GridDeferredAckMessageSender.java | 219 ++++++++++++ .../GridDistributedTxRemoteAdapter.java | 65 +++- .../distributed/dht/GridDhtTxFinishFuture.java | 12 +- .../distributed/dht/GridDhtTxFinishRequest.java | 33 +- .../dht/GridDhtTxFinishResponse.java | 52 ++- .../dht/GridDhtTxOnePhaseCommitAckRequest.java | 134 +++++++ .../distributed/dht/GridDhtTxPrepareFuture.java | 42 ++- .../dht/GridDhtTxPrepareRequest.java | 93 +++-- .../cache/distributed/dht/GridDhtTxRemote.java | 6 +- .../dht/atomic/GridDhtAtomicCache.java | 227 +++--------- ...arOptimisticSerializableTxPrepareFuture.java | 4 +- .../near/GridNearOptimisticTxPrepareFuture.java | 7 +- .../GridNearPessimisticTxPrepareFuture.java | 4 +- .../near/GridNearTxFinishFuture.java | 112 +++++- .../continuous/CacheContinuousQueryHandler.java | 5 - .../cache/transactions/IgniteTxAdapter.java | 46 ++- .../cache/transactions/IgniteTxEntry.java | 44 ++- .../cache/transactions/IgniteTxHandler.java | 163 +++++++-- .../transactions/IgniteTxLocalAdapter.java | 27 +- .../cache/transactions/IgniteTxManager.java | 154 +++++++- .../continuous/GridContinuousHandler.java | 8 - .../continuous/GridContinuousProcessor.java | 33 +- .../binary/BinaryObjectToStringSelfTest.java | 75 ++++ ...idAbstractCacheInterceptorRebalanceTest.java | 356 +++++++++++++++++++ ...heInterceptorAtomicOffheapRebalanceTest.java | 30 ++ ...GridCacheInterceptorAtomicRebalanceTest.java | 36 ++ ...ceptorTransactionalOffheapRebalanceTest.java | 35 ++ ...heInterceptorTransactionalRebalanceTest.java | 36 ++ .../processors/cache/GridCacheTestEntryEx.java | 4 + .../IgniteCacheInterceptorSelfTestSuite.java | 5 + .../IgniteCachePutRetryAbstractSelfTest.java | 39 +- ...gniteCachePutRetryTransactionalSelfTest.java | 75 +++- ...ContinuousQueryFailoverAbstractSelfTest.java | 99 ++++++ ...eContinuousQueryMultiNodesFilteringTest.java | 161 +++++++++ .../IgniteBinaryObjectsTestSuite.java | 2 + .../config/benchmark-client-mode.properties | 2 + .../config/benchmark-tx-win.properties | 2 + .../yardstick/config/benchmark-tx.properties | 2 + .../yardstick/config/benchmark-win.properties | 2 + modules/yardstick/config/benchmark.properties | 2 + .../cache/IgniteGetAndPutBenchmark.java | 41 +++ .../cache/IgniteGetAndPutTxBenchmark.java | 70 ++++ .../cache/IgniteInvokeTxBenchmark.java | 40 +++ 51 files changed, 2471 insertions(+), 440 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f4bd20d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f4bd20d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f4bd20d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f4bd20d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f4bd20d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f4bd20d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ----------------------------------------------------------------------
