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

sqlsmith: fix merge join to exit when it's out of indexes #41579

Merged
merged 1 commit into from
Oct 14, 2019
Merged

sqlsmith: fix merge join to exit when it's out of indexes #41579

merged 1 commit into from
Oct 14, 2019

Conversation

maddyblue
Copy link
Contributor

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@jordanlewis jordanlewis left a comment

Choose a reason for hiding this comment

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

LGTM - could you explain more what this does? Does it just not permit merge joins to get planned if there aren't any compatible index pairs?

@maddyblue
Copy link
Contributor Author

The loop is finding equal prefixes in two indexes. Previously it would be fine if the right index had more columns than the left index because we were looping over the left. But if the left index had more columns it would error when attempting to index into the right index. This new check makes sure the right index is long enough to keep looping.

@maddyblue
Copy link
Contributor Author

bors r+

craig bot pushed a commit that referenced this pull request Oct 14, 2019
41577: storage: Deflake TestReplicateRogueRemovedNode r=ajwerner a=bdarnell

Some recently-refactored test harness code needed to check for nil
stores.

Fixes #41466

Release note: None

41579: sqlsmith: fix merge join to exit when it's out of indexes r=mjibson a=mjibson

Release note: None

Co-authored-by: Ben Darnell <[email protected]>
Co-authored-by: Matt Jibson <[email protected]>
@craig
Copy link
Contributor

craig bot commented Oct 14, 2019

Build succeeded

@craig craig bot merged commit a146781 into cockroachdb:master Oct 14, 2019
@maddyblue maddyblue deleted the smith-mergejoin branch October 14, 2019 21:12
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.

3 participants