Skip to content

[refactor][broker]introduce private methods to remove clones #25550

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

Open
aaaZayne wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −9
Open

[refactor][broker]introduce private methods to remove clones #25550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions ...ar-broker-common/src/main/java/org/apache/pulsar/broker/resources/NamespaceResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,16 @@ public CompletableFuture<Void> setPoliciesAsync(NamespaceName ns, Function<Polic
}

public static boolean pathIsFromNamespace(String path) {
return path.startsWith(BASE_POLICIES_PATH + "/")
&& path.substring(BASE_POLICIES_PATH.length() + 1).contains("/");
return pathHasNestedSegmentUnderRoot(path, BASE_POLICIES_PATH);
}

public static boolean pathIsNamespaceLocalPolicies(String path) {
return path.startsWith(LOCAL_POLICIES_ROOT + "/")
&& path.substring(LOCAL_POLICIES_ROOT.length() + 1).contains("/");
return pathHasNestedSegmentUnderRoot(path, LOCAL_POLICIES_ROOT);
}

private static boolean pathHasNestedSegmentUnderRoot(String path, String rootPath) {
return path.startsWith(rootPath + "/")
&& path.substring(rootPath.length() + 1).contains("/");
}

/**
Expand Down
14 changes: 9 additions & 5 deletions pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TopicResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,18 @@ public CompletableFuture<Boolean> persistentTopicExists(TopicName topic) {
}

public CompletableFuture<Void> clearNamespacePersistence(NamespaceName ns) {
String path = MANAGED_LEDGER_PATH + "/" + ns;
log.info().attr("namespace", ns).attr("path", path).log("Clearing namespace persistence for namespace: , path");
return store.deleteIfExists(path, Optional.empty());
return clearManagedLedgerPathIfExistsAsync(ns, MANAGED_LEDGER_PATH + "/" + ns,
"Clearing namespace persistence for namespace: , path");
}

public CompletableFuture<Void> clearDomainPersistence(NamespaceName ns) {
String path = MANAGED_LEDGER_PATH + "/" + ns + "/persistent";
log.info().attr("namespace", ns).attr("path", path).log("Clearing domain persistence for namespace: , path");
return clearManagedLedgerPathIfExistsAsync(ns, MANAGED_LEDGER_PATH + "/" + ns + "/persistent",
"Clearing domain persistence for namespace: , path");
}

private CompletableFuture<Void> clearManagedLedgerPathIfExistsAsync(
NamespaceName ns, String path, String logMessage) {
log.info().attr("namespace", ns).attr("path", path).log(logMessage);
Comment on lines -93 to +104
Copy link
Copy Markdown
Member

@lhotari lhotari Apr 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This refactoring isn't that useful since the method name clearManagedLedgerPathIfExistsAsync isn't accurate. The path is a MetadataStore path, exactly what store.deleteIfExists already handles.
Eliminating duplication for the log message isn't useful since it just results in harder readability.

return store.deleteIfExists(path, Optional.empty());
}

Expand Down