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

fix(frontend): allow INCLUDE payload without other columns #19003

Merged
merged 1 commit into from
Oct 18, 2024

Conversation

xiangjinwu
Copy link
Contributor

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Since #18437 we have supported INCLUDE payload to ingest the whole json payload as a single jsonb column:

create [source | table] my_source (
  foo varchar,
  bar int)
include payload as root
with (...)
format plain encode json;

However, when there is no need to extract foo or bar, an empty column list would result in the following error:

Schema definition is required, either from SQL or schema registry.

This PR enables such usage by moving the empty column list check after handling INCLUDE additional columns.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@github-actions github-actions bot added the type/fix Bug fix label Oct 18, 2024
@@ -667,7 +661,7 @@ pub fn handle_addition_columns(
);
}
let col = build_additional_column_desc(
latest_col_id.next(),
ColumnId::placeholder(),
Copy link
Contributor Author

@xiangjinwu xiangjinwu Oct 18, 2024

Choose a reason for hiding this comment

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

The latest_col_id.next() logic was wrong #13707 because it always returns the same value in this while loop given latest_col_id is not mut. The actual column id is assigned in the caller after calling handle_addition_columns.

Copy link
Member

@xxchan xxchan left a comment

Choose a reason for hiding this comment

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

Looks great!

random thoughts: Maybe we should rename bind_all_columns, or move handle_addition_columns into it.

@graphite-app graphite-app bot requested a review from a team October 18, 2024 08:45
@xiangjinwu xiangjinwu added this pull request to the merge queue Oct 18, 2024
Copy link
Contributor

@chenzl25 chenzl25 left a comment

Choose a reason for hiding this comment

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

LGTM!

Merged via the queue into main with commit 0226bd5 Oct 18, 2024
30 of 31 checks passed
@xiangjinwu xiangjinwu deleted the fix-create-source-json-payload-only branch October 18, 2024 09:06
github-merge-queue bot pushed a commit that referenced this pull request Oct 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants