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

[BugFix] Fix csv converter and chunk column inconsistent in select into outfile (backport #48052) #48441

Merged
merged 2 commits into from
Jul 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 16, 2024

Why I'm doing:

in some cases, the nullable property between the column in the chunk and _output_expr_ctxs may not be consistent.
for example: order by limit + left outer join

select t1.k1, t1.k2, count(distinct t1.k3) as k33 from t1 left join t2 on t1.k1 = t2.k1 group by t1.k1,t1.k2 order by k33

the result will be wrong if inconsistent.

What I'm doing:

use nullable converter, and process whether the column is nullable in the nullable converter.

Fixes #issue

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 #48052 done by [Mergify](https://mergify.com). ## Why I'm doing:

in some cases, the nullable property between the column in the chunk and _output_expr_ctxs may not be consistent.
for example: order by limit + left outer join

select t1.k1, t1.k2, count(distinct t1.k3) as k33 from t1 left join t2 on t1.k1 = t2.k1 group by t1.k1,t1.k2 order by k33

the result will be wrong if inconsistent.

What I'm doing:

use nullable converter, and process whether the column is nullable in the nullable converter.

Fixes #issue

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

…to outfile (#48052)

Signed-off-by: wyb <[email protected]>
(cherry picked from commit 498c39a)

# Conflicts:
#	be/src/exec/plain_text_builder.cpp
#	be/test/formats/csv/nullable_converter_test.cpp
Copy link
Contributor Author

mergify bot commented Jul 16, 2024

Cherry-pick of 498c39a has failed:

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

You are currently cherry-picking commit 498c39a71f.
  (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/formats/csv/nullable_converter.cpp
	new file:   test/sql/test_sink/R/test_select_into_outfile_csv_inconsistent_converter_and_column
	new file:   test/sql/test_sink/T/test_select_into_outfile_csv_inconsistent_converter_and_column

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   be/src/exec/plain_text_builder.cpp
	both modified:   be/test/formats/csv/nullable_converter_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

@mergify mergify bot added the conflicts label Jul 16, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) July 16, 2024 11:14
@mergify mergify bot closed this Jul 16, 2024
auto-merge was automatically disabled July 16, 2024 11:14

Pull request was closed

Copy link
Contributor Author

mergify bot commented Jul 16, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-48052 branch July 16, 2024 11:15
@wyb wyb restored the mergify/bp/branch-2.5/pr-48052 branch July 16, 2024 16:38
@wyb wyb reopened this Jul 16, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) July 16, 2024 16:39
@wanpengfei-git wanpengfei-git merged commit 746ae5e into branch-2.5 Jul 16, 2024
26 of 27 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-48052 branch July 16, 2024 17:20
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