Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GEODE-6365: Add server group support for JDBC List Mapping and Destroy Mapping Commands #3228

Closed
wants to merge 7 commits into from
Closed

GEODE-6365: Add server group support for JDBC List Mapping and Destroy Mapping Commands #3228

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b077a69
GEODE-6365: Fixed lobic error in DestroyRegionCommand
BenjaminPerryRoss Feb 21, 2019
9ca64ba
Kicking off PR build after flakey test failure
dschneider-pivotal Feb 21, 2019
8dfed3b
Merge branch 'feature/GEODE-6365' of github.com:BenjaminPerryRoss/geo…
jchen21 Feb 22, 2019
a3d78c0
Spotless Apply
jchen21 Feb 22, 2019
c9a9af1
Fix test failures
jchen21 Feb 22, 2019
48beca9
Trigger CI
jchen21 Feb 22, 2019
2a9ba31
Trigger CI
jchen21 Feb 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
81 changes: 71 additions & 10 deletions ...dTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
View file
Open in desktop
Expand Up @@ -208,10 +208,6 @@ public void listsRegionMappingForServerGroup() throws Exception {
+ IdAndName.class.getName();
gfsh.executeAndAssertThat(mapping).statusIsSuccess();

CommandStringBuilder csbd = new CommandStringBuilder(
"describe jdbc-mapping --region=" + regionName + " --groups=" + TEST_GROUP1);
gfsh.executeAndAssertThat(csbd.toString());

CommandStringBuilder csb =
new CommandStringBuilder(LIST_MAPPING + " --groups=" + TEST_GROUP1);
CommandResultAssert commandResultAssert = gfsh.executeAndAssertThat(csb.toString());
Expand Down Expand Up @@ -331,15 +327,80 @@ public void listsRegionMappingForMultiServerGroup() throws Exception {
@Test
public void reportsNoRegionMappingsFound() throws Exception {
locator = startupRule.startLocatorVM(0);
server1 = startupRule.startServerVM(1, locator.getPort());
server1 = startupRule.startServerVM(1, TEST_GROUP1, locator.getPort());
gfsh.connectAndVerify(locator);
gfsh.executeAndAssertThat("create region --name=" + regionName + " --type=REPLICATE")
gfsh.executeAndAssertThat(
"create data-source --name=connection --url=\"jdbc:derby:memory:newDB;create=true\"")
.statusIsSuccess();
gfsh.executeAndAssertThat(
"create region --name=" + regionName + " --groups=" + TEST_GROUP1 + " --type=REPLICATE")
.statusIsSuccess();
createTable();
try {
String mapping =
"create jdbc-mapping --region=" + regionName + " --groups=" + TEST_GROUP1
+ " --data-source=connection --schema=mySchema --table=myTable --pdx-name="
+ IdAndName.class.getName();
gfsh.executeAndAssertThat(mapping).statusIsSuccess();

CommandStringBuilder csb = new CommandStringBuilder(LIST_MAPPING);
CommandStringBuilder csb =
new CommandStringBuilder(LIST_MAPPING + " --groups=" + TEST_GROUP1);
CommandResultAssert commandResultAssert = gfsh.executeAndAssertThat(csb.toString());

commandResultAssert.statusIsSuccess();
commandResultAssert.tableHasRowCount(LIST_OF_MAPPINGS, 1);
commandResultAssert.tableHasColumnOnlyWithValues(LIST_OF_MAPPINGS, regionName);

csb = new CommandStringBuilder(LIST_MAPPING);
commandResultAssert = gfsh.executeAndAssertThat(csb.toString());
commandResultAssert.statusIsSuccess();
commandResultAssert.tableHasRowCount(LIST_OF_MAPPINGS, 0);
} finally {
dropTable();
}
}

CommandResultAssert commandResultAssert = gfsh.executeAndAssertThat(csb.toString());
commandResultAssert.statusIsSuccess();
commandResultAssert.containsOutput("No JDBC mappings found");
@Test
public void testDestroyRegionFailsWithExistingJdbcMapping() throws Exception {
locator = startupRule.startLocatorVM(0);
server1 = startupRule.startServerVM(1, TEST_GROUP1, locator.getPort());
server2 = startupRule.startServerVM(2, TEST_GROUP2, locator.getPort());

gfsh.connectAndVerify(locator);
gfsh.executeAndAssertThat(
"create data-source --name=connection --url=\"jdbc:derby:memory:newDB;create=true\"")
.statusIsSuccess();
gfsh.executeAndAssertThat(
"create region --name=" + GROUP1_REGION + " --groups=" + TEST_GROUP1 + " --type=REPLICATE")
.statusIsSuccess();
gfsh.executeAndAssertThat(
"create region --name=" + GROUP2_REGION + " --groups=" + TEST_GROUP2 + " --type=REPLICATE")
.statusIsSuccess();
createTable();
try {
String mapping =
"create jdbc-mapping --region=" + GROUP1_REGION + " --groups=" + TEST_GROUP1
+ " --data-source=connection --schema=mySchema --table=myTable --pdx-name="
+ IdAndName.class.getName();
gfsh.executeAndAssertThat(mapping).statusIsSuccess();

mapping =
"create jdbc-mapping --region=" + GROUP2_REGION + " --groups=" + TEST_GROUP2
+ " --data-source=connection --schema=mySchema --table=myTable --pdx-name="
+ IdAndName.class.getName();
gfsh.executeAndAssertThat(mapping).statusIsSuccess();

CommandStringBuilder csb = new CommandStringBuilder("destroy region --name=" + GROUP1_REGION);
gfsh.executeAndAssertThat(csb.toString()).statusIsError()
.containsOutput("Cannot destroy region \"" + GROUP1_REGION
+ "\" because JDBC mapping exists. Use \"destroy jdbc-mapping\" first.");

csb = new CommandStringBuilder("destroy region --name=" + GROUP2_REGION);
gfsh.executeAndAssertThat(csb.toString()).statusIsError()
.containsOutput("Cannot destroy region \"" + GROUP2_REGION
+ "\" because JDBC mapping exists. Use \"destroy jdbc-mapping\" first.");
} finally {
dropTable();
}
}
}
22 changes: 10 additions & 12 deletions ...src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java
View file
Open in desktop
Expand Up @@ -102,18 +102,16 @@ void checkForJDBCMapping(String regionPath) {
groupNames.add("cluster");
for (String groupName : groupNames) {
CacheConfig cacheConfig = ccService.getCacheConfig(groupName);
if (cacheConfig == null) {
return;
}
RegionConfig regionConfig = CacheElement.findElement(cacheConfig.getRegions(), regionName);
if (regionConfig == null) {
return;
}
CacheElement element =
CacheElement.findElement(regionConfig.getCustomRegionElements(), "jdbc-mapping");
if (element != null) {
throw new IllegalStateException("Cannot destroy region \"" + regionName
+ "\" because JDBC mapping exists. Use \"destroy jdbc-mapping\" first.");
if (cacheConfig != null) {
RegionConfig regionConfig = CacheElement.findElement(cacheConfig.getRegions(), regionName);
if (regionConfig != null) {
CacheElement element =
CacheElement.findElement(regionConfig.getCustomRegionElements(), "jdbc-mapping");
if (element != null) {
throw new IllegalStateException("Cannot destroy region \"" + regionName
+ "\" because JDBC mapping exists. Use \"destroy jdbc-mapping\" first.");
}
}
}
}
}
Expand Down