You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2018/01/16 20:56:56 UTC
[geode] branch develop updated: GEODE-4257: change default of
value-contains-primary-key (#1261)
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new fb166cc GEODE-4257: change default of value-contains-primary-key (#1261)
fb166cc is described below
commit fb166cca1f9abcb686821d8b3fc3ead432717cc8
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Tue Jan 16 12:56:54 2018 -0800
GEODE-4257: change default of value-contains-primary-key (#1261)
* GEODE-4257: change default of value-contains-primary-key
--value-contains-primary-key now defaults to false
---
.../jdbc/internal/cli/CreateMappingCommand.java | 2 +-
.../geode/connectors/jdbc/JdbcDUnitTest.java | 4 +--
.../cli/CreateMappingCommandDUnitTest.java | 40 +++++++++++++++++++---
3 files changed, 38 insertions(+), 8 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 703ca7c..6186ec8 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
@@ -75,7 +75,7 @@ public class CreateMappingCommand implements GfshCommand {
@CliOption(key = CREATE_MAPPING__PDX_CLASS_NAME,
help = CREATE_MAPPING__PDX_CLASS_NAME__HELP) String pdxClassName,
@CliOption(key = CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY,
- help = CREATE_MAPPING__PRIMARY_KEY_IN_VALUE__HELP, unspecifiedDefaultValue = "true",
+ help = CREATE_MAPPING__PRIMARY_KEY_IN_VALUE__HELP, unspecifiedDefaultValue = "false",
specifiedDefaultValue = "true") boolean keyInValue,
@CliOption(key = CREATE_MAPPING__FIELD_MAPPING,
help = CREATE_MAPPING__FIELD_MAPPING__HELP) String[] fieldMappings) {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java
index ea1878f..adeb48d 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java
@@ -272,8 +272,8 @@ public class JdbcDUnitTest implements Serializable {
}
private void createMapping(String regionName, String connectionName) {
- final String commandStr =
- "create jdbc-mapping --region=" + regionName + " --connection=" + connectionName;
+ final String commandStr = "create jdbc-mapping --region=" + regionName + " --connection="
+ + connectionName + " --value-contains-primary-key";
gfsh.executeAndAssertThat(commandStr).statusIsSuccess();
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
index 552cd23..a811f2b 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
@@ -63,13 +63,13 @@ public class CreateMappingCommandDUnitTest {
}
@Test
- public void createsConnection() {
+ public void createsMappingWithAllOptions() {
CommandStringBuilder csb = new CommandStringBuilder(CREATE_MAPPING);
csb.addOption(CREATE_MAPPING__REGION_NAME, "testRegion");
csb.addOption(CREATE_MAPPING__CONNECTION_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
csb.addOption(CREATE_MAPPING__PDX_CLASS_NAME, "myPdxClass");
- csb.addOption(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY, "false");
+ csb.addOption(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY, "true");
csb.addOption(CREATE_MAPPING__FIELD_MAPPING, "field1:column1,field2:column2");
gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
@@ -77,9 +77,39 @@ public class CreateMappingCommandDUnitTest {
locator.invoke(() -> {
String xml = InternalLocator.getLocator().getSharedConfiguration().getConfiguration("cluster")
.getCacheXmlContent();
- assertThat(xml).isNotNull().contains("jdbc:connector-service");
- assertThat(xml).isNotNull().contains("jdbc:region-mapping");
- assertThat(xml).isNotNull().contains("jdbc:field-mapping");
+ assertThat(xml).isNotNull().contains("jdbc:connector-service")
+ .doesNotContain("jdbc:connection").contains("jdbc:region-mapping")
+ .contains("jdbc:field-mapping");
+ });
+
+ server.invoke(() -> {
+ InternalCache cache = ClusterStartupRule.getCache();
+ RegionMapping mapping =
+ cache.getService(JdbcConnectorService.class).getMappingForRegion("testRegion");
+ assertThat(mapping.getConnectionConfigName()).isEqualTo("connection");
+ assertThat(mapping.getTableName()).isEqualTo("myTable");
+ assertThat(mapping.getPdxClassName()).isEqualTo("myPdxClass");
+ assertThat(mapping.isPrimaryKeyInValue()).isEqualTo(true);
+ assertThat(mapping.getFieldToColumnMap()).containsEntry("field1", "column1")
+ .containsEntry("field2", "column2");
+ });
+ }
+
+ @Test
+ public void validateThatPrimaryKeyInValueDefaultsToFalse() {
+ CommandStringBuilder csb = new CommandStringBuilder(CREATE_MAPPING);
+ csb.addOption(CREATE_MAPPING__REGION_NAME, "testRegion");
+ csb.addOption(CREATE_MAPPING__CONNECTION_NAME, "connection");
+ csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
+ csb.addOption(CREATE_MAPPING__PDX_CLASS_NAME, "myPdxClass");
+ csb.addOption(CREATE_MAPPING__FIELD_MAPPING, "field1:column1,field2:column2");
+
+ gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
+
+ locator.invoke(() -> {
+ String xml = InternalLocator.getLocator().getSharedConfiguration().getConfiguration("cluster")
+ .getCacheXmlContent();
+ assertThat(xml).isNotNull().contains("primary-key-in-value=\"false\"");
});
server.invoke(() -> {
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].