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 5A7AB18A42 for ; Fri, 8 May 2015 10:57:56 +0000 (UTC) Received: (qmail 88672 invoked by uid 500); 8 May 2015 10:57:56 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 88642 invoked by uid 500); 8 May 2015 10:57:56 -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 88633 invoked by uid 99); 8 May 2015 10:57:56 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 May 2015 10:57:56 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id C6FA0C27D5 for ; Fri, 8 May 2015 10:57:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.229 X-Spam-Level: X-Spam-Status: No, score=-3.229 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, 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 (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id gCnvvTMv8lLE for ; Fri, 8 May 2015 10:57:48 +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 4090C474D4 for ; Fri, 8 May 2015 10:57:42 +0000 (UTC) Received: (qmail 87438 invoked by uid 99); 8 May 2015 10:57:41 -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 10:57:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 87880E4422; Fri, 8 May 2015 10:57:41 +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 10:57:47 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-646 Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-646 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cdbaaba4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cdbaaba4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cdbaaba4 Branch: refs/heads/ignite-157 Commit: cdbaaba4c94b7670aae3e174419ec5cf61d4030b Parents: 0d982f7 75425c6 Author: avinogradov Authored: Thu Apr 23 15:01:56 2015 +0300 Committer: avinogradov Committed: Thu Apr 23 15:01:56 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheInterceptor.java | 9 +- .../configuration/CacheConfiguration.java | 30 ++- .../configuration/IgniteConfiguration.java | 107 +++++++++++ .../ignite/configuration/TopologyValidator.java | 35 ++++ .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../ignite/internal/MarshallerContextImpl.java | 2 +- .../connection/GridClientNioTcpConnection.java | 9 +- .../managers/communication/GridIoManager.java | 33 +++- .../GridLifecycleAwareMessageFilter.java | 35 ++++ .../discovery/GridDiscoveryManager.java | 18 +- .../cache/GridCacheAffinityManager.java | 12 -- .../GridCachePartitionExchangeManager.java | 5 +- .../processors/cache/IgniteCacheProxy.java | 15 +- .../cache/affinity/GridCacheAffinityImpl.java | 2 +- .../distributed/dht/GridDhtTopologyFuture.java | 8 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 7 + .../colocated/GridDhtColocatedLockFuture.java | 24 ++- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 17 ++ .../distributed/near/GridNearAtomicCache.java | 2 +- .../distributed/near/GridNearLockFuture.java | 26 ++- .../near/GridNearTransactionalCache.java | 2 +- .../near/GridNearTxPrepareFuture.java | 20 ++ .../transactions/IgniteTxLocalAdapter.java | 2 +- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../processors/job/GridJobProcessor.java | 6 + .../processors/query/GridQueryIndexing.java | 4 +- .../processors/query/GridQueryProcessor.java | 2 +- .../resources/META-INF/classnames.properties | 41 ++--- .../cache/GridCacheAbstractFullApiSelfTest.java | 4 +- .../cache/IgniteExcangeFutureHistoryTest.java | 74 ++++++++ ...gniteTopologyValidatorAbstractCacheTest.java | 183 +++++++++++++++++++ ...iteTopologyValidatorAbstractTxCacheTest.java | 125 +++++++++++++ ...ValidatorNearPartitionedAtomicCacheTest.java | 30 +++ ...logyValidatorNearPartitionedTxCacheTest.java | 30 +++ ...logyValidatorPartitionedAtomicCacheTest.java | 49 +++++ ...TopologyValidatorPartitionedTxCacheTest.java | 30 +++ ...ologyValidatorReplicatedAtomicCacheTest.java | 49 +++++ ...eTopologyValidatorReplicatedTxCacheTest.java | 30 +++ .../IgniteCachePutGetRestartAbstractTest.java | 2 +- ...arDisabledFairAffinityPutGetRestartTest.java | 35 ++++ ...acheSortedEvictionPolicyPerformanceTest.java | 135 ++++++++++++++ .../GridCacheLocalIsolatedNodesSelfTest.java | 102 +++++++++++ .../testframework/junits/GridAbstractTest.java | 15 ++ .../IgniteCacheFailoverTestSuite.java | 3 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 6 + .../IgniteTopologyValidatorTestSuit.java | 43 +++++ .../processors/query/h2/IgniteH2Indexing.java | 6 +- .../query/h2/twostep/GridMapQueryExecutor.java | 34 +++- .../h2/twostep/GridReduceQueryExecutor.java | 34 +++- .../h2/GridIndexingSpiAbstractSelfTest.java | 2 +- .../ignite/schema/generator/CodeGenerator.java | 60 +++++- .../ignite/internal/GridFactorySelfTest.java | 3 +- pom.xml | 14 +- 54 files changed, 1480 insertions(+), 103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cdbaaba4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ----------------------------------------------------------------------