IGNITE-7725 Added cache group name and data region name.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/85c4db5b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/85c4db5b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/85c4db5b Branch: refs/heads/ignite-7725 Commit: 85c4db5ba89e749bc1fccf71107240750a0d5abf Parents: 16cdc57 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Mon Feb 19 17:59:33 2018 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Mon Feb 19 17:59:33 2018 +0700 ---------------------------------------------------------------------- .../cache/CacheConfigurationOverride.java | 53 +++++++++++++++++++- .../processors/cache/GridCacheUtils.java | 6 --- .../http/jetty/GridJettyRestHandler.java | 28 ++++++++++- 3 files changed, 77 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/85c4db5b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConfigurationOverride.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConfigurationOverride.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConfigurationOverride.java index 075448c..fcb7aab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConfigurationOverride.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConfigurationOverride.java @@ -32,6 +32,12 @@ public class CacheConfigurationOverride { private Integer backups; /** */ + private String grpName; + + /** */ + private String dataRegName; + + /** */ private CacheWriteSynchronizationMode writeSync; /** @@ -58,7 +64,6 @@ public class CacheConfigurationOverride { return backups; } - /** * @param backups New number of backup nodes for one partition. * @return {@code this} for chaining. @@ -70,6 +75,40 @@ public class CacheConfigurationOverride { } /** + * @return Cache group name. + */ + public String groupName() { + return grpName; + } + + /** + * @param grpName New cache group name. + * @return {@code this} for chaining. + */ + public CacheConfigurationOverride groupName(String grpName) { + this.grpName = grpName; + + return this; + } + + /** + * @return Data region name. + */ + public String dataRegionName() { + return dataRegName; + } + + /** + * @param dataRegName Data region name. + * @return {@code this} for chaining. + */ + public CacheConfigurationOverride dataRegionName(String dataRegName) { + this.dataRegName = dataRegName; + + return this; + } + + /** * @return Write synchronization mode. */ public CacheWriteSynchronizationMode writeSynchronizationMode() { @@ -101,6 +140,12 @@ public class CacheConfigurationOverride { if (backups != null) ccfg.setBackups(backups); + if (grpName != null) + ccfg.setGroupName(grpName); + + if (dataRegName != null) + ccfg.setDataRegionName(dataRegName); + if (writeSync != null) ccfg.setWriteSynchronizationMode(writeSync); @@ -111,6 +156,10 @@ public class CacheConfigurationOverride { * @return {@code true} If nothing was set. */ public boolean isEmpty() { - return mode == null && backups == null && writeSync == null; + return mode == null && + backups == null && + grpName == null && + dataRegName == null && + writeSync == null; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/85c4db5b/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 c66e413..0926a70 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 @@ -194,12 +194,6 @@ public class GridCacheUtils { /** */ public static final String TX_MSG_RECOVERY_LOG_CATEGORY = TX_MSG_LOG_CATEGORY + ".recovery"; - /** */ - public static final String BACKUPS_PARAM = "backups"; - - /** */ - public static final String WRITE_SYNCHRONIZATION_MODE_PARAM = "writeSynchronizationMode"; - /** Default mask name. */ private static final String DEFAULT_MASK_NAME = "<default>"; http://git-wip-us.apache.org/repos/asf/ignite/blob/85c4db5b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java index 0c70f3f..768c941 100644 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java @@ -62,8 +62,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.internal.processors.cache.GridCacheUtils.BACKUPS_PARAM; -import static org.apache.ignite.internal.processors.cache.GridCacheUtils.WRITE_SYNCHRONIZATION_MODE_PARAM; import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_CONTAINS_KEYS; import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_GET_ALL; import static org.apache.ignite.internal.processors.rest.GridRestCommand.CACHE_PUT_ALL; @@ -84,6 +82,18 @@ public class GridJettyRestHandler extends AbstractHandler { private static final String CACHE_NAME_PARAM = "cacheName"; /** */ + private static final String BACKUPS_PARAM = "backups"; + + /** */ + private static final String GROUP_NAME_PARAM = "groupName"; + + /** */ + private static final String DATA_REGION_NAME_PARAM = "dataRegionName"; + + /** */ + private static final String WRITE_SYNCHRONIZATION_MODE_PARAM = "writeSynchronizationMode"; + + /** */ private static final String TEMPLATE_NAME_PARAM = "templateName"; /** Logger. */ @@ -425,6 +435,7 @@ public class GridJettyRestHandler extends AbstractHandler { CacheConfigurationOverride cfg = new CacheConfigurationOverride(); + // Set cache backups. if (!F.isEmpty(backups)) { try { cfg.backups(Integer.parseInt(backups)); @@ -434,6 +445,19 @@ public class GridJettyRestHandler extends AbstractHandler { } } + // Set cache group name. + String grpName = (String)params.get(GROUP_NAME_PARAM); + + if (!F.isEmpty(grpName)) + cfg.groupName(grpName); + + // Set cache data region name. + String dataRegName = (String)params.get(DATA_REGION_NAME_PARAM); + + if (!F.isEmpty(dataRegName)) + cfg.dataRegionName(dataRegName); + + // Set cache write mode. String wrtSyncMode = (String)params.get(WRITE_SYNCHRONIZATION_MODE_PARAM); if (!F.isEmpty(wrtSyncMode)) {
