Skip to content

[FIXED] Fix subject tree intersection to match literals when followed by additional wildcards#6827

Merged
neilalexander merged 2 commits intomainfrom
neil/fixintersection
Apr 24, 2025
Merged

[FIXED] Fix subject tree intersection to match literals when followed by additional wildcards#6827
neilalexander merged 2 commits intomainfrom
neil/fixintersection

Conversation

@neilalexander
Copy link
Copy Markdown
Member

The subject tree intersection could miss non-wildcard matches if they were followed up by further extended wildcards in other sublist filters. This is now fixed.

Fixes #6824.

Signed-off-by: Neil Twigg neil@nats.io
Co-authored-by: Maurice van Veen github@mauricevanveen.com

neilalexander and others added 2 commits April 24, 2025 10:33
…tional wildcards

Signed-off-by: Neil Twigg <neil@nats.io>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@neilalexander neilalexander requested a review from a team as a code owner April 24, 2025 09:48
Copy link
Copy Markdown
Member

@MauriceVanVeen MauriceVanVeen left a comment

Choose a reason for hiding this comment

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

LGTM

@neilalexander neilalexander merged commit 12c2281 into main Apr 24, 2025
100 of 109 checks passed
@neilalexander neilalexander deleted the neil/fixintersection branch April 24, 2025 11:02
@wallyqs wallyqs changed the title Fix subject tree intersection to match literals when followed by additional wildcards [FIXED] Fix subject tree intersection to match literals when followed by additional wildcards Apr 24, 2025
neilalexander added a commit that referenced this pull request Apr 24, 2025
Includes the following:

* #6815
* #6825
* #6827

Signed-off-by: Neil Twigg <neil@nats.io>
neilalexander added a commit that referenced this pull request Apr 29, 2025
… additional wildcards

This is the same fix as #6827 but this time for the generic sublist.

Signed-off-by: Neil Twigg <neil@nats.io>
neilalexander added a commit that referenced this pull request Apr 29, 2025
A regression was introduced in #6827 which is now fixed, such that partials
should not be incorrectly matched when the sublist doesn't have explicit
interest for them. Also port the same fixes to the GSL.

Signed-off-by: Neil Twigg <neil@nats.io>
neilalexander added a commit that referenced this pull request Apr 29, 2025
A regression was introduced in #6827 which is now fixed, such that partials
should not be incorrectly matched when the sublist doesn't have explicit
interest for them. Also port the same fixes to the GSL.

Signed-off-by: Neil Twigg <neil@nats.io>
neilalexander added a commit that referenced this pull request Sep 24, 2025
… with partial wildcards (#7349)

Similar to #6827, but when
combining filter subjects of `stream.A` and `stream.*.A`.

Resolves #7336

Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Neil Twigg <neil@nats.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Regression in FilterSubjects Handling with DeliverAll/ReplayInstant between v2.10.25 and v2.10.26

2 participants