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/01/18 15:12:25 UTC
[20/50] ignite git commit: Merge remote-tracking branch
'remotes/upstream/master' into ignite-2324
Merge remote-tracking branch 'remotes/upstream/master' into ignite-2324
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cdea54d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cdea54d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cdea54d7
Branch: refs/heads/ignite-2324
Commit: cdea54d705bad7298818c9ec9df953a2a69c13c0
Parents: 9229f54 457a9ae
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Wed Jan 13 18:44:52 2016 +0300
Committer: Pavel Tupitsyn <pt...@gridgain.com>
Committed: Wed Jan 13 18:44:52 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/IgniteTransactions.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 95 +++-
.../ignite/internal/MarshallerContextImpl.java | 86 +++-
.../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 +
.../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 +-
...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 +
.../continuous/GridEventConsumeSelfTest.java | 3 +
.../internal/util/nio/GridNioSelfTest.java | 11 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 -
...CommunicationRecoveryAckClosureSelfTest.java | 19 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +
.../junits/common/GridCommonAbstractTest.java | 34 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +
.../IgniteCacheTxRecoverySelfTestSuite.java | 3 +
.../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 69 ++-
70 files changed, 1578 insertions(+), 377 deletions(-)
----------------------------------------------------------------------