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 F08801724E for ; Wed, 13 May 2015 18:25:45 +0000 (UTC) Received: (qmail 29503 invoked by uid 500); 13 May 2015 18:25:45 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 29474 invoked by uid 500); 13 May 2015 18:25:45 -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 29465 invoked by uid 99); 13 May 2015 18:25:45 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2015 18:25:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 6C1411A2B0B for ; Wed, 13 May 2015 18:25:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id RiY06DsQ2ZEl for ; Wed, 13 May 2015 18:25:35 +0000 (UTC) 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 704A7230CB for ; Wed, 13 May 2015 18:25:35 +0000 (UTC) Received: (qmail 19321 invoked by uid 99); 13 May 2015 18:24:20 -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, 13 May 2015 18:24:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E5F0DE30F6; Wed, 13 May 2015 18:24:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 13 May 2015 18:25:07 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [48/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-709_2' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-709_2 Merge branches 'ignite-709_2' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-709_2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae38a243 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae38a243 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae38a243 Branch: refs/heads/ignite-836_2 Commit: ae38a2435113fdec5988978cc3f0899189a220e3 Parents: 406e297 5f8925b Author: Yakov Zhdanov Authored: Wed May 13 12:54:46 2015 +0300 Committer: Yakov Zhdanov Committed: Wed May 13 12:54:46 2015 +0300 ---------------------------------------------------------------------- bin/include/functions.sh | 2 +- .../internal/direct/DirectByteBufferStream.java | 4 +- .../eventstorage/GridEventStorageManager.java | 5 +- .../processors/cache/GridCacheMvccManager.java | 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 32 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 27 + .../cache/distributed/dht/GridDhtTxMapping.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 81 +- .../colocated/GridDhtColocatedLockFuture.java | 25 +- .../colocated/GridDhtDetachedCacheEntry.java | 4 +- .../distributed/near/GridNearCacheEntry.java | 4 +- .../distributed/near/GridNearLockFuture.java | 5 - .../near/GridNearOptimisticTxPrepareFuture.java | 779 +++++++++++++ .../GridNearPessimisticTxPrepareFuture.java | 349 ++++++ .../cache/distributed/near/GridNearTxLocal.java | 84 +- .../near/GridNearTxPrepareFuture.java | 1050 ------------------ .../near/GridNearTxPrepareFutureAdapter.java | 226 ++++ .../cache/transactions/IgniteInternalTx.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 68 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 12 +- .../ignite/internal/util/IgniteUtils.java | 4 +- .../GridCacheAbstractFailoverSelfTest.java | 8 +- .../GridCacheAbstractNodeRestartSelfTest.java | 11 +- .../distributed/IgniteTxGetAfterStopTest.java | 131 +++ ...ePrimaryNodeFailureRecoveryAbstractTest.java | 4 +- ...idCacheAtomicReplicatedFailoverSelfTest.java | 6 + .../GridCachePartitionedTxSalvageSelfTest.java | 25 +- .../GridCacheReplicatedFailoverSelfTest.java | 6 + .../GridCacheReplicatedNodeRestartSelfTest.java | 80 ++ .../IgniteCacheFailoverTestSuite.java | 10 +- .../testsuites/IgniteCacheRestartTestSuite.java | 8 +- .../testsuites/IgniteCacheTestSuite3.java | 2 + 34 files changed, 1778 insertions(+), 1288 deletions(-) ----------------------------------------------------------------------