schemachanger/rel: fix notJoin subquery depth calculation for non-entity variables #157031
+213
−5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
Member
|
This change is |
rafiss
force-pushed
the
dsc-fix-subquery-depth
branch
3 times, most recently
from
e536efa to
7aec23f
Compare
…ity variables Previously, the subquery depth calculation in setSubqueryDepth only considered direct entity dependencies when determining when a notJoin subquery should execute. It tracked the maximum entity slot among the subquery's inputs but ignored when non-entity variables (like table-id, index-id) were actually bound. This caused notJoin subqueries to execute too early, before all their required variables were available, leading to "unbound variable" errors. This commit fixes the depth calculation by tracking which entity provides each variable through the facts. When a subquery needs a non-entity variable, we now find which entity binds that variable and use that entity's slot to determine the correct execution depth. This ensures notJoin subqueries only execute after all their input variables have been bound by the appropriate entities in the join order. The fix is needed for rules that pass non-entity variables to notJoin predicates, particularly in constraint rename scenarios where variables may be bound at different join depths. (At the time of this writing, we don't yet have rules like this, but we soon will add one.) Release note: None
rafiss
force-pushed
the
dsc-fix-subquery-depth
branch
from
7aec23f to
74753fd
Compare
fqazi
approved these changes
Nov 7, 2025
Collaborator
fqazi
left a comment
fqazi
left a comment
There was a problem hiding this comment.
@rafiss Great find!
@fqazi reviewed 3 of 3 files at r1, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @rafiss)
Collaborator
Author
|
tftr! bors r+ |
Contributor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the subquery depth calculation in setSubqueryDepth only considered
direct entity dependencies when determining when a notJoin subquery should
execute. It tracked the maximum entity slot among the subquery's inputs but
ignored when non-entity variables (like table-id, index-id) were actually bound.
This caused notJoin subqueries to execute too early, before all their required
variables were available, leading to "unbound variable" errors.
This commit fixes the depth calculation by tracking which entity provides each
variable through the facts. When a subquery needs a non-entity variable, we now
find which entity binds that variable and use that entity's slot to determine
the correct execution depth. This ensures notJoin subqueries only execute after
all their input variables have been bound by the appropriate entities in the
join order.
The fix is needed for rules that pass non-entity variables to notJoin
predicates, particularly in constraint rename scenarios where variables may
be bound at different join depths. (At the time of this writing, we
don't yet have rules like this, but we soon will add one.)
informs #148341
Release note: None