Merge remote-tracking branch 'remotes/origin/master' into ignite-5075 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/08ed6da9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/08ed6da9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/08ed6da9 Branch: refs/heads/ignite-5075-pds Commit: 08ed6da988a65c76d5d9e900448e7aa0bff1de78 Parents: b74b739 Author: sboikov <[email protected]> Authored: Wed May 31 10:35:22 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed May 31 10:35:22 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/ClusterCachesInfo.java | 8 ++++---- .../internal/processors/cache/GridCacheAttributes.java | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/08ed6da9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java index 1978f9e..cd79673 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java @@ -143,8 +143,8 @@ class ClusterCachesInfo { CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cacheMode", "Cache mode", locAttr.cacheMode(), rmtAttr.cacheMode(), true); - CU.checkAttributeMismatch(log, rmtCfg.getGroupName(), rmt, "groupName", "Cache group name", - locCfg.getGroupName(), rmtCfg.getGroupName(), true); + CU.checkAttributeMismatch(log, rmtAttr.groupName(), rmt, "groupName", "Cache group name", + locAttr.groupName(), rmtAttr.groupName(), true); CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "sql", "SQL flag", locAttr.sql(), rmtAttr.sql(), true); @@ -1089,8 +1089,8 @@ class ClusterCachesInfo { */ private void validateCacheGroupConfiguration(CacheConfiguration cfg, CacheConfiguration startCfg) throws IgniteCheckedException { - GridCacheAttributes attr1 = new GridCacheAttributes(cfg); - GridCacheAttributes attr2 = new GridCacheAttributes(startCfg); + GridCacheAttributes attr1 = new GridCacheAttributes(cfg, false); + GridCacheAttributes attr2 = new GridCacheAttributes(startCfg, false); CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "cacheMode", "Cache mode", cfg.getCacheMode(), startCfg.getCacheMode(), true); http://git-wip-us.apache.org/repos/asf/ignite/blob/08ed6da9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java index ed695dc..7d97159 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java @@ -52,6 +52,7 @@ public class GridCacheAttributes implements Serializable { /** * @param cfg Cache configuration. + * @param sql SQL flag. */ public GridCacheAttributes(CacheConfiguration cfg, boolean sql) { ccfg = cfg; @@ -60,10 +61,10 @@ public class GridCacheAttributes implements Serializable { } /** - * Public no-arg constructor for {@link Externalizable}. + * @return Cache group name. */ - public GridCacheAttributes() { - // No-op. + public String groupName() { + return ccfg.getGroupName(); } /**
