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 9D9DA18B5C for ; Tue, 19 May 2015 01:22:58 +0000 (UTC) Received: (qmail 51428 invoked by uid 500); 19 May 2015 01:22:58 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 51396 invoked by uid 500); 19 May 2015 01:22:58 -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 51387 invoked by uid 99); 19 May 2015 01:22:58 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 May 2015 01:22:58 +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 23BD41A2EF9 for ; Tue, 19 May 2015 01:22:58 +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-eu-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 S2WB6dCAaEc1 for ; Tue, 19 May 2015 01:22:43 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id AE96D25415 for ; Tue, 19 May 2015 01:22:41 +0000 (UTC) Received: (qmail 50145 invoked by uid 99); 19 May 2015 01:22:40 -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; Tue, 19 May 2015 01:22:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C70F2E0B2A; Tue, 19 May 2015 01:22:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 19 May 2015 01:22:51 -0000 Message-Id: In-Reply-To: <38f502e4618b441a8f30b36616399343@git.apache.org> References: <38f502e4618b441a8f30b36616399343@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/26] incubator-ignite git commit: Merge branches 'ignite-891' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-891 Merge branches 'ignite-891' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-891 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c528986 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c528986 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c528986 Branch: refs/heads/ignite-891 Commit: 0c528986a8436f9c904e3049cd1383f81ff75606 Parents: b97441f da5a228 Author: Valentin Kulichenko Authored: Fri May 15 10:41:40 2015 -0700 Committer: Valentin Kulichenko Committed: Fri May 15 10:41:40 2015 -0700 ---------------------------------------------------------------------- .../socket/WordsSocketStreamerServer.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 136 +++++---------- .../internal/interop/InteropBootstrap.java | 34 ++++ .../interop/InteropBootstrapFactory.java | 39 +++++ .../internal/interop/InteropIgnition.java | 103 ++++++++++++ .../internal/interop/InteropProcessor.java | 25 +++ .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 35 +--- .../distributed/GridDistributedLockRequest.java | 111 +++---------- .../GridDistributedTxFinishRequest.java | 70 ++------ .../GridDistributedTxPrepareRequest.java | 112 +++---------- .../GridDistributedTxRemoteAdapter.java | 20 +-- .../distributed/dht/GridDhtLockFuture.java | 2 - .../distributed/dht/GridDhtLockRequest.java | 45 +++-- .../dht/GridDhtTransactionalCacheAdapter.java | 6 - .../distributed/dht/GridDhtTxFinishFuture.java | 3 - .../distributed/dht/GridDhtTxFinishRequest.java | 43 +++-- .../cache/distributed/dht/GridDhtTxLocal.java | 6 - .../distributed/dht/GridDhtTxLocalAdapter.java | 68 +------- .../distributed/dht/GridDhtTxPrepareFuture.java | 18 +- .../dht/GridDhtTxPrepareRequest.java | 60 ++++--- .../cache/distributed/dht/GridDhtTxRemote.java | 8 +- .../colocated/GridDhtColocatedLockFuture.java | 6 - .../distributed/near/GridNearLockFuture.java | 6 - .../distributed/near/GridNearLockRequest.java | 61 +++---- .../near/GridNearOptimisticTxPrepareFuture.java | 15 +- .../GridNearPessimisticTxPrepareFuture.java | 2 - .../near/GridNearTransactionalCache.java | 4 - .../near/GridNearTxFinishRequest.java | 28 ++-- .../cache/distributed/near/GridNearTxLocal.java | 20 +-- .../near/GridNearTxPrepareRequest.java | 52 +++--- .../distributed/near/GridNearTxRemote.java | 24 +-- .../cache/transactions/IgniteInternalTx.java | 10 -- .../transactions/IgniteTransactionsImpl.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 72 +------- .../cache/transactions/IgniteTxEntry.java | 48 +----- .../cache/transactions/IgniteTxHandler.java | 6 - .../transactions/IgniteTxLocalAdapter.java | 165 ++----------------- .../cache/transactions/IgniteTxLocalEx.java | 21 +-- .../cache/transactions/IgniteTxManager.java | 62 +------ .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 26 --- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../processors/cache/jta/CacheJtaManager.java | 4 +- pom.xml | 2 + 45 files changed, 487 insertions(+), 1115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c528986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c528986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 40bb36e,609108f..fa64e12 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@@ -496,17 -480,10 +480,17 @@@ public abstract class IgniteTxLocalAdap */ @SuppressWarnings({"CatchGenericClass"}) protected void batchStoreCommit(Iterable writeEntries) throws IgniteCheckedException { - if (!storeEnabled() || (internal() && !groupLock())) - CacheStoreManager store = store(); ++ if (!storeEnabled() || internal()) + return; - if (store != null && store.isWriteThrough() && storeEnabled() && - !internal() && (near() || store.isWriteToStoreFromDht())) { + Collection stores = stores(); + + if (stores == null || stores.isEmpty()) + return; + + boolean isWriteToStoreFromDht = F.first(stores).isWriteToStoreFromDht(); + + if (near() || isWriteToStoreFromDht) { try { if (writeEntries != null) { Map> putMap = null; @@@ -1008,12 -971,11 +985,12 @@@ } } else { - CacheStoreManager store = store(); + Collection stores = stores(); - if (stores != null && !stores.isEmpty() && (!internal() || groupLock())) { - if (store != null && !internal()) { ++ if (stores != null && !stores.isEmpty() && !internal()) { try { - store.sessionEnd(this, true); + for (CacheStoreManager store : stores) + store.sessionEnd(this, true); } catch (IgniteCheckedException e) { commitError(e); @@@ -1114,13 -1076,11 +1091,13 @@@ cctx.tm().rollbackTx(this); - CacheStoreManager store = store(); + Collection stores = stores(); - if (store != null && (near() || store.isWriteToStoreFromDht())) { - if (!internal()) - store.sessionEnd(this, false); + if (stores != null && !stores.isEmpty() && (near() || F.first(stores).isWriteToStoreFromDht())) { - if (!internal() || groupLock()) { ++ if (!internal()) { + for (CacheStoreManager store : stores) + store.sessionEnd(this, false); + } } } catch (Error | IgniteCheckedException | RuntimeException e) {