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 76355109AC for ; Wed, 29 Apr 2015 00:29:00 +0000 (UTC) Received: (qmail 14270 invoked by uid 500); 29 Apr 2015 00:29:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 14243 invoked by uid 500); 29 Apr 2015 00:29:00 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 14159 invoked by uid 99); 29 Apr 2015 00:29:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 00:29:00 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 00:28:55 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 22B3343BAB for ; Wed, 29 Apr 2015 00:28:35 +0000 (UTC) Received: (qmail 13124 invoked by uid 99); 29 Apr 2015 00:28:28 -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; Wed, 29 Apr 2015 00:28:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 79F3CE091A; Wed, 29 Apr 2015 00:28:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 29 Apr 2015 00:29:07 -0000 Message-Id: <9c4bb5e027d8475488db13a1b189ba67@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [41/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-157-2' into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-157-2' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a68725e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a68725e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a68725e Branch: refs/heads/ignite-789 Commit: 2a68725ed9475aa74a9db222169073da2dca2159 Parents: f0000bd 2ea83ce Author: sboikov Authored: Tue Apr 28 16:51:53 2015 +0300 Committer: sboikov Committed: Tue Apr 28 16:51:53 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMvccManager.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 +++++- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtTxFinishFuture.java | 102 +++++++++- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 +++ .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../cache/distributed/near/GridNearTxLocal.java | 6 + .../cache/transactions/IgniteInternalTx.java | 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 +++++- .../cache/transactions/IgniteTxManager.java | 117 +++++++++-- .../cache/IgniteCachePutAllRestartTest.java | 203 +++++++++++++++++++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 ++- ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 7 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 2 - .../near/IgniteCacheNearTxRollbackTest.java | 133 ++++++++++++ .../IgniteCacheFailoverTestSuite.java | 8 +- .../testsuites/IgniteCacheRestartTestSuite.java | 3 +- 20 files changed, 747 insertions(+), 56 deletions(-) ----------------------------------------------------------------------