feat: support alter add multiple columns #5262

NiwakaDev · 2025-01-01T09:43:16Z

I hereby agree to the terms of the GreptimeDB CLA.

Refer to a related PR or issue link (optional)

This PR addresses #5243.

What's changed and what's your intention?

PR Checklist

Please convert it to a draft if some of the following conditions are not met.

I have written the necessary rustdoc comments.
I have added the necessary unit tests and integration tests.
This PR requires documentation updates.
API changes are backward compatible.
Schema or data changes are backward compatible.

coderabbitai · 2025-01-01T09:43:25Z

Important

Review skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

NiwakaDev · 2025-01-01T09:45:09Z

CI says:

error: `havn` should be `haven`
  --> ./src/flow/src/adapter/table_source.rs:65:22
   |
65 |     /// If the table havn't been created in database, the tableId returned would be null
   |                      ^^^^

I don't add this line. Do I need to fix this?

discord9 · 2025-01-02T02:52:47Z

CI says:

error: `havn` should be `haven`
  --> ./src/flow/src/adapter/table_source.rs:65:22
   |
65 |     /// If the table havn't been created in database, the tableId returned would be null
   |                      ^^^^

I don't add this line. Do I need to fix this?

Nevermind, just a typo, feel free to fix it(or wait for #5265 to fix the typos)

discord9 · 2025-01-02T04:07:42Z

Would it be possible to consider adding support for dropping multiple columns as well, perhaps for the sake of symmetry? Given that the underlying proto definition already supports both adding and dropping multiple columns, the required changes should be fairly minimal. Do you think this would be a worthwhile addition, or is it unnecessary at this stage?

NiwakaDev · 2025-01-02T13:49:46Z

@discord9

Would it be possible to consider adding support for dropping multiple columns as well, perhaps for the sake of symmetry? Given that the underlying proto definition already supports both adding and dropping multiple columns, the required changes should be fairly minimal. Do you think this would be a worthwhile addition, or is it unnecessary at this stage?

Makes sense. Let me try this after this PR got merged.

codecov · 2025-01-02T14:10:49Z

Codecov Report

Attention: Patch coverage is 95.34884% with 6 lines in your changes missing coverage. Please review.

Project coverage is 83.93%. Comparing base (353c823) to head (8956d10).
Report is 18 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #5262      +/-   ##
==========================================
- Coverage   84.09%   83.93%   -0.16%     
==========================================
  Files        1199     1200       +1     
  Lines      224581   225432     +851     
==========================================
+ Hits       188866   189225     +359     
- Misses      35715    36207     +492

WenyXu · 2025-01-03T08:50:19Z

There are some conflicts

evenyag

Sorry for the late review. I have a few suggestions about the syntax.

evenyag · 2025-01-06T03:37:43Z

src/sql/src/statements/alter.rs

+#[derive(Debug, Clone, PartialEq, Eq, Visit, VisitMut, Serialize)]
+pub struct AddColumn {
+    pub column_def: ColumnDef,
+    pub location: Option<AddColumnLocation>,
+}


Can we implement Display for this struct? All statement structs should support Display.

evenyag · 2025-01-06T04:25:37Z

src/sql/src/parsers/alter_parser.rs

+            let mut add_columns: Vec<AddColumn> = vec![];
+            loop {
+                let mut column_def = self.parser.parse_column_def().context(error::SyntaxSnafu)?;
+                column_def.name = Self::canonicalize_identifier(column_def.name);
+                let location = if self.parser.parse_keyword(Keyword::FIRST) {
+                    Some(AddColumnLocation::First)
+                } else if let Token::Word(word) = self.parser.peek_token().token {
+                    if word.value.eq_ignore_ascii_case("AFTER") {
+                        let _ = self.parser.next_token();
+                        let name = Self::canonicalize_identifier(
+                            self.parse_identifier().context(error::SyntaxSnafu)?,
+                        );
+                        Some(AddColumnLocation::After {
+                            column_name: name.value,
+                        })
+                    } else {
+                        None
+                    }


I prefer to require users to specify ADD before each column.

ALTER TABLE table_name ADD COLUMN column_name1 data_type constraint, ADD COLUMN column_name2 data_type constraint, ... ADD COLUMN column_namen data_type constraint;

We may reuse the parse_comma_separated() to parse each ADD COLUMN operation.
https://github.com/apache/datafusion-sqlparser-rs/blob/main/src/parser/mod.rs#L7843

Refer to:

https://www.postgresql.org/docs/current/sql-altertable.html

https://neon.tech/postgresql/postgresql-tutorial/postgresql-add-column

Addressed your review.

NiwakaDev · 2025-01-07T16:49:36Z

src/sql/src/parser.rs

-    pub(crate) fn parse_identifier(&mut self) -> std::result::Result<Ident, ParserError> {
-        self.parser.parse_identifier(false)
+    pub(crate) fn parse_identifier(parser: &mut Parser) -> std::result::Result<Ident, ParserError> {
+        parser.parse_identifier(false)


To call this method from parse_add_columns I added in this PR, I removed self.

NiwakaDev requested a review from a team as a code owner January 1, 2025 09:43

github-actions bot added the docs-not-required This change does not impact docs. label Jan 1, 2025

NiwakaDev force-pushed the feat/support_alter_add_columns branch from c2b2c49 to c2a2b47 Compare January 2, 2025 13:40

feat: support alter add multiple columns

17beb2a

NiwakaDev force-pushed the feat/support_alter_add_columns branch from c2a2b47 to 17beb2a Compare January 3, 2025 15:05

evenyag reviewed Jan 6, 2025

View reviewed changes

fix: address review

8956d10

NiwakaDev commented Jan 7, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support alter add multiple columns #5262

feat: support alter add multiple columns #5262

NiwakaDev commented Jan 1, 2025

coderabbitai bot commented Jan 1, 2025

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

Documentation and Community

NiwakaDev commented Jan 1, 2025 •

edited

Loading

discord9 commented Jan 2, 2025

discord9 commented Jan 2, 2025

NiwakaDev commented Jan 2, 2025 •

edited

Loading

codecov bot commented Jan 2, 2025 •

edited

Loading

WenyXu commented Jan 3, 2025

evenyag left a comment

evenyag Jan 6, 2025

evenyag Jan 6, 2025

NiwakaDev Jan 7, 2025

NiwakaDev Jan 7, 2025

feat: support alter add multiple columns #5262

Are you sure you want to change the base?

feat: support alter add multiple columns #5262

Conversation

NiwakaDev commented Jan 1, 2025

Refer to a related PR or issue link (optional)

What's changed and what's your intention?

PR Checklist

coderabbitai bot commented Jan 1, 2025

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

Documentation and Community

NiwakaDev commented Jan 1, 2025 • edited Loading

discord9 commented Jan 2, 2025

discord9 commented Jan 2, 2025

NiwakaDev commented Jan 2, 2025 • edited Loading

codecov bot commented Jan 2, 2025 • edited Loading

Codecov Report

WenyXu commented Jan 3, 2025

evenyag left a comment

Choose a reason for hiding this comment

evenyag Jan 6, 2025

Choose a reason for hiding this comment

evenyag Jan 6, 2025

Choose a reason for hiding this comment

NiwakaDev Jan 7, 2025

Choose a reason for hiding this comment

NiwakaDev Jan 7, 2025

Choose a reason for hiding this comment

NiwakaDev commented Jan 1, 2025 •

edited

Loading

NiwakaDev commented Jan 2, 2025 •

edited

Loading

codecov bot commented Jan 2, 2025 •

edited

Loading