Skip to content

clarified migrate-database help #10474

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

Merged
rolfyone merged 5 commits into from
Mar 11, 2026
Merged

clarified migrate-database help #10474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29d4f88
clarified migrate-database help
rolfyone Mar 11, 2026
bc2eeb6
added line breaks
rolfyone Mar 11, 2026
025a318
spotless
rolfyone Mar 11, 2026
8697c2f
Merge branch 'master' into migrate-database-help
rolfyone Mar 11, 2026
62b8c82
Merge branch 'master' into migrate-database-help
rolfyone Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion teku/src/main/java/tech/pegasys/teku/cli/subcommand/MigrateDatabaseCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
@CommandLine.Command(
name = "migrate-database",
description = "Migrate the database to a specified version.",
subcommands = {UnstableOptionsCommand.class},
mixinStandardHelpOptions = true,
abbreviateSynopsis = true,
versionProvider = PicoCliVersionProvider.class,
Expand Down Expand Up @@ -86,7 +87,10 @@ public class MigrateDatabaseCommand implements Runnable {
paramLabel = "<format>",
hidden = true,
description =
"The target database version to migrate to. 4, 5, 6 (RocksDB), leveldb1, leveldb2",
"""
The target database version to migrate to.
Rocksdb database types supported are 4, 5, 6.
Leveldb types supported are leveldb1, leveldb2.""",
arity = "1")
private String toDbVersion = DatabaseVersion.V6.getValue();

Expand Down
15 changes: 15 additions & 0 deletions teku/src/main/java/tech/pegasys/teku/cli/subcommand/UnstableOptionsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
package tech.pegasys.teku.cli.subcommand;

import java.io.PrintWriter;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import picocli.CommandLine;
import picocli.CommandLine.Help.ColorScheme;
import picocli.CommandLine.Model.CommandSpec;
Expand Down Expand Up @@ -59,6 +61,19 @@ public void run() {
optionsByModuleName.put(
argSpec.heading().replace("%n", ""), argSpec.allOptionsNested()));
commandSpec.mixins().forEach((name, spec) -> optionsByModuleName.put(name, spec.options()));

// Collect options already covered by mixins and arg groups
final Set<OptionSpec> alreadyCovered = new HashSet<>();
commandSpec.mixins().values().forEach(spec -> alreadyCovered.addAll(spec.options()));
commandSpec.argGroups().forEach(ag -> alreadyCovered.addAll(ag.allOptionsNested()));

// Include any hidden options defined directly on the command class itself
final List<OptionSpec> directOptions =
commandSpec.options().stream().filter(opt -> !alreadyCovered.contains(opt)).toList();
if (!directOptions.isEmpty()) {
optionsByModuleName.put(commandSpec.name(), directOptions);
}

optionsByModuleName.forEach(this::printUnstableOptions);
}

Expand Down
Loading