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 the bug of bitmap_to_binary/bitmap_to_base64 processing null (backport #45275) #45303

Merged
merged 2 commits into from
May 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 8, 2024

Why I'm doing:

All the result for bitmap_to_string(null), bitmap_to_binary(null), bitmap_to_base64(null) should be null;

What I'm doing:

Before the pr:

mysql> select bitmap_to_binary(null);                                                                                                                                                                                                                                             
+------------------------------------------------+                                                                                                                                                                                                                                
| bitmap_to_binary(NULL)                         |                                                                                                                                                                                                                                
+------------------------------------------------+                                                                                                                                                                                                                                
| NULL                                           |                                                                                                                                                                                                                                
+------------------------------------------------+ 

mysql> select bitmap_to_binary(bitmap_from_string("abc"));                                                                                                                                                                                                                        
+------------------------------------------------------------------------------------------+                                                                                                                                                                                      
| bitmap_to_binary(bitmap_from_string('abc'))                                              |                                                                                                                                                                                      
+------------------------------------------------------------------------------------------+                                                                                                                                                                                      
| 0x00                                                                                     |                                                                                                                                                                                      
+------------------------------------------------------------------------------------------+                                                                                                                                                                                      
1 row in set (0.02 sec)

After the pr:

mysql> select bitmap_to_binary(null);                                                                                                                                                                                                                                             
+------------------------------------------------+                                                                                                                                                                                                                                
| bitmap_to_binary(NULL)                         |                                                                                                                                                                                                                                
+------------------------------------------------+                                                                                                                                                                                                                                
| NULL                                           |                                                                                                                                                                                                                                
+------------------------------------------------+ 

mysql> select bitmap_to_binary(bitmap_from_string("abc"));                                                                                                                                                                                                                        
+------------------------------------------------------------------------------------------+                                                                                                                                                                                      
| bitmap_to_binary(bitmap_from_string('abc'))                                              |                                                                                                                                                                                      
+------------------------------------------------------------------------------------------+                                                                                                                                                                                      
| NULL                                                                                     |                                                                                                                                                                                      
+------------------------------------------------------------------------------------------+

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

All the result for bitmap_to_string(null), bitmap_to_binary(null), bitmap_to_base64(null) should be null;

What I'm doing:

Before the pr:

mysql> select bitmap_to_binary(null);                                                                                                                                                                                                                                             
+------------------------------------------------+                                                                                                                                                                                                                                
| bitmap_to_binary(NULL)                         |                                                                                                                                                                                                                                
+------------------------------------------------+                                                                                                                                                                                                                                
| NULL                                           |                                                                                                                                                                                                                                
+------------------------------------------------+ 

mysql> select bitmap_to_binary(bitmap_from_string("abc"));                                                                                                                                                                                                                        
+------------------------------------------------------------------------------------------+                                                                                                                                                                                      
| bitmap_to_binary(bitmap_from_string('abc'))                                              |                                                                                                                                                                                      
+------------------------------------------------------------------------------------------+                                                                                                                                                                                      
| 0x00                                                                                     |                                                                                                                                                                                      
+------------------------------------------------------------------------------------------+                                                                                                                                                                                      
1 row in set (0.02 sec)

After the pr:

mysql> select bitmap_to_binary(null);                                                                                                                                                                                                                                             
+------------------------------------------------+                                                                                                                                                                                                                                
| bitmap_to_binary(NULL)                         |                                                                                                                                                                                                                                
+------------------------------------------------+                                                                                                                                                                                                                                
| NULL                                           |                                                                                                                                                                                                                                
+------------------------------------------------+ 

mysql> select bitmap_to_binary(bitmap_from_string("abc"));                                                                                                                                                                                                                        
+------------------------------------------------------------------------------------------+                                                                                                                                                                                      
| bitmap_to_binary(bitmap_from_string('abc'))                                              |                                                                                                                                                                                      
+------------------------------------------------------------------------------------------+                                                                                                                                                                                      
| NULL                                                                                     |                                                                                                                                                                                      
+------------------------------------------------------------------------------------------+

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

…null (#45275)

Signed-off-by: trueeyu <[email protected]>
(cherry picked from commit 20a3136)

# Conflicts:
#	be/src/exprs/vectorized/bitmap_functions.cpp
#	test/sql/test_bitmap_functions/R/test_bitmap_binary
#	test/sql/test_bitmap_functions/T/test_bitmap_binary
Copy link
Contributor Author

mergify bot commented May 8, 2024

Cherry-pick of 20a3136 has failed:

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

You are currently cherry-picking commit 20a3136336.
  (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:
	new file:   test/sql/test_bitmap_functions/R/test_bitmap_to_base64
	new file:   test/sql/test_bitmap_functions/T/test_bitmap_to_base64

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   be/src/exprs/vectorized/bitmap_functions.cpp
	deleted by us:   test/sql/test_bitmap_functions/R/test_bitmap_binary
	deleted by us:   test/sql/test_bitmap_functions/T/test_bitmap_binary

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 May 8, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 8, 2024 10:51
@mergify mergify bot closed this May 8, 2024
auto-merge was automatically disabled May 8, 2024 10:51

Pull request was closed

Copy link
Contributor Author

mergify bot commented May 8, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-45275 branch May 8, 2024 10:51
@trueeyu trueeyu restored the mergify/bp/branch-2.5/pr-45275 branch May 8, 2024 11:30
@trueeyu trueeyu reopened this May 8, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 8, 2024 11:31
Signed-off-by: trueeyu <[email protected]>
@wanpengfei-git wanpengfei-git merged commit b34435a into branch-2.5 May 9, 2024
27 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-45275 branch May 9, 2024 04:27
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