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 DD44B1860D for ; Wed, 8 Jul 2015 08:59:28 +0000 (UTC) Received: (qmail 54948 invoked by uid 500); 8 Jul 2015 08:59:28 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 54917 invoked by uid 500); 8 Jul 2015 08:59:28 -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 54908 invoked by uid 99); 8 Jul 2015 08:59:28 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2015 08:59:28 +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 5C5751A6B39 for ; Wed, 8 Jul 2015 08:59:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, 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-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id YuDV7D7DjumS for ; Wed, 8 Jul 2015 08:59:24 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 202EB4C0CE for ; Wed, 8 Jul 2015 08:59:14 +0000 (UTC) Received: (qmail 54351 invoked by uid 99); 8 Jul 2015 08:59:13 -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, 08 Jul 2015 08:59:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6705CE0AD6; Wed, 8 Jul 2015 08:59:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 08 Jul 2015 08:59:27 -0000 Message-Id: <9f4c12f08fc74fc3a2761436f9155bca@git.apache.org> In-Reply-To: <7a28e215427e42d598f117223405258a@git.apache.org> References: <7a28e215427e42d598f117223405258a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/50] incubator-ignite git commit: Merge branches 'ignite-gg-10416' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10416 Merge branches 'ignite-gg-10416' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10416 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/beb697af Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/beb697af Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/beb697af Branch: refs/heads/ignite-843 Commit: beb697afabec3342195d301d1c68a58b3154b689 Parents: fcff50e ea90d86 Author: AKuznetsov Authored: Fri Jul 3 10:07:42 2015 +0700 Committer: AKuznetsov Committed: Fri Jul 3 10:07:42 2015 +0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 5 + .../apache/ignite/IgniteSystemProperties.java | 3 + .../apache/ignite/internal/IgniteKernal.java | 1 - .../managers/communication/GridIoManager.java | 124 +++++++-- .../managers/communication/GridIoMessage.java | 15 +- .../managers/communication/GridIoPolicy.java | 32 +-- .../eventstorage/GridEventStorageManager.java | 2 +- .../processors/cache/CacheOperationContext.java | 44 +++- .../internal/processors/cache/CacheType.java | 8 +- .../processors/cache/GridCacheAdapter.java | 91 ++++--- .../processors/cache/GridCacheAtomicFuture.java | 12 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheIoManager.java | 12 +- .../processors/cache/GridCacheMvccManager.java | 8 +- .../processors/cache/GridCacheProxyImpl.java | 10 +- .../processors/cache/GridCacheSwapManager.java | 257 ++++++++++++------- .../processors/cache/GridCacheUtils.java | 42 +++ .../processors/cache/IgniteCacheProxy.java | 36 ++- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java | 9 +- .../GridDistributedTxRemoteAdapter.java | 3 +- .../distributed/dht/GridDhtTxFinishRequest.java | 3 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../cache/distributed/dht/GridDhtTxRemote.java | 5 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 177 +++++++++++-- .../near/GridNearTxFinishRequest.java | 3 +- .../cache/distributed/near/GridNearTxLocal.java | 3 +- .../distributed/near/GridNearTxRemote.java | 5 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 11 +- .../transactions/IgniteTxLocalAdapter.java | 3 +- .../datastructures/GridCacheAtomicLongImpl.java | 25 +- .../GridCacheAtomicSequenceImpl.java | 11 +- .../GridCacheAtomicStampedImpl.java | 21 +- .../GridCacheCountDownLatchImpl.java | 16 +- .../internal/processors/igfs/IgfsContext.java | 5 +- .../plugin/IgnitePluginProcessor.java | 3 +- .../plugin/extensions/communication/IoPool.java | 42 +++ .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 5 +- .../TcpDiscoveryMulticastIpFinder.java | 2 +- .../communication/GridIoManagerSelfTest.java | 2 +- .../cache/IgniteInternalCacheTypesTest.java | 3 +- .../IgniteCachePutRetryAbstractSelfTest.java | 147 +++++++++++ .../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 +++ ...gniteCachePutRetryTransactionalSelfTest.java | 74 ++++++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../GridCacheEvictionFilterSelfTest.java | 2 - .../inmemory/GridTestSwapSpaceSpi.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 3 + .../query/h2/opt/GridH2KeyValueRowOffheap.java | 8 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../cache/IgniteCacheOffheapEvictQueryTest.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 - .../IgniteCacheQueryNodeRestartSelfTest2.java | 5 + modules/urideploy/pom.xml | 14 - 61 files changed, 1053 insertions(+), 378 deletions(-) ----------------------------------------------------------------------