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 1F3B31870D for ; Fri, 8 May 2015 09:31:44 +0000 (UTC) Received: (qmail 76800 invoked by uid 500); 8 May 2015 09:31:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 76770 invoked by uid 500); 8 May 2015 09:31:44 -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 76761 invoked by uid 99); 8 May 2015 09:31:44 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 May 2015 09:31:44 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 7B35E182871 for ; Fri, 8 May 2015 09:31:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id XiNVvd28zqGC for ; Fri, 8 May 2015 09:31:30 +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 27C2B2A9D5 for ; Fri, 8 May 2015 09:31:23 +0000 (UTC) Received: (qmail 74740 invoked by uid 99); 8 May 2015 09:31:21 -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, 08 May 2015 09:31:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0CAB2E3A5D; Fri, 8 May 2015 09:31:21 +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: Fri, 08 May 2015 09:31:49 -0000 Message-Id: In-Reply-To: <2105a7af46dc4f41a620f8675eb7e450@git.apache.org> References: <2105a7af46dc4f41a620f8675eb7e450@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/48] incubator-ignite git commit: Merge branches 'ignite-855' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-855 Merge branches 'ignite-855' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-855 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/91b2764c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/91b2764c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/91b2764c Branch: refs/heads/ignite-373 Commit: 91b2764c781fadf5ef1f1cff9877b9d6b3d6ea8b Parents: 733f30e a452dac Author: S.Vladykin Authored: Wed May 6 14:31:20 2015 +0300 Committer: S.Vladykin Committed: Wed May 6 14:31:20 2015 +0300 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 4 +- .../communication/GridIoMessageFactory.java | 4 +- .../cache/DynamicCacheDescriptor.java | 16 +- .../processors/cache/GridCacheAdapter.java | 511 +++++++++--------- .../processors/cache/GridCacheProcessor.java | 189 ++++--- ...ridCacheOptimisticCheckPreparedTxFuture.java | 434 --------------- ...idCacheOptimisticCheckPreparedTxRequest.java | 232 -------- ...dCacheOptimisticCheckPreparedTxResponse.java | 179 ------- .../distributed/GridCacheTxRecoveryFuture.java | 506 ++++++++++++++++++ .../distributed/GridCacheTxRecoveryRequest.java | 261 +++++++++ .../GridCacheTxRecoveryResponse.java | 182 +++++++ .../GridDistributedTxRemoteAdapter.java | 2 +- .../cache/transactions/IgniteInternalTx.java | 5 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 38 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 173 ++---- .../processors/igfs/IgfsDataManager.java | 3 + .../processors/igfs/IgfsMetaManager.java | 2 +- .../resources/META-INF/classnames.properties | 12 +- .../processors/cache/CacheGetFromJobTest.java | 110 ++++ .../GridCacheAbstractFailoverSelfTest.java | 4 +- .../GridCacheAbstractNodeRestartSelfTest.java | 94 ++-- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 ++ ...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 ++ ...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 ++ ...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 +++++++++++++++++++ .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + .../igfs/IgfsClientCacheSelfTest.java | 132 +++++ .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../testsuites/IgniteCacheRestartTestSuite.java | 5 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 - .../IgniteCacheTxRecoverySelfTestSuite.java | 4 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 + 37 files changed, 2364 insertions(+), 1393 deletions(-) ----------------------------------------------------------------------