You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/09/23 10:41:14 UTC
[12/12] ignite git commit: Merge branch 'ignite-1.6.8' into
ignite-1.6.8-hadoop
Merge branch 'ignite-1.6.8' into ignite-1.6.8-hadoop
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4d08b5cb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4d08b5cb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4d08b5cb
Branch: refs/heads/ignite-1.6.8-hadoop
Commit: 4d08b5cb52a7d0dc1218ebdb750cef8b0032f810
Parents: ee5a818 16b82b7
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Sep 23 13:40:27 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Sep 23 13:40:27 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 12 +
.../internal/GridEventConsumeHandler.java | 5 -
.../internal/GridMessageListenHandler.java | 5 -
.../internal/binary/BinaryObjectExImpl.java | 164 ++++++---
.../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 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 18 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 38 +-
.../binary/BinaryObjectToStringSelfTest.java | 92 +++++
.../CacheSwapUnswapGetTestSmallQueueSize.java | 35 ++
...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 +++++++++
.../file/GridFileSwapSpaceSpiSelfTest.java | 89 +++++
.../IgniteBinaryObjectsTestSuite.java | 2 +
.../testsuites/IgniteCacheTestSuite4.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 +++
56 files changed, 2666 insertions(+), 447 deletions(-)
----------------------------------------------------------------------