Skip to content

Commit

Permalink
[FIXED] Prevent KV ListKeysFiltered from returning deleted keys (#1803)
Browse files Browse the repository at this point in the history
  • Loading branch information
kruegernet authored Feb 14, 2025
1 parent 901c987 commit 7885c8c
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion jetstream/kv.go
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,7 @@ func (kv *kvs) ListKeys(ctx context.Context, opts ...WatchOpt) (KeyLister, error

// ListKeysWithFilters returns a channel of keys matching the provided filters using WatchFiltered.
func (kv *kvs) ListKeysFiltered(ctx context.Context, filters ...string) (KeyLister, error) {
watcher, err := kv.WatchFiltered(ctx, filters)
watcher, err := kv.WatchFiltered(ctx, filters, IgnoreDeletes(), MetaOnly())
if err != nil {
return nil, err
}
Expand Down
17 changes: 17 additions & 0 deletions jetstream/test/kv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,23 @@ func TestListKeysFiltered(t *testing.T) {
t.Fatalf("Expected key %s in filtered keys, but not found", key)
}
}

// delete apple so we can ensure we do not see it later after another filtered search
err = kv.Delete(ctx, "apple")
expectOk(t, err)

filters = []string{"apple"}
keyLister, err = kv.ListKeysFiltered(ctx, filters...)
expectOk(t, err)

// reset filtered keys
filteredKeys = nil
for key := range keyLister.Keys() {
filteredKeys = append(filteredKeys, key)
}
if len(filteredKeys) != 0 {
t.Fatalf("Expected 0 deleted keys, but %d was found", len(filteredKeys))
}
}

func contains(slice []string, key string) bool {
Expand Down

0 comments on commit 7885c8c

Please sign in to comment.