Skip to content

Commit bca94be

Browse files
committed
chore: rename variables in min_max.rs for clarity
- Updated dictionary bindings to use explicit names: - `lhs_dict_key_type` - `rhs_dict_key_type` - `lhs_dict_value` - `rhs_dict_value` - Renamed mixed-arm bindings to better distinguish between scalar and dictionary-inner values: - `rhs_scalar` - `lhs_scalar` - `rhs_dict_value` - `lhs_dict_value` This improves consistency in reading each arm by role without introducing new errors.
1 parent bd8f1ad commit bca94be

1 file changed

Lines changed: 16 additions & 15 deletions

File tree

  • datafusion/functions-aggregate-common/src

datafusion/functions-aggregate-common/src/min_max.rs

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -417,26 +417,29 @@ macro_rules! min_max_scalar_impl {
417417
}
418418

419419
(
420-
ScalarValue::Dictionary(lhs_key_type, lhs),
421-
ScalarValue::Dictionary(rhs_key_type, rhs),
420+
ScalarValue::Dictionary(lhs_dict_key_type, lhs_dict_value),
421+
ScalarValue::Dictionary(rhs_dict_key_type, rhs_dict_value),
422422
) => {
423-
if lhs_key_type != rhs_key_type {
423+
if lhs_dict_key_type != rhs_dict_key_type {
424424
return internal_err!(
425425
"MIN/MAX is not expected to receive dictionary scalars with different key types ({:?} vs {:?})",
426-
lhs_key_type,
427-
rhs_key_type
426+
lhs_dict_key_type,
427+
rhs_dict_key_type
428428
);
429429
}
430430

431-
let result =
432-
min_max_scalar(lhs.as_ref(), rhs.as_ref(), choose_min_max!($OP))?;
433-
ScalarValue::Dictionary(lhs_key_type.clone(), Box::new(result))
431+
let result = min_max_scalar(
432+
lhs_dict_value.as_ref(),
433+
rhs_dict_value.as_ref(),
434+
choose_min_max!($OP),
435+
)?;
436+
ScalarValue::Dictionary(lhs_dict_key_type.clone(), Box::new(result))
434437
}
435-
(ScalarValue::Dictionary(_, lhs), rhs) => {
436-
min_max_scalar(lhs.as_ref(), rhs, choose_min_max!($OP))?
438+
(ScalarValue::Dictionary(_, lhs_dict_value), rhs_scalar) => {
439+
min_max_scalar(lhs_dict_value.as_ref(), rhs_scalar, choose_min_max!($OP))?
437440
}
438-
(lhs, ScalarValue::Dictionary(_, rhs)) => {
439-
min_max_scalar(lhs, rhs.as_ref(), choose_min_max!($OP))?
441+
(lhs_scalar, ScalarValue::Dictionary(_, rhs_dict_value)) => {
442+
min_max_scalar(lhs_scalar, rhs_dict_value.as_ref(), choose_min_max!($OP))?
440443
}
441444

442445
e => {
@@ -462,9 +465,7 @@ fn min_max_scalar(
462465
}
463466

464467
macro_rules! min_max {
465-
($VALUE:expr, $DELTA:expr, $OP:ident) => {{
466-
min_max_scalar($VALUE, $DELTA, choose_min_max!($OP))
467-
}};
468+
($VALUE:expr, $DELTA:expr, $OP:ident) => {{ min_max_scalar($VALUE, $DELTA, choose_min_max!($OP)) }};
468469
}
469470

470471
/// Finds the min/max by scanning logical rows via `ScalarValue::try_from_array`.

0 commit comments

Comments
 (0)