Remove unused binary_array_op_scalar! in binary.rs
#2512
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alamb
force-pushed
the
alamb/clean_up_binary
branch
from
cf40c4a
to
22efa7c
Compare
alamb
commented
May 11, 2022
| @@ -1142,6 +1079,20 @@ macro_rules! binary_array_op_dyn_scalar { | |||
| }} | |||
| } | |||
|
|
|||
| /// Compares the array with the scalar value for equality, sometimes | |||
| /// used in other kernels | |||
| pub(crate) fn array_eq_scalar(lhs: &dyn Array, rhs: &ScalarValue) -> Result<ArrayRef> { | |||
There was a problem hiding this comment.
I made a function to call binary_array_op_dyn_scalar! from null_if rather than having it call the macro directly to clean that code up.
alamb
commented
May 11, 2022
|
|
||
| let array = primitive_bool_array_op!(lhs, *cond_array, nullif)?; | ||
|
|
||
| Ok(ColumnarValue::Array(array)) | ||
| } | ||
| (ColumnarValue::Array(lhs), ColumnarValue::Array(rhs)) => { | ||
| // Get args0 == args1 evaluated and produce a boolean array | ||
| let cond_array = binary_array_op!(lhs, rhs, eq)?; | ||
| let cond_array = eq_dyn(lhs, rhs)?; |
There was a problem hiding this comment.
Hooray for eq_dyn thanks again @jimexist
alamb
force-pushed
the
alamb/clean_up_binary
branch
from
22efa7c
to
18683d6
Compare
alamb
changed the title
binary_array_op_scalar! in binary.rsbinary_array_op_scalar! in binary.rs
andygrove
approved these changes
May 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Draft until #2510 is mergedWhich issue does this PR close?
re #1179 and #2482 .
Rationale for this change
(the real reason for this is that I got nerd-sniped trying to clean up expression evaluation )
binary_array_op_scalar!doesn't handle null constants (see fixNULL <op> columnevaluation, tests for same #2510)binary_array_op_dyn_scalar!What changes are included in this PR?
binary_array_op_dyn_scalar!Are there any user-facing changes?
No, all internal changes