You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by cm...@apache.org on 2023/05/23 17:11:57 UTC
[kafka] branch trunk updated (ea6ce3bf82e -> 12130cfceca)
This is an automated email from the ASF dual-hosted git repository.
cmccabe pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
from ea6ce3bf82e KAFKA-15009: Handle new ACLs in KRaft snapshot during migration (#13741)
add 12130cfceca MINOR: Create the MetadataNode classes to introspect MetadataImage
No new revisions were added by this update.
Summary of changes:
checkstyle/import-control.xml | 3 +
.../java/org/apache/kafka/image/AclsImage.java | 6 +-
.../org/apache/kafka/image/ClientQuotaImage.java | 6 +-
.../org/apache/kafka/image/ClientQuotasImage.java | 6 +-
.../java/org/apache/kafka/image/ClusterImage.java | 6 +-
.../org/apache/kafka/image/ConfigurationDelta.java | 2 +-
.../org/apache/kafka/image/ConfigurationImage.java | 21 +-
.../apache/kafka/image/ConfigurationsDelta.java | 9 +-
.../apache/kafka/image/ConfigurationsImage.java | 6 +-
.../java/org/apache/kafka/image/FeaturesImage.java | 8 +-
.../java/org/apache/kafka/image/MetadataImage.java | 13 +-
.../org/apache/kafka/image/ProducerIdsDelta.java | 2 +-
.../org/apache/kafka/image/ProducerIdsImage.java | 16 +-
.../java/org/apache/kafka/image/ScramImage.java | 22 +-
.../java/org/apache/kafka/image/TopicImage.java | 7 +-
.../java/org/apache/kafka/image/TopicsImage.java | 14 +-
.../apache/kafka/image/node/AclsImageByIdNode.java | 64 +++
.../org/apache/kafka/image/node/AclsImageNode.java | 43 +-
.../kafka/image/node/ClientQuotaImageNode.java | 35 +-
.../kafka/image/node/ClientQuotasImageNode.java | 157 +++++++
.../apache/kafka/image/node/ClusterImageNode.java | 62 +++
.../kafka/image/node/ConfigurationImageNode.java | 62 +++
.../kafka/image/node/ConfigurationsImageNode.java | 80 ++++
.../apache/kafka/image/node/FeaturesImageNode.java | 81 ++++
.../apache/kafka/image/node/MetadataImageNode.java | 73 ++++
.../apache/kafka/image/node/MetadataLeafNode.java | 27 +-
.../org/apache/kafka/image/node/MetadataNode.java | 69 ++++
.../kafka/image/node/ProducerIdsImageNode.java | 43 +-
.../apache/kafka/image/node/ProvenanceNode.java | 57 +++
.../kafka/image/node/ScramCredentialDataNode.java | 73 ++++
.../apache/kafka/image/node/ScramImageNode.java | 63 +++
.../kafka/image/node/ScramMechanismNode.java | 36 +-
.../apache/kafka/image/node/TopicImageNode.java | 66 +++
.../kafka/image/node/TopicsImageByIdNode.java | 64 +++
.../kafka/image/node/TopicsImageByNameNode.java | 41 +-
.../apache/kafka/image/node/TopicsImageNode.java | 56 +++
.../image/node/printer/MetadataNodePrinter.java | 39 +-
.../printer/MetadataNodeRedactionCriteria.java | 85 ++++
.../kafka/image/node/printer/NodeStringifier.java | 67 +++
.../metadata/migration/KRaftMigrationZkWriter.java | 2 +-
.../kafka/metadata/util/SnapshotFileReader.java | 12 +-
.../kafka/image/ConfigurationsImageTest.java | 8 +-
.../image/node/ClientQuotasImageNodeTest.java | 134 ++++++
.../image/node/ConfigurationImageNodeTest.java | 77 ++++
.../image/node/ConfigurationsImageNodeTest.java | 86 ++++
.../image/node/ScramCredentialDataNodeTest.java | 64 +++
.../printer/MetadataNodeRedactionCriteriaTest.java | 114 ++++++
.../image/node/printer/NodeStringifierTest.java | 55 +++
.../org/apache/kafka/shell/InteractiveShell.java | 23 +-
.../java/org/apache/kafka/shell/MetadataNode.java | 140 -------
.../apache/kafka/shell/MetadataNodeManager.java | 406 -------------------
.../java/org/apache/kafka/shell/MetadataShell.java | 135 ++++--
.../shell/{ => command}/CatCommandHandler.java | 41 +-
.../shell/{ => command}/CdCommandHandler.java | 49 +--
.../kafka/shell/{ => command}/CommandUtils.java | 38 +-
.../apache/kafka/shell/{ => command}/Commands.java | 42 +-
.../{ => command}/ErroneousCommandHandler.java | 13 +-
.../shell/{ => command}/ExitCommandHandler.java | 19 +-
.../shell/{ => command}/FindCommandHandler.java | 45 +-
.../shell/{ => command}/HelpCommandHandler.java | 19 +-
.../shell/{ => command}/HistoryCommandHandler.java | 19 +-
.../shell/{ => command}/LsCommandHandler.java | 37 +-
.../shell/{ => command}/ManCommandHandler.java | 19 +-
.../shell/{ => command}/NoOpCommandHandler.java | 13 +-
.../shell/{ => command}/PwdCommandHandler.java | 23 +-
.../TreeCommandHandler.java} | 59 +--
.../kafka/shell/{ => glob}/GlobComponent.java | 2 +-
.../apache/kafka/shell/{ => glob}/GlobVisitor.java | 50 ++-
.../apache/kafka/shell/node/LocalShellNode.java | 62 +++
.../org/apache/kafka/shell/node/RootShellNode.java | 52 +++
.../kafka/shell/node/printer/ShellNodePrinter.java | 67 +++
.../kafka/shell/state/MetadataShellPublisher.java | 54 +++
.../kafka/shell/state/MetadataShellState.java | 57 +++
.../org/apache/kafka/shell/GlobComponentTest.java | 76 ----
.../kafka/shell/MetadataNodeManagerTest.java | 451 ---------------------
.../org/apache/kafka/shell/MetadataNodeTest.java | 73 ----
.../kafka/shell/{ => command}/CommandTest.java | 4 +-
.../shell/{ => command}/CommandUtilsTest.java | 6 +-
.../shell/{ => command}/LsCommandHandlerTest.java | 6 +-
.../kafka/shell/{ => glob}/GlobVisitorTest.java | 90 +++-
80 files changed, 2717 insertions(+), 1615 deletions(-)
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/AclsImageByIdNode.java
copy shell/src/main/java/org/apache/kafka/shell/NoOpCommandHandler.java => metadata/src/main/java/org/apache/kafka/image/node/AclsImageNode.java (53%)
copy shell/src/main/java/org/apache/kafka/shell/NoOpCommandHandler.java => metadata/src/main/java/org/apache/kafka/image/node/ClientQuotaImageNode.java (57%)
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/ClientQuotasImageNode.java
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/ClusterImageNode.java
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/ConfigurationImageNode.java
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/ConfigurationsImageNode.java
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/FeaturesImageNode.java
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/MetadataImageNode.java
rename shell/src/main/java/org/apache/kafka/shell/NotFileException.java => metadata/src/main/java/org/apache/kafka/image/node/MetadataLeafNode.java (64%)
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/MetadataNode.java
copy shell/src/main/java/org/apache/kafka/shell/NoOpCommandHandler.java => metadata/src/main/java/org/apache/kafka/image/node/ProducerIdsImageNode.java (51%)
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/ProvenanceNode.java
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/ScramCredentialDataNode.java
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/ScramImageNode.java
copy shell/src/main/java/org/apache/kafka/shell/NoOpCommandHandler.java => metadata/src/main/java/org/apache/kafka/image/node/ScramMechanismNode.java (54%)
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/TopicImageNode.java
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/TopicsImageByIdNode.java
copy shell/src/main/java/org/apache/kafka/shell/NoOpCommandHandler.java => metadata/src/main/java/org/apache/kafka/image/node/TopicsImageByNameNode.java (52%)
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/TopicsImageNode.java
rename shell/src/main/java/org/apache/kafka/shell/NotDirectoryException.java => metadata/src/main/java/org/apache/kafka/image/node/printer/MetadataNodePrinter.java (55%)
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/printer/MetadataNodeRedactionCriteria.java
create mode 100644 metadata/src/main/java/org/apache/kafka/image/node/printer/NodeStringifier.java
create mode 100644 metadata/src/test/java/org/apache/kafka/image/node/ClientQuotasImageNodeTest.java
create mode 100644 metadata/src/test/java/org/apache/kafka/image/node/ConfigurationImageNodeTest.java
create mode 100644 metadata/src/test/java/org/apache/kafka/image/node/ConfigurationsImageNodeTest.java
create mode 100644 metadata/src/test/java/org/apache/kafka/image/node/ScramCredentialDataNodeTest.java
create mode 100644 metadata/src/test/java/org/apache/kafka/image/node/printer/MetadataNodeRedactionCriteriaTest.java
create mode 100644 metadata/src/test/java/org/apache/kafka/image/node/printer/NodeStringifierTest.java
delete mode 100644 shell/src/main/java/org/apache/kafka/shell/MetadataNode.java
delete mode 100644 shell/src/main/java/org/apache/kafka/shell/MetadataNodeManager.java
copy shell/src/main/java/org/apache/kafka/shell/{ => command}/CatCommandHandler.java (73%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/CdCommandHandler.java (66%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/CommandUtils.java (83%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/Commands.java (83%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/ErroneousCommandHandler.java (85%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/ExitCommandHandler.java (82%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/FindCommandHandler.java (71%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/HelpCommandHandler.java (83%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/HistoryCommandHandler.java (87%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/LsCommandHandler.java (91%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/ManCommandHandler.java (87%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/NoOpCommandHandler.java (81%)
rename shell/src/main/java/org/apache/kafka/shell/{ => command}/PwdCommandHandler.java (80%)
rename shell/src/main/java/org/apache/kafka/shell/{CatCommandHandler.java => command/TreeCommandHandler.java} (59%)
rename shell/src/main/java/org/apache/kafka/shell/{ => glob}/GlobComponent.java (99%)
rename shell/src/main/java/org/apache/kafka/shell/{ => glob}/GlobVisitor.java (74%)
create mode 100644 shell/src/main/java/org/apache/kafka/shell/node/LocalShellNode.java
create mode 100644 shell/src/main/java/org/apache/kafka/shell/node/RootShellNode.java
create mode 100644 shell/src/main/java/org/apache/kafka/shell/node/printer/ShellNodePrinter.java
create mode 100644 shell/src/main/java/org/apache/kafka/shell/state/MetadataShellPublisher.java
create mode 100644 shell/src/main/java/org/apache/kafka/shell/state/MetadataShellState.java
delete mode 100644 shell/src/test/java/org/apache/kafka/shell/GlobComponentTest.java
delete mode 100644 shell/src/test/java/org/apache/kafka/shell/MetadataNodeManagerTest.java
delete mode 100644 shell/src/test/java/org/apache/kafka/shell/MetadataNodeTest.java
rename shell/src/test/java/org/apache/kafka/shell/{ => command}/CommandTest.java (97%)
rename shell/src/test/java/org/apache/kafka/shell/{ => command}/CommandUtilsTest.java (90%)
rename shell/src/test/java/org/apache/kafka/shell/{ => command}/LsCommandHandlerTest.java (95%)
rename shell/src/test/java/org/apache/kafka/shell/{ => glob}/GlobVisitorTest.java (65%)