You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jc...@apache.org on 2019/01/23 00:21:08 UTC
[geode] branch feature/GEODE-6273 updated: Fix the CI failures
This is an automated email from the ASF dual-hosted git repository.
jchen21 pushed a commit to branch feature/GEODE-6273
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6273 by this push:
new 512a2fe Fix the CI failures
512a2fe is described below
commit 512a2fe753ce2fc8c329ccfde415c4b0eabe9314
Author: Scott Jewell <sj...@pivotal.io>
AuthorDate: Tue Jan 22 16:19:17 2019 -0800
Fix the CI failures
Also show groups in `describe jdbc-mapping` command
Co-authored-by: Scott Jewell <sj...@pivotal.io>
Co-authored-by: Jianxia Chen <jc...@pivotal.io>
---
.../jdbc/internal/cli/CreateMappingCommandDUnitTest.java | 2 +-
.../connectors/jdbc/internal/cli/CreateMappingCommand.java | 7 +++++--
.../connectors/jdbc/internal/cli/DescribeMappingFunction.java | 5 ++++-
.../connectors/jdbc/internal/configuration/RegionMapping.java | 11 +++++------
.../internal/sanctioned-geode-connectors-serializables.txt | 2 +-
.../jdbc/internal/cli/DescribeMappingFunctionTest.java | 4 ++++
.../geode/connectors/jdbc/internal/xml/ElementTypeTest.java | 2 ++
.../geode/connectors/util/DescribeMappingCommandTest.java | 4 +++-
.../management/internal/cli/commands/CreateRegionCommand.java | 2 +-
.../geode/management/internal/cli/remote/CommandExecutor.java | 3 ++-
10 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
index 1a77df5..1cee130 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
@@ -512,7 +512,7 @@ public class CreateMappingCommandDUnitTest {
// NOTE: --table is optional so it should not be in the output but it is. See GEODE-3468.
gfsh.executeAndAssertThat(csb.toString()).statusIsError()
.containsOutput(
- "You should specify option (--table, --pdx-name, --synchronous, --id, --catalog, --schema, --groups) for this command");
+ "You should specify option (--table, --pdx-name, --synchronous, --id, --catalog, --schema, --group) for this command");
}
@Test
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 b91f06f..a0f2c6c 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
@@ -37,6 +37,7 @@ import org.apache.geode.connectors.util.internal.MappingConstants;
import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.cli.CliMetaData;
+import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.cli.SingleGfshCommand;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
@@ -105,7 +106,8 @@ public class CreateMappingCommand extends SingleGfshCommand {
help = CREATE_MAPPING__CATALOG_NAME__HELP) String catalog,
@CliOption(key = CREATE_MAPPING__SCHEMA_NAME,
help = CREATE_MAPPING__SCHEMA_NAME__HELP) String schema,
- @CliOption(key = {CliStrings.GROUPS, CliStrings.GROUP},
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
+ optionContext = ConverterHint.MEMBERGROUP,
help = CREATE_MAPPING__GROUPS_NAME__HELP) String[] groups) {
if (regionName.startsWith("/")) {
regionName = regionName.substring(1);
@@ -115,7 +117,8 @@ public class CreateMappingCommand extends SingleGfshCommand {
// Set<DistributedMember> targetMembers = findMembersForRegion(regionName, groups);
Set<DistributedMember> targetMembers = findMembers(groups, null);
RegionMapping mapping =
- new RegionMapping(regionName, pdxName, table, dataSourceName, id, catalog, schema, groups);
+ new RegionMapping(regionName, pdxName, table, dataSourceName, id, catalog, schema,
+ groups != null ? String.join(",", groups) : null);
try {
ConfigurationPersistenceService configurationPersistenceService =
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
index 2cd9f9e..8930c3a 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
@@ -16,6 +16,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import static org.apache.geode.connectors.util.internal.MappingConstants.CATALOG_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.DATA_SOURCE_NAME;
+import static org.apache.geode.connectors.util.internal.MappingConstants.GROUP_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.ID_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.PDX_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.REGION_NAME;
@@ -70,7 +71,9 @@ public class DescribeMappingFunction extends CliFunction<String> {
if (mapping.getSchema() != null) {
attributes.put(SCHEMA_NAME, mapping.getSchema());
}
-
+ if (mapping.getGroups() != null) {
+ attributes.put(GROUP_NAME, mapping.getGroups());
+ }
return new DescribeMappingResult(attributes);
}
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
index bfa0ebd..205f1ee 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.connectors.jdbc.internal.configuration;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -79,7 +78,7 @@ public class RegionMapping implements CacheElement {
@XmlAttribute(name = "schema")
protected String schema;
@XmlAttribute(name = "groups")
- protected String[] groups;
+ protected String groups;
@XmlTransient
protected String regionName;
@@ -89,7 +88,7 @@ public class RegionMapping implements CacheElement {
public RegionMapping() {}
public RegionMapping(String regionName, String pdxName, String tableName,
- String dataSourceName, String ids, String catalog, String schema, String[] groups) {
+ String dataSourceName, String ids, String catalog, String schema, String groups) {
this.regionName = regionName;
this.pdxName = pdxName;
this.tableName = tableName;
@@ -129,7 +128,7 @@ public class RegionMapping implements CacheElement {
}
public void setGroups(String groups) {
- this.schema = groups;
+ this.groups = groups;
}
public String getDataSourceName() {
@@ -156,7 +155,7 @@ public class RegionMapping implements CacheElement {
return schema;
}
- public String[] getGroups() {
+ public String getGroups() {
return groups;
}
@@ -264,7 +263,7 @@ public class RegionMapping implements CacheElement {
&& isEqual(ids, that.ids)
&& isEqual(catalog, that.catalog)
&& isEqual(schema, that.schema)
- && isEqual(Arrays.toString(groups), Arrays.toString((that.groups)));
+ && isEqual(groups, that.groups);
}
private static boolean isEqual(String s1, String s2) {
diff --git a/geode-connectors/src/main/resources/org/apache/geode/internal/sanctioned-geode-connectors-serializables.txt b/geode-connectors/src/main/resources/org/apache/geode/internal/sanctioned-geode-connectors-serializables.txt
index 83029fd..6da751b 100755
--- a/geode-connectors/src/main/resources/org/apache/geode/internal/sanctioned-geode-connectors-serializables.txt
+++ b/geode-connectors/src/main/resources/org/apache/geode/internal/sanctioned-geode-connectors-serializables.txt
@@ -5,4 +5,4 @@ org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction,false
org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction,false
org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction,false
org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction,false
-org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping,false,catalog:java/lang/String,dataSourceName:java/lang/String,ids:java/lang/String,pdxName:java/lang/String,regionName:java/lang/String,schema:java/lang/String,tableName:java/lang/String
+org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping,false,catalog:java/lang/String,dataSourceName:java/lang/String,groups:java/lang/String[],ids:java/lang/String,pdxName:java/lang/String,regionName:java/lang/String,schema:java/lang/String,tableName:java/lang/String
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
index 2e29dd1..1d0e9db 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import static org.apache.geode.connectors.util.internal.MappingConstants.CATALOG_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.DATA_SOURCE_NAME;
+import static org.apache.geode.connectors.util.internal.MappingConstants.GROUP_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.ID_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.PDX_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.REGION_NAME;
@@ -61,6 +62,7 @@ public class DescribeMappingFunctionTest {
private static final String TEST_ID = "testId";
private static final String TEST_CATALOG = "testCatalog";
private static final String TEST_SCHEMA = "testSchema";
+ private static final String TEST_GROUP = "testGroup";
private DescribeMappingFunction function;
private JdbcConnectorService service;
@@ -94,6 +96,7 @@ public class DescribeMappingFunctionTest {
when(regionMapping.getIds()).thenReturn(TEST_ID);
when(regionMapping.getCatalog()).thenReturn(TEST_CATALOG);
when(regionMapping.getSchema()).thenReturn(TEST_SCHEMA);
+ when(regionMapping.getGroups()).thenReturn(TEST_GROUP);
}
@Test
@@ -128,6 +131,7 @@ public class DescribeMappingFunctionTest {
expectedAttributes.put(SYNCHRONOUS_NAME, TEST_SYNCHRONOUS);
expectedAttributes.put(CATALOG_NAME, TEST_CATALOG);
expectedAttributes.put(SCHEMA_NAME, TEST_SCHEMA);
+ expectedAttributes.put(GROUP_NAME, TEST_GROUP);
ArgumentCaptor<CliFunctionResult> argument = ArgumentCaptor.forClass(CliFunctionResult.class);
verify(resultSender, times(1)).lastResult(argument.capture());
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
index a7c8bf0..3b3e035 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
@@ -18,6 +18,7 @@ package org.apache.geode.connectors.jdbc.internal.xml;
import static org.apache.geode.connectors.jdbc.internal.xml.ElementType.JDBC_MAPPING;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.CATALOG;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.DATA_SOURCE;
+import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.GROUPS;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.IDS;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PDX_NAME;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.SCHEMA;
@@ -79,6 +80,7 @@ public class ElementTypeTest {
when(attributes.getValue(IDS)).thenReturn("ids");
when(attributes.getValue(CATALOG)).thenReturn("catalog");
when(attributes.getValue(SCHEMA)).thenReturn("schema");
+ when(attributes.getValue(GROUPS)).thenReturn("groups");
when(regionCreation.getFullPath()).thenReturn("/region");
stack.push(regionCreation);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/org/apache/geode/connectors/util/DescribeMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/org/apache/geode/connectors/util/DescribeMappingCommandTest.java
index 2ad9006..86cae2e 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/org/apache/geode/connectors/util/DescribeMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/org/apache/geode/connectors/util/DescribeMappingCommandTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.connectors.jdbc.org.apache.geode.connectors.util;
import static org.apache.geode.connectors.util.internal.MappingConstants.CATALOG_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.DATA_SOURCE_NAME;
+import static org.apache.geode.connectors.util.internal.MappingConstants.GROUP_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.ID_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.PDX_NAME;
import static org.apache.geode.connectors.util.internal.MappingConstants.REGION_NAME;
@@ -87,6 +88,7 @@ public class DescribeMappingCommandTest {
attributes.put(ID_NAME, "myId");
attributes.put(CATALOG_NAME, "myCatalog");
attributes.put(SCHEMA_NAME, "mySchema");
+ attributes.put(GROUP_NAME, "myGroup");
DescribeMappingResult mappingResult = new DescribeMappingResult(attributes);
@@ -105,7 +107,7 @@ public class DescribeMappingCommandTest {
.containsOutput(DATA_SOURCE_NAME, "name1").containsOutput(TABLE_NAME, "table1")
.containsOutput(PDX_NAME, "class1").containsOutput(ID_NAME, "myId")
.containsOutput(SCHEMA_NAME, "mySchema").containsOutput(CATALOG_NAME, "myCatalog")
- .containsOutput("true");
+ .containsOutput("true").containsOutput(GROUP_NAME, "myGroup");
}
@Test
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java
index afd9c2c..e752d8a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java
@@ -92,7 +92,7 @@ public class CreateRegionCommand extends SingleGfshCommand {
@CliOption(key = CliStrings.CREATE_REGION__USEATTRIBUTESFROM,
optionContext = ConverterHint.REGION_PATH,
help = CliStrings.CREATE_REGION__USEATTRIBUTESFROM__HELP) String templateRegion,
- @CliOption(key = {CliStrings.GROUPS, CliStrings.GROUP},
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.CREATE_REGION__GROUP__HELP) String[] groups,
@CliOption(key = {CliStrings.IFNOTEXISTS, CliStrings.CREATE_REGION__SKIPIFEXISTS},
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutor.java
index 399122e..de056ad 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutor.java
@@ -145,7 +145,8 @@ public class CommandExecutor {
}
List<String> groupsToUpdate;
- String groupsInput = parseResult.getParamValueAsString("groups");
+ String groupsInput = parseResult.getParamValueAsString("group");
+
TabularResultModel table = null;
if (!StringUtils.isBlank(groupsInput)) {