Skip to content

branch-4.2: [fix](struct) Preserve nested field comments in SHOW CREATE TABLE #68307 - #69337

Merged
yiguolei merged 3 commits into
branch-4.2from
auto-pick-68307-branch-4.2
Oct 21, 2026
Merged

yiguolei merged 3 commits into
branch-4.2from
auto-pick-68307-branch-4.2

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

Cherry-picked from #68307

…8307)

### What problem does this PR solve?

```sql
CREATE TABLE t (id INT, s STRUCT<a:INT COMMENT 'field doc'>)
DUPLICATE KEY(id)
DISTRIBUTED BY HASH(id) BUCKETS 1
PROPERTIES ("replication_num" = "1");
SHOW CREATE TABLE t;
```

Before: `s` is shown as `struct<a:int>`.

After: `s` is shown as `struct<a:int comment "field doc">`.
@github-actions
github-actions Bot requested a review from yiguolei as a code owner October 20, 2026 08:52
@hello-stephen

Copy link
Copy Markdown
Contributor

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@hello-stephen

Copy link
Copy Markdown
Contributor

run buildall

@hello-stephen

Copy link
Copy Markdown
Contributor

FE UT Coverage Report

Increment line coverage 100.00% (1/1) 🎉
Increment coverage report
Complete coverage report

@hello-stephen

Copy link
Copy Markdown
Contributor

FE Regression Coverage Report

Increment line coverage 100.00% (1/1) 🎉
Increment coverage report
Complete coverage report

Backport the nested-comment quoting subset of #66345 (a82564c) required by #69337.

Place the shared quoting helper in fe-common as SqlStringUtils because branch-4.2 keeps SqlUtils in fe-core. Preserve SQL mode propagation for DESCRIBE and port the related tests.
@csun5285

Copy link
Copy Markdown
Contributor

run buildall

@hello-stephen

Copy link
Copy Markdown
Contributor

FE UT Coverage Report

Increment line coverage 100.00% (4/4) 🎉
Increment coverage report
Complete coverage report

Expect the double-quoted nested comment emitted by DESCRIBE after the quoting backport. Assert the complete STRUCT type so the declared field nullability remains covered.
@csun5285

Copy link
Copy Markdown
Contributor

run buildall

@hello-stephen

Copy link
Copy Markdown
Contributor

FE Regression Coverage Report

Increment line coverage 100.00% (4/4) 🎉
Increment coverage report
Complete coverage report

@yiguolei
yiguolei merged commit 5a424a2 into branch-4.2 Oct 21, 2026
30 of 32 checks passed
@github-actions

Copy link
Copy Markdown
Contributor Author

PR approved by anyone and no changes requested.

@github-actions github-actions Bot added the approved Indicates a PR has been approved by one committer. label Oct 21, 2026
@github-actions

Copy link
Copy Markdown
Contributor Author

PR approved by at least one committer and no changes requested.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants