ignite-598: review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f2da5a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f2da5a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f2da5a4 Branch: refs/heads/ignite-598 Commit: 3f2da5a486c7b9668802a690d5c897917d45c4bf Parents: 1df9ff5 Author: Artem Shutak <ashu...@gridgain.com> Authored: Tue Mar 31 19:40:12 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Tue Mar 31 19:40:12 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContextImpl.java | 1 - .../processors/cache/GridCacheProcessor.java | 18 +-------- .../processors/cache/GridCacheUtils.java | 39 ++++++++++++++++++++ .../processors/plugin/CachePluginManager.java | 38 ------------------- .../ignite/plugin/CachePluginProvider.java | 9 ++--- 5 files changed, 44 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f2da5a4/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index 9c12a64..58a6d35 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -31,7 +31,6 @@ import org.apache.ignite.internal.managers.loadbalancer.*; import org.apache.ignite.internal.managers.swapspace.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.dr.*; import org.apache.ignite.internal.processors.cacheobject.*; import org.apache.ignite.internal.processors.clock.*; import org.apache.ignite.internal.processors.closure.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f2da5a4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git 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 index 63d82ce..3071eb1 100644 --- 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 @@ -2025,7 +2025,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { } } - // TODO: implement remote configs valiudation. + // TODO 10006: implement remote configs validation. // Check plugin configurations. // for (CachePluginConfiguration locPluginCcfg : locCfg.getPluginConfiguration()) { // CachePluginProvider provider = ...; @@ -2054,22 +2054,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { } /** - * Checks if store check should be skipped for given nodes. - * - * @param cfg Cache configuration. - * @param rmtNode Remote node. - * @param locNode Local node. - * @return {@code True} if store check should be skipped. - */ - private boolean checkStoreConsistency(CacheConfiguration cfg, ClusterNode rmtNode, ClusterNode locNode) { - return - // In atomic mode skip check if either local or remote node is client. - cfg.getAtomicityMode() == ATOMIC && - (!ctx.discovery().cacheAffinityNode(rmtNode, cfg.getName()) || - !ctx.discovery().cacheAffinityNode(locNode, cfg.getName())); - } - - /** * Gets preload finish future for preload-ordered cache with given order. I.e. will get compound preload future * with maximum order less than {@code order}. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f2da5a4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index d5e466b..fb34cb0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -35,6 +35,7 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; +import org.apache.ignite.plugin.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; import org.jsr166.*; @@ -1827,4 +1828,42 @@ public class GridCacheUtils { @Nullable public static <T> T value(@Nullable CacheObject cacheObj, GridCacheContext ctx, boolean cpy) { return cacheObj != null ? cacheObj.<T>value(ctx.cacheObjectContext(), cpy) : null; } + + /** + * @param cfg Cache configuration. + * @param cl Type of cache plugin configuration. + * @return Cache plugin configuration by type from cache configuration or <code>null</code>. + */ + public static <C extends CachePluginConfiguration> C cachePluginConfiguration( + CacheConfiguration cfg, Class<C> cl) { + if (cfg.getPluginConfiguration() != null) { + for (CachePluginConfiguration pluginCfg : cfg.getPluginConfiguration()) { + if (pluginCfg.getClass() == cl) + return (C)pluginCfg; + } + } + + return null; + } + + /** + * @param cfg Config. + * @param cls Class. + * @return Not <code>null</code> list. + */ + public static <T extends CachePluginConfiguration> List<T> cachePluginConfigurations(IgniteConfiguration cfg, + Class<T> cls) { + List<T> res = new ArrayList<>(); + + if (cfg.getCacheConfiguration() != null) { + for (CacheConfiguration ccfg : cfg.getCacheConfiguration()) { + for (CachePluginConfiguration pluginCcfg : ccfg.getPluginConfiguration()) { + if (cls == pluginCcfg.getClass()) + res.add((T)pluginCcfg); + } + } + } + + return res; + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f2da5a4/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java index b8b3d47..cd44696 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/CachePluginManager.java @@ -74,44 +74,6 @@ public class CachePluginManager extends GridCacheManagerAdapter { } /** - * @param cfg Cache configuration. - * @param cl Type of cache plugin configuration. - * @return Cache plugin configuration by type from cache configuration or <code>null</code>. - */ - public static <C extends CachePluginConfiguration> C cachePluginConfiguration( - CacheConfiguration cfg, Class<C> cl) { - if (cfg.getPluginConfiguration() != null) { - for (CachePluginConfiguration pluginCfg : cfg.getPluginConfiguration()) { - if (pluginCfg.getClass() == cl) - return (C)pluginCfg; - } - } - - return null; - } - - /** - * @param cfg Config. - * @param cls Class. - * @return Not <code>null</code> list. - */ - public static <T extends CachePluginConfiguration> List<T> cachePluginConfigurations(IgniteConfiguration cfg, - Class<T> cls) { - List<T> res = new ArrayList<>(); - - if (cfg.getCacheConfiguration() != null) { - for (CacheConfiguration ccfg : cfg.getCacheConfiguration()) { - for (CachePluginConfiguration pluginCcfg : ccfg.getPluginConfiguration()) { - if (cls == pluginCcfg.getClass()) - res.add((T)pluginCcfg); - } - } - } - - return res; - } - - /** * Creates optional component. * * @param cls Component class. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f2da5a4/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java index a449d48..264e2af 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java @@ -73,11 +73,10 @@ public interface CachePluginProvider<C extends CachePluginConfiguration> { /** * Checks that remote caches has configuration compatible with the local. * - * @param locCfg - * @param locPluginCcfg - * @param rmtCfg - * @param node - * @throws IgniteCheckedException + * @param locCfg Local configuration. + * @param locPluginCcfg Local plugin configuration. + * @param rmtCfg Remote configuration. + * @param node Node. */ public void validateRemote(CacheConfiguration locCfg, C locPluginCcfg, CacheConfiguration rmtCfg, ClusterNode node) throws IgniteCheckedException;
