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

release-23.2: inverted: fix intersection of SpanExpressions in some cases #118360

Merged
merged 1 commit into from Jan 29, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jan 26, 2024

Backport 1/1 commits from #118256 on behalf of @yuzefovich.

/cc @cockroachdb/release


This commit fixes the logic for intersecting two SpanExpressions in some cases. In particular, consider the following example:

  • left expr is ARRAY['str1'] <@ t.links which translates to a SpanExpression in which only FactoredUnionSpans is set to the span containing str1
  • right expr is ARRAY ['str1'] && t.links OR ... which translates to a SpanExpression in which FactoredUnionSpans is set to exactly same span containing str1 plus some other stuff in children expressions.

In other words, we have a AND (a OR b).

When intersecting SpanExpressions, we intersect their FactoredUnionSpans, and then we update FactoredUnionSpans of expressions to subtract the shared ones. Previously, in the example above this would result in making the left expression empty, so it would be pruned. However, that is incorrect - we have the equivalent of left AND right, so we must ensure that left expression is satisfied, and previously this wouldn't be the case. The fix is that if one of the children expressions became empty, then intersection of two children is also empty, so instead of promoting non-empty child we now nil non-empty child out. In the example above, previously we would get a OR b, and now we'll correctly get a.

Fixes: #117979.

Release note (bug fix): Previously, in some cases CockroachDB could incorrectly evaluate queries that scanned an inverted index and had a WHERE filter in which two sides of the AND expression had "similar" expressions (e.g. ARRAY['str1'] <@ col AND (ARRAY['str1'] && col OR ...)), and this is now fixed. The bug has been present since pre-22.2 version.


Release justification: bug fix.

This commit fixes the logic for intersecting two SpanExpressions in some
cases. In particular, consider the following example:
- left expr is `ARRAY['str1'] <@ t.links` which translates to
a SpanExpression in which only FactoredUnionSpans is set to the span
containing `str1`
- right expr is `ARRAY ['str1'] && t.links OR ...` which translates to
a SpanExpression in which FactoredUnionSpans is set to exactly same span
containing `str1` plus some other stuff in children expressions.

In other words, we have `a AND (a OR b)`.

When intersecting SpanExpressions, we intersect their
FactoredUnionSpans, and then we update FactoredUnionSpans of expressions
to subtract the shared ones. Previously, in the example above this would
result in making the left expression empty, so it would be pruned.
However, that is incorrect - we have the equivalent of `left AND right`,
so we must ensure that `left` expression is satisfied, and previously
this wouldn't be the case. The fix is that if one of the children
expressions became empty, then intersection of two children is also
empty, so instead of promoting non-empty child we now nil non-empty
child out. In the example above, previously we would get `a OR b`, and
now we'll correctly get `a`.

Release note (bug fix): Previously, in some cases CockroachDB could
incorrectly evaluate queries that scanned an inverted index and had
a `WHERE` filter in which two sides of the `AND` expression had
"similar" expressions (e.g.
`ARRAY['str1'] <@ col AND (ARRAY['str1'] && col OR ...)`), and this is
now fixed. The bug has been present since pre-22.2 version.
@blathers-crl blathers-crl bot requested a review from a team as a code owner January 26, 2024 18:41
@blathers-crl blathers-crl bot removed the request for review from a team January 26, 2024 18:41
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-118256 branch from e7d6618 to 778652a Compare January 26, 2024 18:41
@blathers-crl blathers-crl bot requested a review from rytaft January 26, 2024 18:41
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jan 26, 2024
Copy link
Author

blathers-crl bot commented Jan 26, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL and one additional
    TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Jan 26, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@rytaft rytaft left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 4 of 4 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @mgartner, @rafiss, and @yuzefovich)

Copy link
Collaborator

@mgartner mgartner left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @blathers-crl[bot], @rafiss, and @yuzefovich)


pkg/sql/inverted/testdata/expression line 645 at r1 (raw file):

----
span expression
 ├── tight: true, unique: false

Why is this tight if we don't have spans for b AND c?

@rytaft
Copy link
Collaborator

rytaft commented Jan 26, 2024

pkg/sql/inverted/testdata/expression line 645 at r1 (raw file):

Previously, mgartner (Marcus Gartner) wrote…

Why is this tight if we don't have spans for b AND c?

Tight means that the data returned by the span expression exactly matches the data that should be returned by the SQL expression, and therefore we don't need an additional filter.

@mgartner
Copy link
Collaborator

pkg/sql/inverted/testdata/expression line 645 at r1 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

Tight means that the data returned by the span expression exactly matches the data that should be returned by the SQL expression, and therefore we don't need an additional filter.

My confusion is how do the spans from only a fully describe a OR (b AND c)?

Copy link
Collaborator

@mgartner mgartner left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! 2 of 0 LGTMs obtained (waiting on @rafiss and @yuzefovich)


pkg/sql/inverted/testdata/expression line 645 at r1 (raw file):

Previously, mgartner (Marcus Gartner) wrote…

My confusion is how do the spans from only a fully describe a OR (b AND c)?

Oh. a AND (a OR (b AND c)) is just a. I misread the comment above:

@yuzefovich yuzefovich merged commit 472a9cb into release-23.2 Jan 29, 2024
5 of 6 checks passed
@yuzefovich yuzefovich deleted the blathers/backport-release-23.2-118256 branch January 29, 2024 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants