Skip to content

opt: fix minor mistakes in legacy disjunction stats logic#94442

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
mgartner:fix-some-mistakes
Jan 3, 2023
Merged

opt: fix minor mistakes in legacy disjunction stats logic#94442
craig[bot] merged 1 commit intocockroachdb:masterfrom
mgartner:fix-some-mistakes

Conversation

@mgartner
Copy link
Copy Markdown
Contributor

These subtle bugs were discovered while creating #94439, the backport
of #89358 and #94389 to v22.1. They have already been included in that
backport. The backport to v22.2 has not yet been created, and it will
include this commit.

Epic: None

Release note: None

These subtle bugs were discovered while creating cockroachdb#94439, the backport
of cockroachdb#89358 and cockroachdb#94389 to v22.1. They have already been included in that
backport. The backport to v22.2 has not yet been created, and it will
include this commit.

Release note: None
@mgartner mgartner requested a review from a team as a code owner December 29, 2022 22:35
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@msirek msirek 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! 1 of 0 LGTMs obtained (waiting on @DrewKimball)

Copy link
Copy Markdown
Collaborator

@DrewKimball DrewKimball 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 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 2 of 0 LGTMs obtained (waiting on @mgartner)

@mgartner
Copy link
Copy Markdown
Contributor Author

mgartner commented Jan 3, 2023

TFTRs!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 3, 2023

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 3, 2023

Build succeeded:

@craig craig bot merged commit be9e8fb into cockroachdb:master Jan 3, 2023
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Jan 3, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from fc4c178 to blathers/backport-release-22.2-94442: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

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.

4 participants