Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2949B18A4C for ; Mon, 18 Jan 2016 14:12:08 +0000 (UTC) Received: (qmail 51529 invoked by uid 500); 18 Jan 2016 14:12:07 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 51350 invoked by uid 500); 18 Jan 2016 14:12:07 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 50851 invoked by uid 99); 18 Jan 2016 14:12:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jan 2016 14:12:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 370DEE3868; Mon, 18 Jan 2016 14:12:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Mon, 18 Jan 2016 14:12:25 -0000 Message-Id: <6d33412a1ac946f7959f9c1fb971e9d9@git.apache.org> In-Reply-To: <40b4beb3e488418087724fbc9bd43321@git.apache.org> References: <40b4beb3e488418087724fbc9bd43321@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Wed Jan 13 18:44:52 2016 +0300 Committer: Pavel Tupitsyn 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(-) ----------------------------------------------------------------------