BenjaminPerryRoss commented on a change in pull request #4818:
URL: https://github.com/apache/geode/pull/4818#discussion_r412492948
##########
File path:
geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
##########
@@ -313,22 +313,21 @@ public DataCommandResult remove(String key, String
keyClass, String regionName,
CliStrings.REMOVE__MSG__KEY_NOT_FOUND_REGION, false);
}
} else {
- DataPolicy policy = region.getAttributes().getDataPolicy();
- if (!policy.withPartitioning()) {
- region.clear();
- if (logger.isDebugEnabled()) {
- logger.debug("Cleared all keys in the region - {}", regionName);
- }
- return DataCommandResult.createRemoveInfoResult(key, null, null,
- CliStrings.format(CliStrings.REMOVE__MSG__CLEARED_ALL_CLEARS,
regionName), true);
- } else {
- return DataCommandResult.createRemoveInfoResult(key, null, null,
-
CliStrings.REMOVE__MSG__CLEARALL_NOT_SUPPORTED_FOR_PARTITIONREGION, false);
- }
+ return clear(region, regionName);
}
}
}
+ public DataCommandResult clear(Region region, String regionName) {
+ DataPolicy policy = region.getAttributes().getDataPolicy();
Review comment:
I've removed it.
##########
File path:
geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/ClearCommand.java
##########
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+
+package org.apache.geode.management.internal.cli.commands;
+
+import static
org.apache.geode.management.internal.cli.commands.DataCommandsUtils.callFunctionForRegion;
+
+import java.util.Set;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.management.cli.CliMetaData;
+import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.GfshCommand;
+import org.apache.geode.management.internal.cli.domain.DataCommandRequest;
+import org.apache.geode.management.internal.cli.domain.DataCommandResult;
+import org.apache.geode.management.internal.cli.functions.DataCommandFunction;
+import org.apache.geode.management.internal.cli.result.model.ResultModel;
+import org.apache.geode.management.internal.i18n.CliStrings;
+import org.apache.geode.security.ResourcePermission.Operation;
+import org.apache.geode.security.ResourcePermission.Resource;
+
+public class ClearCommand extends GfshCommand {
+ public static final String REGION_NOT_FOUND = "Region <%s> not found in any
of the members";
+
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA,
CliStrings.TOPIC_GEODE_REGION})
+ @CliCommand(value = {CliStrings.CLEAR}, help = CliStrings.CLEAR_HELP)
+ public ResultModel clear(
+ @CliOption(key = {CliStrings.CLEAR_REGION_NAME}, mandatory = true,
+ help = CliStrings.CLEAR_REGION_NAME_HELP,
+ optionContext = ConverterHint.REGION_PATH) String regionPath) {
+
+ Cache cache = getCache();
+
+ authorize(Resource.DATA, Operation.WRITE, regionPath);
+
+
+ Region region = cache.getRegion(regionPath);
+ DataCommandFunction clearfn = new DataCommandFunction();
+ DataCommandResult dataResult;
+ if (region == null) {
+ Set<DistributedMember> memberList = findAnyMembersForRegion(regionPath);
+
+ if (CollectionUtils.isEmpty(memberList)) {
+ return new ResultModel().createError(String.format(REGION_NOT_FOUND,
regionPath));
Review comment:
I've removed this.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
