This is an automated email from the ASF dual-hosted git repository.
sanpwc pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new c0917543680 IGNITE-27248 Rename recalculate -> reset (#7146)
c0917543680 is described below
commit c09175436805f88ce706e3a7280383f02a8399c5
Author: Egor <[email protected]>
AuthorDate: Thu Dec 4 17:29:55 2025 +0400
IGNITE-27248 Rename recalculate -> reset (#7146)
Co-authored-by: Egor Kuts <[email protected]>
---
...dTest.java => ItResetDataNodesCommandTest.java} | 6 +++---
...t.java => ItResetDataNodesReplCommandTest.java} | 6 +++---
...ataNodesTest.java => ItResetDataNodesTest.java} | 14 +++++++-------
...eDataNodesCall.java => ResetDataNodesCall.java} | 10 +++++-----
...CallInput.java => ResetDataNodesCallInput.java} | 14 +++++++-------
.../ignite/internal/cli/commands/Options.java | 6 +++---
.../commands/zone/datanodes/DataNodesCommand.java | 2 +-
.../zone/datanodes/DataNodesReplCommand.java | 2 +-
...odesCommand.java => ResetDataNodesCommand.java} | 18 +++++++++---------
...ataNodesMixin.java => ResetDataNodesMixin.java} | 14 +++++++-------
...Command.java => ResetDataNodesReplCommand.java} | 22 +++++++++++-----------
11 files changed, 57 insertions(+), 57 deletions(-)
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItRecalculateDataNodesCommandTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItResetDataNodesCommandTest.java
similarity index 82%
rename from
modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItRecalculateDataNodesCommandTest.java
rename to
modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItResetDataNodesCommandTest.java
index 80af525af88..92fd7ac7083 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItRecalculateDataNodesCommandTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItResetDataNodesCommandTest.java
@@ -17,10 +17,10 @@
package org.apache.ignite.internal.cli.commands.zone.datanodes;
-/** Test class for {@link RecalculateDataNodesCommand}. */
-public class ItRecalculateDataNodesCommandTest extends
ItRecalculateDataNodesTest {
+/** Test class for {@link ResetDataNodesCommand}. */
+public class ItResetDataNodesCommandTest extends ItResetDataNodesTest {
@Override
protected Class<?> getCommandClass() {
- return RecalculateDataNodesCommand.class;
+ return ResetDataNodesCommand.class;
}
}
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItRecalculateDataNodesReplCommandTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItResetDataNodesReplCommandTest.java
similarity index 81%
rename from
modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItRecalculateDataNodesReplCommandTest.java
rename to
modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItResetDataNodesReplCommandTest.java
index 8e98c280a45..051ab01b042 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItRecalculateDataNodesReplCommandTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItResetDataNodesReplCommandTest.java
@@ -17,10 +17,10 @@
package org.apache.ignite.internal.cli.commands.zone.datanodes;
-/** Test class for {@link RecalculateDataNodesReplCommand}. */
-public class ItRecalculateDataNodesReplCommandTest extends
ItRecalculateDataNodesTest {
+/** Test class for {@link ResetDataNodesReplCommand}. */
+public class ItResetDataNodesReplCommandTest extends ItResetDataNodesTest {
@Override
protected Class<?> getCommandClass() {
- return RecalculateDataNodesReplCommand.class;
+ return ResetDataNodesReplCommand.class;
}
}
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItRecalculateDataNodesTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItResetDataNodesTest.java
similarity index 87%
rename from
modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItRecalculateDataNodesTest.java
rename to
modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItResetDataNodesTest.java
index 33b712cd07f..89fe4c76a09 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItRecalculateDataNodesTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ItResetDataNodesTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.internal.cli.CliIntegrationTest;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-/** Base test class for recalculate data nodes commands. */
-public abstract class ItRecalculateDataNodesTest extends CliIntegrationTest {
+/** Base test class for reset data nodes commands. */
+public abstract class ItResetDataNodesTest extends CliIntegrationTest {
private static final String ZONE1 = "test_zone_1";
private static final String ZONE2 = "test_zone_2";
@@ -36,7 +36,7 @@ public abstract class ItRecalculateDataNodesTest extends
CliIntegrationTest {
}
@Test
- public void testRecalculateAllZones() {
+ public void testResetAllZones() {
execute(CLUSTER_URL_OPTION, NODE_URL);
assertErrOutputIsEmpty();
@@ -44,7 +44,7 @@ public abstract class ItRecalculateDataNodesTest extends
CliIntegrationTest {
}
@Test
- public void testRecalculateSpecifiedZones() {
+ public void testResetSpecifiedZones() {
execute(CLUSTER_URL_OPTION, NODE_URL,
"--zone-names", ZONE1 + "," + ZONE2);
@@ -53,7 +53,7 @@ public abstract class ItRecalculateDataNodesTest extends
CliIntegrationTest {
}
@Test
- public void testRecalculateSingleZone() {
+ public void testResetSingleZone() {
execute(CLUSTER_URL_OPTION, NODE_URL,
"--zone-names", ZONE1);
@@ -62,7 +62,7 @@ public abstract class ItRecalculateDataNodesTest extends
CliIntegrationTest {
}
@Test
- public void testRecalculateNonExistentZone() {
+ public void testResetNonExistentZone() {
String unknownZone = "unknown_zone";
execute(CLUSTER_URL_OPTION, NODE_URL,
@@ -74,7 +74,7 @@ public abstract class ItRecalculateDataNodesTest extends
CliIntegrationTest {
}
@Test
- public void testRecalculateMixedZones() {
+ public void testResetMixedZones() {
String unknownZone = "unknown_zone";
execute(CLUSTER_URL_OPTION, NODE_URL,
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/RecalculateDataNodesCall.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/ResetDataNodesCall.java
similarity index 86%
rename from
modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/RecalculateDataNodesCall.java
rename to
modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/ResetDataNodesCall.java
index 05633abe0d8..2070c0882c8 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/RecalculateDataNodesCall.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/ResetDataNodesCall.java
@@ -29,21 +29,21 @@ import
org.apache.ignite.internal.cli.core.style.element.UiElements;
import org.apache.ignite.rest.client.api.DataNodesApi;
import org.apache.ignite.rest.client.invoker.ApiException;
-/** Call to recalculate data nodes for distribution zones. */
+/** Call to reset data nodes for distribution zones. */
@Singleton
-public class RecalculateDataNodesCall implements
Call<RecalculateDataNodesCallInput, String> {
+public class ResetDataNodesCall implements Call<ResetDataNodesCallInput,
String> {
private final ApiClientFactory clientFactory;
- RecalculateDataNodesCall(ApiClientFactory clientFactory) {
+ ResetDataNodesCall(ApiClientFactory clientFactory) {
this.clientFactory = clientFactory;
}
@Override
- public CallOutput<String> execute(RecalculateDataNodesCallInput input) {
+ public CallOutput<String> execute(ResetDataNodesCallInput input) {
try {
DataNodesApi api = new
DataNodesApi(clientFactory.getClient(input.clusterUrl()));
- // If no zone names specified, pass an empty list (which means
recalculate all zones).
+ // If no zone names specified, pass an empty list (which means
reset all zones).
api.resetDataNodesForZones(input.zoneNames() == null ?
Collections.emptyList() : input.zoneNames());
return
DefaultCallOutput.success(MessageUiComponent.from(UiElements.done()).render());
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/RecalculateDataNodesCallInput.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/ResetDataNodesCallInput.java
similarity index 76%
rename from
modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/RecalculateDataNodesCallInput.java
rename to
modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/ResetDataNodesCallInput.java
index d067ad68861..1d14e425a6d 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/RecalculateDataNodesCallInput.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/management/zone/ResetDataNodesCallInput.java
@@ -18,17 +18,17 @@
package org.apache.ignite.internal.cli.call.management.zone;
import java.util.List;
-import
org.apache.ignite.internal.cli.commands.zone.datanodes.RecalculateDataNodesMixin;
+import
org.apache.ignite.internal.cli.commands.zone.datanodes.ResetDataNodesMixin;
import org.apache.ignite.internal.cli.core.call.CallInput;
/**
- * Input for {@link RecalculateDataNodesCall}.
+ * Input for {@link ResetDataNodesCall}.
*/
-public class RecalculateDataNodesCallInput implements CallInput {
+public class ResetDataNodesCallInput implements CallInput {
private final List<String> zoneNames;
private final String clusterUrl;
- private RecalculateDataNodesCallInput(List<String> zoneNames, String
clusterUrl) {
+ private ResetDataNodesCallInput(List<String> zoneNames, String clusterUrl)
{
this.zoneNames = zoneNames;
this.clusterUrl = clusterUrl;
}
@@ -40,11 +40,11 @@ public class RecalculateDataNodesCallInput implements
CallInput {
* @param clusterUrl Cluster URL.
* @return Call input.
*/
- public static RecalculateDataNodesCallInput of(RecalculateDataNodesMixin
mixin, String clusterUrl) {
- return new RecalculateDataNodesCallInput(mixin.zoneNames(),
clusterUrl);
+ public static ResetDataNodesCallInput of(ResetDataNodesMixin mixin, String
clusterUrl) {
+ return new ResetDataNodesCallInput(mixin.zoneNames(), clusterUrl);
}
- /** Returns zone names to recalculate data nodes for. */
+ /** Returns zone names to reset data nodes for. */
public List<String> zoneNames() {
return zoneNames;
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java
index f93e8e3b58d..3445a9f864d 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java
@@ -336,9 +336,9 @@ public enum Options {
/** Config update file option description. */
public static final String CONFIG_UPDATE_FILE_OPTION_DESC = "Path to
file with config update commands to execute";
- public static final String RECALCULATE_ZONE_NAMES_OPTION =
"--zone-names";
+ public static final String RESET_DATA_NODES_ZONE_NAMES_OPTION =
"--zone-names";
- public static final String RECALCULATE_ZONE_NAMES_OPTION_DESC =
"Comma-separated list of zone names to recalculate data nodes for. "
- + "If not specified, recalculates for all zones.";
+ public static final String RESET_DATA_NODES_ZONE_NAMES_OPTION_DESC =
"Comma-separated list of zone names to reset data nodes for. "
+ + "If not specified, resets for all zones.";
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/DataNodesCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/DataNodesCommand.java
index 8e1da37b105..bfda6d89394 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/DataNodesCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/DataNodesCommand.java
@@ -25,7 +25,7 @@ import picocli.CommandLine.Command;
*/
@Command(name = "datanodes",
subcommands = {
- RecalculateDataNodesCommand.class
+ ResetDataNodesCommand.class
},
description = "Manages data nodes for distribution zones")
public class DataNodesCommand extends BaseCommand {
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/DataNodesReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/DataNodesReplCommand.java
index 64de0618c7e..dff508d7563 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/DataNodesReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/DataNodesReplCommand.java
@@ -25,7 +25,7 @@ import picocli.CommandLine.Command;
*/
@Command(name = "datanodes",
subcommands = {
- RecalculateDataNodesReplCommand.class
+ ResetDataNodesReplCommand.class
},
description = "Manages data nodes for distribution zones")
public class DataNodesReplCommand extends BaseCommand {
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/RecalculateDataNodesCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesCommand.java
similarity index 70%
rename from
modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/RecalculateDataNodesCommand.java
rename to
modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesCommand.java
index 369d2b45ff5..4c7cbe7d7c1 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/RecalculateDataNodesCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesCommand.java
@@ -19,8 +19,8 @@ package
org.apache.ignite.internal.cli.commands.zone.datanodes;
import jakarta.inject.Inject;
import java.util.concurrent.Callable;
-import
org.apache.ignite.internal.cli.call.management.zone.RecalculateDataNodesCall;
-import
org.apache.ignite.internal.cli.call.management.zone.RecalculateDataNodesCallInput;
+import org.apache.ignite.internal.cli.call.management.zone.ResetDataNodesCall;
+import
org.apache.ignite.internal.cli.call.management.zone.ResetDataNodesCallInput;
import org.apache.ignite.internal.cli.commands.BaseCommand;
import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlProfileMixin;
import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
@@ -28,25 +28,25 @@ import
org.apache.ignite.internal.cli.core.exception.handler.ClusterNotInitializ
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
-/** Command to recalculate data nodes for distribution zones. */
-@Command(name = "recalculate", description = "Recalculates data nodes for
distribution zones")
-public class RecalculateDataNodesCommand extends BaseCommand implements
Callable<Integer> {
+/** Command to reset data nodes for distribution zones. */
+@Command(name = "reset", description = "Resets data nodes for distribution
zones")
+public class ResetDataNodesCommand extends BaseCommand implements
Callable<Integer> {
/** Cluster endpoint URL option. */
@Mixin
private ClusterUrlProfileMixin clusterUrl;
@Mixin
- private RecalculateDataNodesMixin options;
+ private ResetDataNodesMixin options;
@Inject
- private RecalculateDataNodesCall call;
+ private ResetDataNodesCall call;
@Override
public Integer call() {
return runPipeline(CallExecutionPipeline.builder(call)
- .inputProvider(() -> RecalculateDataNodesCallInput.of(options,
clusterUrl.getClusterUrl()))
-
.exceptionHandler(ClusterNotInitializedExceptionHandler.createHandler("Cannot
recalculate data nodes"))
+ .inputProvider(() -> ResetDataNodesCallInput.of(options,
clusterUrl.getClusterUrl()))
+
.exceptionHandler(ClusterNotInitializedExceptionHandler.createHandler("Cannot
reset data nodes"))
);
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/RecalculateDataNodesMixin.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesMixin.java
similarity index 77%
rename from
modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/RecalculateDataNodesMixin.java
rename to
modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesMixin.java
index dd4e4493d7b..20daf058616 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/RecalculateDataNodesMixin.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesMixin.java
@@ -17,22 +17,22 @@
package org.apache.ignite.internal.cli.commands.zone.datanodes;
-import static
org.apache.ignite.internal.cli.commands.Options.Constants.RECALCULATE_ZONE_NAMES_OPTION;
-import static
org.apache.ignite.internal.cli.commands.Options.Constants.RECALCULATE_ZONE_NAMES_OPTION_DESC;
+import static
org.apache.ignite.internal.cli.commands.Options.Constants.RESET_DATA_NODES_ZONE_NAMES_OPTION;
+import static
org.apache.ignite.internal.cli.commands.Options.Constants.RESET_DATA_NODES_ZONE_NAMES_OPTION_DESC;
import java.util.List;
import picocli.CommandLine.Option;
-/** Arguments for recalculate data nodes command. */
-public class RecalculateDataNodesMixin {
+/** Arguments for reset data nodes command. */
+public class ResetDataNodesMixin {
@Option(
- names = RECALCULATE_ZONE_NAMES_OPTION,
- description = RECALCULATE_ZONE_NAMES_OPTION_DESC,
+ names = RESET_DATA_NODES_ZONE_NAMES_OPTION,
+ description = RESET_DATA_NODES_ZONE_NAMES_OPTION_DESC,
split = ","
)
private List<String> zoneNames;
- /** Returns names of zones to recalculate data nodes for. */
+ /** Returns names of zones to reset data nodes for. */
public List<String> zoneNames() {
return zoneNames;
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/RecalculateDataNodesReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesReplCommand.java
similarity index 68%
rename from
modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/RecalculateDataNodesReplCommand.java
rename to
modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesReplCommand.java
index 44bb692d2ba..34c01089c4f 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/RecalculateDataNodesReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/zone/datanodes/ResetDataNodesReplCommand.java
@@ -18,8 +18,8 @@
package org.apache.ignite.internal.cli.commands.zone.datanodes;
import jakarta.inject.Inject;
-import
org.apache.ignite.internal.cli.call.management.zone.RecalculateDataNodesCall;
-import
org.apache.ignite.internal.cli.call.management.zone.RecalculateDataNodesCallInput;
+import org.apache.ignite.internal.cli.call.management.zone.ResetDataNodesCall;
+import
org.apache.ignite.internal.cli.call.management.zone.ResetDataNodesCallInput;
import org.apache.ignite.internal.cli.commands.BaseCommand;
import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlMixin;
import
org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
@@ -28,18 +28,18 @@ import
org.apache.ignite.internal.cli.core.flow.builder.Flows;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
-/** REPL command to recalculate data nodes for distribution zones. */
-@Command(name = "recalculate", description = "Recalculates data nodes for
distribution zones")
-public class RecalculateDataNodesReplCommand extends BaseCommand implements
Runnable {
+/** REPL command to reset data nodes for distribution zones. */
+@Command(name = "reset", description = "Resets data nodes for distribution
zones")
+public class ResetDataNodesReplCommand extends BaseCommand implements Runnable
{
@Mixin
private ClusterUrlMixin clusterUrl;
@Mixin
- private RecalculateDataNodesMixin options;
+ private ResetDataNodesMixin options;
@Inject
- private RecalculateDataNodesCall call;
+ private ResetDataNodesCall call;
@Inject
private ConnectToClusterQuestion question;
@@ -47,14 +47,14 @@ public class RecalculateDataNodesReplCommand extends
BaseCommand implements Runn
@Override
public void run() {
runFlow(question.askQuestionIfNotConnected(clusterUrl.getClusterUrl())
- .map(this::recalculateDataNodesCallInput)
+ .map(this::resetDataNodesCallInput)
.then(Flows.fromCall(call))
-
.exceptionHandler(ClusterNotInitializedExceptionHandler.createReplHandler("Cannot
recalculate data nodes"))
+
.exceptionHandler(ClusterNotInitializedExceptionHandler.createReplHandler("Cannot
reset data nodes"))
.print()
);
}
- private RecalculateDataNodesCallInput recalculateDataNodesCallInput(String
clusterUrl) {
- return RecalculateDataNodesCallInput.of(options, clusterUrl);
+ private ResetDataNodesCallInput resetDataNodesCallInput(String clusterUrl)
{
+ return ResetDataNodesCallInput.of(options, clusterUrl);
}
}
