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 5E4B417F51 for ; Mon, 6 Apr 2015 17:59:59 +0000 (UTC) Received: (qmail 61899 invoked by uid 500); 6 Apr 2015 17:59:59 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 61870 invoked by uid 500); 6 Apr 2015 17:59:59 -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 61861 invoked by uid 99); 6 Apr 2015 17:59:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 17:59:59 +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; Mon, 06 Apr 2015 17:59:34 +0000 Received: (qmail 60249 invoked by uid 99); 6 Apr 2015 17:59:31 -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; Mon, 06 Apr 2015 17:59:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A94DFE1819; Mon, 6 Apr 2015 17:59:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 06 Apr 2015 17:59:41 -0000 Message-Id: <698f952be28340eaac1e9ff1057f9eb2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-668 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-668 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.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/223a9cd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/223a9cd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/223a9cd1 Branch: refs/heads/ignite-674 Commit: 223a9cd172a2e4d0bc1349b2d06955b614b9ccf0 Parents: 093489e 580f051 Author: sboikov Authored: Sun Apr 5 19:30:09 2015 +0300 Committer: sboikov Committed: Sun Apr 5 19:30:09 2015 +0300 ---------------------------------------------------------------------- .gitignore | 2 +- examples/schema-import/bin/db-init.sql | 17 ++ .../configuration/CacheConfiguration.java | 2 +- .../ignite/events/CacheQueryExecutedEvent.java | 11 +- .../ignite/events/CacheQueryReadEvent.java | 11 +- .../ignite/internal/GridCachePluginContext.java | 6 + .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheProcessor.java | 62 ++++--- .../cache/query/GridCacheQueryManager.java | 18 +- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../processors/plugin/CachePluginManager.java | 51 ++++-- .../processors/query/GridQueryProcessor.java | 4 +- .../ignite/plugin/CachePluginContext.java | 11 ++ .../ignite/plugin/CachePluginProvider.java | 4 +- .../org/apache/ignite/plugin/PluginContext.java | 9 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 + .../communication/tcp/TcpCommunicationSpi.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 7 - ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 + ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +- .../query/h2/twostep/GridMapQueryExecutor.java | 4 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +- parent/pom.xml | 1 - scripts/git-apply-patch.sh | 94 ++++++++++ scripts/git-format-patch.sh | 87 ++++++++++ scripts/git-patch-functions.sh | 171 +++++++++++++++++++ scripts/git-patch-prop.sh | 24 +++ 27 files changed, 547 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/223a9cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 0455ff0,f21eabc..482d816 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@@ -670,7 -682,11 +691,11 @@@ public class GridCacheProcessor extend if (filter.apply(locNode)) { CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(null, ccfg.getName(), ccfg); - GridCacheContext ctx = createCache(ccfg, desc.cacheType(), cacheObjCtx); + CachePluginManager pluginMgr = cache2PluginMgr.get(ccfg.getName()); + + assert pluginMgr != null : " Map=" + cache2PluginMgr; + - GridCacheContext ctx = createCache(ccfg, pluginMgr, cacheObjCtx); ++ GridCacheContext ctx = createCache(ccfg, pluginMgr, desc.cacheType(), cacheObjCtx); ctx.dynamicDeploymentId(desc.deploymentId()); @@@ -984,22 -1000,24 +1009,29 @@@ /** * @param cfg Cache configuration to use to create cache. + * @param pluginMgr Cache plugin manager. + * @param cacheType Cache type. + * @param cacheObjCtx Cache object context. * @return Cache context. * @throws IgniteCheckedException If failed to create cache. */ - @SuppressWarnings({"unchecked"}) - private GridCacheContext createCache(CacheConfiguration cfg, @Nullable CachePluginManager pluginMgr, - CacheObjectContext cacheObjCtx) throws IgniteCheckedException { + private GridCacheContext createCache(CacheConfiguration cfg, ++ @Nullable CachePluginManager pluginMgr, + CacheType cacheType, + CacheObjectContext cacheObjCtx) + throws IgniteCheckedException + { assert cfg != null; CacheStore cfgStore = cfg.getCacheStoreFactory() != null ? cfg.getCacheStoreFactory().create() : null; - validate(ctx.config(), cfg, cfgStore); + validate(ctx.config(), cfg, cacheType, cfgStore); + if (pluginMgr == null) + pluginMgr = new CachePluginManager(ctx, cfg); + + pluginMgr.validate(); + CacheJtaManagerAdapter jta = JTA.create(cfg.getTransactionManagerLookupClassName() == null); jta.createTmLookup(cfg); @@@ -1382,7 -1384,7 +1408,7 @@@ CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(null, ccfg.getName(), ccfg); - GridCacheContext cacheCtx = createCache(ccfg, cacheType, cacheObjCtx); - GridCacheContext cacheCtx = createCache(ccfg, null, cacheObjCtx); ++ GridCacheContext cacheCtx = createCache(ccfg, null, cacheType, cacheObjCtx); cacheCtx.startTopologyVersion(topVer);