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.1.14-rc: changefeedccl: fix custom key column when used with CDC queries #117555

Merged

Conversation

blathers-crl[bot]
Copy link

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

Backport 1/1 commits from #115163 on behalf of @wenyihu6.

/cc @cockroachdb/release


Previously, CDC custom key column caused incorrect behaviour with CDC queries,
leading to a retryable error: No column with name <name> in this row. This was
because we forgot to add columns to colsByName map when generating projection
rows for CDC queries. This caused
DatumNamed
to return a column not found error. This patch addresses the issue by populating
the colsByName map during the addition of columns for CDC queries. Note that
the issue with supporting ALTER CHANGEFEED with CDC queries remains
unresolved.
Fixes: #114196
Release note (bug fix): CDC custom key column now functions with CDC queries
correctly. For example, CREATE CHANGEFEED WITH key_column=..., unordered AS SELECT * FROM table now works correctly instead of retrying forever. Note that
some functionalities with CDC custom keys are not fully supported, see 115267
for more details.


Release justification: bug fixes for CDC custom key column when used with CDC queries

Previously, CDC custom key column caused incorrect behaviour with CDC queries,
leading to a `retryable error: No column with name <name> in this row`. This was
because we forgot to add columns to `colsByName` map when generating projection
rows for CDC queries. This caused
[`DatumNamed`](https://github.com/cockroachdb/cockroach/blob/8d74d10e77f020dd0f5c98003f7976b63531de18/pkg/ccl/changefeedccl/cdcevent/event.go#L116-L122)
to return a column not found error, This patch addresses the issue by populating
the `colsByName` map during the addition of columns for CDC queries. Note that
the issue with supporting `ALTER CHANGEFEED` with CDC queries remains
unresolved.
Fixes: #114196
Release note (bug fix): CDC custom key column now functions with CDC queries
correctly. For example, `CREATE CHANGEFEED WITH key_column=..., unordered AS
SELECT * FROM table` now works correctly instead of retrying forever. Note that
some functionalities with CDC custom keys are not fully supported, see 115267
for more details.
@blathers-crl blathers-crl bot requested a review from a team as a code owner January 9, 2024 17:02
@blathers-crl blathers-crl bot requested review from miretskiy and removed request for a team January 9, 2024 17:02
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1.14-rc-115163 branch from 0e36ae6 to d3d1130 Compare January 9, 2024 17:02
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jan 9, 2024
Copy link
Author

blathers-crl bot commented Jan 9, 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 9, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@celiala celiala requested a review from nicktrav January 9, 2024 17:12
@nicktrav
Copy link
Collaborator

nicktrav commented Jan 9, 2024

EM LGTM ✅

Copy link
Collaborator

@stevendanna stevendanna left a comment

Choose a reason for hiding this comment

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

I don't have detailed code knowledge here, but the change looks sensible given the commit message description, it includes good test coverage, and the issue seems worth shipping a backport for.

@celiala celiala merged commit ec0a638 into release-23.1.14-rc Jan 9, 2024
5 of 6 checks passed
@celiala celiala deleted the blathers/backport-release-23.1.14-rc-115163 branch January 9, 2024 18:53
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

6 participants