This is an automated email from the ASF dual-hosted git repository. jchen21 pushed a commit to branch feature/GEODE-6197 in repository https://gitbox.apache.org/repos/asf/geode.git
commit ca144ba87c46e1946c3ba987bd5479ab9fa4d45d Author: Jianxia Chen <[email protected]> AuthorDate: Wed Dec 12 15:26:29 2018 -0800 GEODE-6197: Fix create and destroy jdbc-mapping Now `create jdbc-mapping` and `destroy jdbc-mapping` only target the members that have the named region. Authored-by: Jianxia Chen <[email protected]> --- .../geode/connectors/jdbc/internal/cli/CreateMappingCommand.java | 2 +- .../geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java | 2 +- .../connectors/jdbc/internal/cli/CreateMappingCommandTest.java | 6 +----- .../connectors/jdbc/internal/cli/DestroyMappingCommandTest.java | 6 +----- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java index 6bcefc5..e638d3c 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java @@ -97,7 +97,7 @@ public class CreateMappingCommand extends SingleGfshCommand { } // input - Set<DistributedMember> targetMembers = getMembers(null, null); + Set<DistributedMember> targetMembers = findMembersForRegion(regionName); RegionMapping mapping = new RegionMapping(regionName, pdxName, table, dataSourceName, id); try { diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java index 36098bf..3241157 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java @@ -62,7 +62,7 @@ public class DestroyMappingCommand extends SingleGfshCommand { } // input - Set<DistributedMember> targetMembers = getMembers(null, null); + Set<DistributedMember> targetMembers = findMembersForRegion(regionName); // action List<CliFunctionResult> results = diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java index 671442d..6981d81 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java @@ -43,7 +43,6 @@ import org.apache.geode.cache.configuration.RegionConfig; import org.apache.geode.connectors.jdbc.JdbcAsyncWriter; import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping; import org.apache.geode.distributed.ConfigurationPersistenceService; -import org.apache.geode.distributed.internal.DistributionManager; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.cli.Result; @@ -59,7 +58,6 @@ public class CreateMappingCommandTest { private String dataSourceName; private String tableName; private String pdxClass; - private DistributionManager distributionManager; private Set<InternalDistributedMember> members; private List<CliFunctionResult> results; private CliFunctionResult successFunctionResult; @@ -76,11 +74,8 @@ public class CreateMappingCommandTest { tableName = "testTable"; pdxClass = "myPdxClass"; cache = mock(InternalCache.class); - distributionManager = mock(DistributionManager.class); - when(cache.getDistributionManager()).thenReturn(distributionManager); members = new HashSet<>(); members.add(mock(InternalDistributedMember.class)); - when(distributionManager.getNormalDistributionManagerIds()).thenReturn(members); createRegionMappingCommand = spy(CreateMappingCommand.class); createRegionMappingCommand.setCache(cache); results = new ArrayList<>(); @@ -89,6 +84,7 @@ public class CreateMappingCommandTest { doReturn(results).when(createRegionMappingCommand).executeAndGetFunctionResult(any(), any(), any()); + doReturn(members).when(createRegionMappingCommand).findMembersForRegion(regionName); mapping = mock(RegionMapping.class); when(mapping.getRegionName()).thenReturn(regionName); diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandTest.java index a633ff0..59ad887 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandTest.java @@ -43,7 +43,6 @@ import org.apache.geode.cache.configuration.RegionAttributesType; import org.apache.geode.cache.configuration.RegionConfig; import org.apache.geode.connectors.jdbc.JdbcWriter; import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping; -import org.apache.geode.distributed.internal.DistributionManager; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.cli.Result; @@ -56,7 +55,6 @@ public class DestroyMappingCommandTest { private DestroyMappingCommand destroyRegionMappingCommand; private String regionName; - private DistributionManager distributionManager; private Set<InternalDistributedMember> members; private List<CliFunctionResult> results; private CliFunctionResult successFunctionResult; @@ -68,11 +66,8 @@ public class DestroyMappingCommandTest { public void setup() { regionName = "regionName"; cache = mock(InternalCache.class); - distributionManager = mock(DistributionManager.class); - when(cache.getDistributionManager()).thenReturn(distributionManager); members = new HashSet<>(); members.add(mock(InternalDistributedMember.class)); - when(distributionManager.getNormalDistributionManagerIds()).thenReturn(members); destroyRegionMappingCommand = spy(DestroyMappingCommand.class); destroyRegionMappingCommand.setCache(cache); results = new ArrayList<>(); @@ -81,6 +76,7 @@ public class DestroyMappingCommandTest { doReturn(results).when(destroyRegionMappingCommand).executeAndGetFunctionResult(any(), any(), any()); + doReturn(members).when(destroyRegionMappingCommand).findMembersForRegion(regionName); cacheConfig = mock(CacheConfig.class);
