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 9A1791724A for ; Fri, 10 Apr 2015 12:14:00 +0000 (UTC) Received: (qmail 69914 invoked by uid 500); 10 Apr 2015 12:14:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 69872 invoked by uid 500); 10 Apr 2015 12:14: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 69783 invoked by uid 99); 10 Apr 2015 12:14:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 12:14:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 10 Apr 2015 12:13:57 +0000 Received: (qmail 69278 invoked by uid 99); 10 Apr 2015 12:13:37 -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; Fri, 10 Apr 2015 12:13:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DAE79E040F; Fri, 10 Apr 2015 12:13:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 10 Apr 2015 12:13:55 -0000 Message-Id: <0bbe63695c5e4da3a82d5eaf5935863e@git.apache.org> In-Reply-To: <3a990a70769a41e58d75d60ae3210874@git.apache.org> References: <3a990a70769a41e58d75d60ae3210874@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/34] incubator-ignite git commit: Merge branch 'ignite-674' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-674' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e79a2d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e79a2d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e79a2d0 Branch: refs/heads/ignite-698 Commit: 9e79a2d086474e6804f2a367be8a8d5495edb98f Parents: 9b03ae1 c1ee482 Author: Alexey Goncharuk Authored: Thu Apr 9 23:45:53 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Apr 9 23:45:53 2015 -0700 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 1 - .../java/org/apache/ignite/IgniteCache.java | 9 + .../processors/cache/GridCacheContext.java | 58 ++++- .../cache/GridCacheEvictionManager.java | 6 +- .../cache/GridCacheExplicitLockSpan.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 6 +- .../processors/cache/GridCacheMvcc.java | 2 +- .../cache/GridCacheMvccCandidate.java | 50 ++++- .../processors/cache/GridCacheMvccManager.java | 44 +++- .../distributed/GridDistributedCacheEntry.java | 12 +- .../distributed/dht/GridDhtCacheEntry.java | 36 ++- .../distributed/dht/GridDhtLockFuture.java | 15 +- .../dht/GridDhtTransactionalCacheAdapter.java | 14 +- .../distributed/dht/GridDhtTxFinishFuture.java | 22 +- .../cache/distributed/dht/GridDhtTxLocal.java | 2 + .../distributed/dht/GridDhtTxLocalAdapter.java | 30 ++- .../distributed/dht/GridDhtTxPrepareFuture.java | 28 ++- .../dht/colocated/GridDhtColocatedCache.java | 32 ++- .../colocated/GridDhtColocatedLockFuture.java | 46 +++- .../GridDhtPartitionsExchangeFuture.java | 39 +++- .../distributed/near/GridNearCacheEntry.java | 10 +- .../distributed/near/GridNearLockFuture.java | 13 +- .../near/GridNearTxFinishFuture.java | 8 +- .../cache/distributed/near/GridNearTxLocal.java | 7 + .../near/GridNearTxPrepareFuture.java | 122 +++++++---- .../near/GridNearTxPrepareRequest.java | 64 ++++-- .../cache/transactions/IgniteTxAdapter.java | 3 +- .../cache/transactions/IgniteTxHandler.java | 120 +++++++--- .../transactions/IgniteTxLocalAdapter.java | 76 ++++--- .../cache/transactions/IgniteTxManager.java | 7 + .../internal/util/future/GridFutureAdapter.java | 20 +- .../ignite/internal/util/worker/GridWorker.java | 6 +- .../cache/GridCacheBasicApiAbstractTest.java | 4 +- .../dht/IgniteCacheLockFailoverSelfTest.java | 156 +++++++++++++ .../dht/IgniteCacheMultiTxLockSelfTest.java | 219 +++++++++++++++++++ .../testframework/junits/GridAbstractTest.java | 4 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + 37 files changed, 1061 insertions(+), 235 deletions(-) ----------------------------------------------------------------------