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

[Feature] Support add/drop field for struct column(part1) (backport #46451) #47110

Merged
merged 3 commits into from
Jun 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2024

Why I'm doing:

It is the first pr to support add/drop field for struct column.

What I'm doing:

The main changes in this PR are two fold:

  1. Adding a unique ID to the fields in the struct column. Each field column can be uniquely identified by its name and ID.
  2. When creating a column reader for the struct column, the corresponding reader will be created for each field based on the provided column.

Fixes #46452

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #46451 done by [Mergify](https://mergify.com). ## Why I'm doing: It is the first pr to support add/drop field for struct column.

What I'm doing:

The main changes in this PR are two fold:

  1. Adding a unique ID to the fields in the struct column. Each field column can be uniquely identified by its name and ID.
  2. When creating a column reader for the struct column, the corresponding reader will be created for each field based on the provided column.

Fixes #46452

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Signed-off-by: zhangqiang <[email protected]>
Signed-off-by: sevev <[email protected]>
(cherry picked from commit 757f142)

# Conflicts:
#	be/src/storage/rowset/column_reader.cpp
#	be/src/storage/rowset/column_reader.h
#	be/src/storage/rowset/segment.cpp
#	be/test/storage/rowset/flat_json_column_rw_test.cpp
#	be/test/storage/rowset/struct_column_rw_test.cpp
@mergify mergify bot added the conflicts label Jun 17, 2024
Copy link
Contributor Author

mergify bot commented Jun 17, 2024

Cherry-pick of 757f142 has failed:

On branch mergify/bp/branch-3.2/pr-46451
Your branch is up to date with 'origin/branch-3.2'.

You are currently cherry-picking commit 757f14205a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   be/src/storage/metadata_util.cpp
	modified:   be/src/storage/tablet_schema.h
	modified:   be/test/storage/rowset/column_reader_writer_test.cpp
	modified:   be/test/storage/rowset/map_column_rw_test.cpp
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/StructField.java
	modified:   gensrc/thrift/Types.thrift

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   be/src/storage/rowset/column_reader.cpp
	both modified:   be/src/storage/rowset/column_reader.h
	both modified:   be/src/storage/rowset/segment.cpp
	deleted by us:   be/test/storage/rowset/flat_json_column_rw_test.cpp
	both modified:   be/test/storage/rowset/struct_column_rw_test.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Jun 17, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot deleted the mergify/bp/branch-3.2/pr-46451 branch June 17, 2024 09:12
@sevev sevev restored the mergify/bp/branch-3.2/pr-46451 branch June 27, 2024 02:15
@sevev sevev reopened this Jun 27, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) June 27, 2024 02:16
Signed-off-by: sevev <[email protected]>
Signed-off-by: sevev <[email protected]>
@sevev sevev force-pushed the mergify/bp/branch-3.2/pr-46451 branch from 5c46f3f to 408532d Compare June 27, 2024 07:05
Copy link

sonarcloud bot commented Jun 27, 2024

@wanpengfei-git wanpengfei-git merged commit 33c4a74 into branch-3.2 Jun 27, 2024
29 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-46451 branch June 27, 2024 08:35
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.

2 participants