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 B724618BCF for ; Wed, 29 Apr 2015 13:01:36 +0000 (UTC) Received: (qmail 47228 invoked by uid 500); 29 Apr 2015 13:01:36 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 47184 invoked by uid 500); 29 Apr 2015 13:01:36 -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 47155 invoked by uid 99); 29 Apr 2015 13:01:36 -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 13:01:36 +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.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 13:01:27 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 84B26283F5 for ; Wed, 29 Apr 2015 13:01:06 +0000 (UTC) Received: (qmail 45772 invoked by uid 99); 29 Apr 2015 13:01:06 -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 13:01:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D5E4E03C7; Wed, 29 Apr 2015 13:01:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 29 Apr 2015 13:01:32 -0000 Message-Id: <73c01935921a462586d86cd87dd24a84@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [28/50] incubator-ignite git commit: Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d411b9f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d411b9f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d411b9f2 Branch: refs/heads/ignite-630 Commit: d411b9f24a5bd8d07f4cce494667e717a6122707 Parents: 576c888 2a68725 Author: AKuznetsov Authored: Tue Apr 28 21:06:18 2015 +0700 Committer: AKuznetsov Committed: Tue Apr 28 21:06:18 2015 +0700 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------