Skip to content

opt: fix assertion failure due to lax empty key#43722

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
RaduBerinde:fix-downgrade-key
Jan 6, 2020
Merged

opt: fix assertion failure due to lax empty key#43722
craig[bot] merged 1 commit intocockroachdb:masterfrom
RaduBerinde:fix-downgrade-key

Conversation

@RaduBerinde
Copy link
Copy Markdown
Member

@RaduBerinde RaduBerinde commented Jan 4, 2020

PR #43532 removed the concept of lax constant functional dependencies.
There is a left-over case when we downgrade a key: if we had a strong
empty key, the result is a lax empty key which is no longer a concept.

This change fixes this by removing the key altogether in this case.

Fixes #43651.

Release note (bug fix): fixes "expected constant FD to be strict"
internal error.

@RaduBerinde RaduBerinde requested a review from a team as a code owner January 4, 2020 00:05
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
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:

[nit] the issue referenced in the commit/PR message (Fixes #43532) isn't an issue -- it's the original PR that created the issue. Is there an issue you meant to reference?

Reviewed 3 of 3 files at r1.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @andy-kimball)

PR cockroachdb#43532 removed the concept of lax constant functional dependencies.
There is a left-over case when we downgrade a key: if we had a strong
empty key, the result is a lax empty key which is no longer a concept.

This change fixes this by removing the key altogether in this case.

Fixes cockroachdb#43651.

Release note (bug fix): fixes "expected constant FD to be strict"
internal error.
@RaduBerinde
Copy link
Copy Markdown
Member Author

Thanks, fixed the issue number.

Copy link
Copy Markdown
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:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @andy-kimball)

Copy link
Copy Markdown
Contributor

@andy-kimball andy-kimball left a comment

Choose a reason for hiding this comment

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

:lgtm:, thanks for fixing this - I missed this case.

Reviewable status: :shipit: complete! 2 of 0 LGTMs obtained (waiting on @andy-kimball)

@RaduBerinde
Copy link
Copy Markdown
Member Author

bors r+

craig bot pushed a commit that referenced this pull request Jan 6, 2020
43703: storage/batcheval/result: perform various cleanup on LocalResult struct r=nvanbenschoten a=nvanbenschoten

This PR contains a series of cleanups to the `result.LocalResult` struct. It leaves the structure in a good position to be extended to include information about newly written, updated, and removed intents, which are hooked into the `concurrency` package in future commits the same way that `UpdatedTxns` is currently hooked into the TxnWaitQueue.

The changes are broken into a series of incremental steps to make them easier to review in isolation.

43722: opt: fix assertion failure due to lax empty key r=RaduBerinde a=RaduBerinde

PR #43532 removed the concept of lax constant functional dependencies.
There is a left-over case when we downgrade a key: if we had a strong
empty key, the result is a lax empty key which is no longer a concept.

This change fixes this by removing the key altogether in this case.

Fixes #43651.

Release note (bug fix): fixes "expected constant FD to be strict"
internal error.

43734: pgwire: deflake TestAuthenticationAndHBARules r=knz a=knz

Fixes #43733.

This was my mistake to fix, I had forgotten that cluster settings
propagate asynchronously.

Release note: None

Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
Co-authored-by: Raphael 'kena' Poss <knz@thaumogen.net>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 6, 2020

Build succeeded

@craig craig bot merged commit 0af511c into cockroachdb:master Jan 6, 2020
@RaduBerinde RaduBerinde deleted the fix-downgrade-key branch January 7, 2020 18:21
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.

sql: internal error: expected constant FD to be strict: lax-key()

4 participants