Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(zookeeper): recursively delete non-empty znodes

Eve047cf96f8ec6
diff --git a/agents/drivers/zookeeper/agent_test.go b/agents/drivers/zookeeper/agent_test.go
index 0fcc647c5b..d998925f23 100644
--- a/agents/drivers/zookeeper/agent_test.go
+++ b/agents/drivers/zookeeper/agent_test.go
@@ -222,10 +222,18 @@ func TestKVOperationsAndPagination(t *testing.T) {
t.Fatalf("continuation mismatch error=%v", err)
}
- deleted, err := service.delete(json.RawMessage(`{"key":"/app","recursive":true}`))
+ if _, err := service.delete(json.RawMessage(`{"key":"/app","recursive":false}`)); err != zk.ErrNotEmpty {
+ t.Fatalf("non-recursive delete error=%v", err)
+ }
+ deleted, err := service.delete(json.RawMessage(`{"key":"/app"}`))
if err != nil || deleted["deleted"].(int) < 4 {
t.Fatalf("delete=%#v err=%v", deleted, err)
}
+ put(`{"key":"/recursive/child","value":{"data":"v"}}`)
+ deleted, err = service.delete(json.RawMessage(`{"key":"/recursive","recursive":true}`))
+ if err != nil || deleted["deleted"] != 2 {
+ t.Fatalf("explicit recursive delete=%#v err=%v", deleted, err)
+ }
missing, err := service.delete(json.RawMessage(`{"key":"/app","recursive":true}`))
if err != nil || missing["deleted"] != 0 {
t.Fatalf("missing delete=%#v err=%v", missing, err)
diff --git a/agents/drivers/zookeeper/operations.go b/agents/drivers/zookeeper/operations.go
index d446d4e9a6..954ed1e50a 100644
--- a/agents/drivers/zookeeper/operations.go
+++ b/agents/drivers/zookeeper/operations.go
@@ -33,7 +33,7 @@ type putRequest struct {
type deleteRequest struct {
Key string `json:"key"`
- Recursive bool `json:"recursive"`
+ Recursive *bool `json:"recursive"`
}
type listRequest struct {
@@ -223,7 +223,8 @@ func (service *server) delete(params json.RawMessage) (map[string]any, error) {
if !exists {
return map[string]any{"deleted": 0}, nil
}
- if !request.Recursive {
+ recursive := request.Recursive == nil || *request.Recursive
+ if !recursive {
if err := client.Delete(path); err != nil {
if err == zk.ErrNoNode {
return map[string]any{"deleted": 0}, nil