Skip to content
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.

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

Fix bug in needAck #4008

Merged
merged 1 commit into from Mar 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions server/consumer.go
Expand Up @@ -2569,9 +2569,9 @@ func (o *consumer) isFiltered() bool {
// `isFiltered` need to be performant, so we do
// as any checks as possible to avoid unnecessary work.
// Here we avoid iteration over slices if there is only one subject in stream
// and one equal filter for the consumer.
if len(mset.cfg.Subjects) == 1 && len(o.subjf) == 1 && mset.cfg.Subjects[0] == o.subjf[0].subject {
return true
// and one filter for the consumer.
if len(mset.cfg.Subjects) == 1 && len(o.subjf) == 1 {
return mset.cfg.Subjects[0] != o.subjf[0].subject
}

// if the list is not equal length, we can return early, as this is filtered.
Expand Down
61 changes: 61 additions & 0 deletions server/jetstream_test.go
Expand Up @@ -20573,3 +20573,64 @@ func TestJetStreamConsumerAckFloorWithExpired(t *testing.T) {
require_True(t, ci.NumPending == 0)
require_True(t, ci.NumRedelivered == 0)
}

func TestJetStreamConsumerIsFiltered(t *testing.T) {
s := RunBasicJetStreamServer(t)
defer s.Shutdown()
acc := s.GlobalAccount()

tests := []struct {
name string
streamSubjects []string
filters []string
isFiltered bool
}{
{
name: "single_subject",
streamSubjects: []string{"one"},
filters: []string{"one"},
isFiltered: false,
},
{
name: "single_subject_filtered",
streamSubjects: []string{"one.>"},
filters: []string{"one.filter"},
isFiltered: true,
},
{
name: "multi_subject_non_filtered",
streamSubjects: []string{"multi", "foo", "bar.>"},
filters: []string{"multi", "bar.>", "foo"},
isFiltered: false,
},
{
name: "multi_subject_filtered_wc",
streamSubjects: []string{"events", "data"},
filters: []string{"data"},
isFiltered: true,
},
{
name: "multi_subject_filtered",
streamSubjects: []string{"machines", "floors"},
filters: []string{"machines"},
isFiltered: true,
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
mset, err := acc.addStream(&StreamConfig{
Name: test.name,
Subjects: test.streamSubjects,
})
require_NoError(t, err)

o, err := mset.addConsumer(&ConsumerConfig{
FilterSubjects: test.filters,
Durable: test.name,
})
require_NoError(t, err)

require_True(t, o.isFiltered() == test.isFiltered)
})
}
}