From 6935f9f5207001b929332ca0d8767844de31eb36 Mon Sep 17 00:00:00 2001 From: jackwener Date: Fri, 5 May 2023 11:59:04 +0800 Subject: [PATCH] fix: slt fail due to bors problem --- .../physical_optimizer/sort_enforcement.rs | 4 +-- .../core/src/physical_plan/aggregates/mod.rs | 3 +- .../core/src/physical_plan/file_format/mod.rs | 2 +- .../sqllogictests/test_files/interval.slt | 12 ++++---- datafusion/optimizer/src/analyzer/subquery.rs | 3 +- .../src/expressions/binary/kernels_arrow.rs | 3 +- datafusion/physical-expr/src/utils.rs | 28 ++++++------------- 7 files changed, 19 insertions(+), 36 deletions(-) diff --git a/datafusion/core/src/physical_optimizer/sort_enforcement.rs b/datafusion/core/src/physical_optimizer/sort_enforcement.rs index 713eaf288dfce..3d9363f34d848 100644 --- a/datafusion/core/src/physical_optimizer/sort_enforcement.rs +++ b/datafusion/core/src/physical_optimizer/sort_enforcement.rs @@ -1381,9 +1381,7 @@ mod tests { assert_eq!( can_skip_sort(&partition_by_exprs, &order_by_exprs, &exec_unbounded)?, *expected, - "Unexpected result for in unbounded test case#: {:?}, case: {:?}", - case_idx, - test_case + "Unexpected result for in unbounded test case#: {case_idx:?}, case: {test_case:?}" ); } diff --git a/datafusion/core/src/physical_plan/aggregates/mod.rs b/datafusion/core/src/physical_plan/aggregates/mod.rs index 5c77f3b74a65e..ffd985513dbc3 100644 --- a/datafusion/core/src/physical_plan/aggregates/mod.rs +++ b/datafusion/core/src/physical_plan/aggregates/mod.rs @@ -1058,8 +1058,7 @@ mod tests { let res = get_working_mode(&input, &group_bys); assert_eq!( res, *expected, - "Unexpected result for in unbounded test case#: {:?}, case: {:?}", - case_idx, test_case + "Unexpected result for in unbounded test case#: {case_idx:?}, case: {test_case:?}" ); } diff --git a/datafusion/core/src/physical_plan/file_format/mod.rs b/datafusion/core/src/physical_plan/file_format/mod.rs index 6591d8346558e..6580caad2d193 100644 --- a/datafusion/core/src/physical_plan/file_format/mod.rs +++ b/datafusion/core/src/physical_plan/file_format/mod.rs @@ -245,7 +245,7 @@ impl Display for FileScanConfig { } if let Some(limit) = self.limit { - write!(f, ", limit={}", limit)?; + write!(f, ", limit={limit}")?; } if let Some(orders) = ordering { diff --git a/datafusion/core/tests/sqllogictests/test_files/interval.slt b/datafusion/core/tests/sqllogictests/test_files/interval.slt index 1ba58a3d27977..15b18f51ddc2c 100644 --- a/datafusion/core/tests/sqllogictests/test_files/interval.slt +++ b/datafusion/core/tests/sqllogictests/test_files/interval.slt @@ -327,10 +327,10 @@ select '1 month'::interval + '1980-01-01T12:00:00'::timestamp; # Exected error: interval (scalar) - date / timestamp (scalar) -query error DataFusion error: Error during planning: interval can't subtract timestamp/date +query error DataFusion error: type_coercion\ncaused by\nError during planning: interval can't subtract timestamp/date select '1 month'::interval - '1980-01-01'::date; -query error DataFusion error: Error during planning: interval can't subtract timestamp/date +query error DataFusion error: type_coercion\ncaused by\nError during planning: interval can't subtract timestamp/date select '1 month'::interval - '1980-01-01T12:00:00'::timestamp; # interval (array) + date / timestamp (array) @@ -349,10 +349,10 @@ select i + ts from t; 2000-02-01T00:01:00 # expected error interval (array) - date / timestamp (array) -query error DataFusion error: Error during planning: interval can't subtract timestamp/date +query error DataFusion error: type_coercion\ncaused by\nError during planning: interval can't subtract timestamp/date select i - d from t; -query error DataFusion error: Error during planning: interval can't subtract timestamp/date +query error DataFusion error: type_coercion\ncaused by\nError during planning: interval can't subtract timestamp/date select i - ts from t; @@ -372,10 +372,10 @@ select '1 month'::interval + ts from t; 2000-03-01T00:00:00 # expected error interval (scalar) - date / timestamp (array) -query error DataFusion error: Error during planning: interval can't subtract timestamp/date +query error DataFusion error: type_coercion\ncaused by\nError during planning: interval can't subtract timestamp/date select '1 month'::interval - d from t; -query error DataFusion error: Error during planning: interval can't subtract timestamp/date +query error DataFusion error: type_coercion\ncaused by\nError during planning: interval can't subtract timestamp/date select '1 month'::interval - ts from t; statement ok diff --git a/datafusion/optimizer/src/analyzer/subquery.rs b/datafusion/optimizer/src/analyzer/subquery.rs index cdbe3f3050ad3..7cdedc06b4530 100644 --- a/datafusion/optimizer/src/analyzer/subquery.rs +++ b/datafusion/optimizer/src/analyzer/subquery.rs @@ -157,8 +157,7 @@ fn check_inner_plan( .collect::>(); if is_aggregate && is_scalar && !maybe_unsupport.is_empty() { return Err(DataFusionError::Plan(format!( - "Correlated column is not allowed in predicate: {:?}", - predicate + "Correlated column is not allowed in predicate: {predicate:?}" ))); } check_inner_plan(input, is_scalar, is_aggregate, can_contain_outer_ref) diff --git a/datafusion/physical-expr/src/expressions/binary/kernels_arrow.rs b/datafusion/physical-expr/src/expressions/binary/kernels_arrow.rs index b796bf888da81..2852d617bf13a 100644 --- a/datafusion/physical-expr/src/expressions/binary/kernels_arrow.rs +++ b/datafusion/physical-expr/src/expressions/binary/kernels_arrow.rs @@ -612,8 +612,7 @@ fn multiply_fixed_point_dyn( if required_scale > product_scale { return Err(DataFusionError::Internal(format!( - "Required scale {} is greater than product scale {}", - required_scale, product_scale + "Required scale {required_scale} is greater than product scale {product_scale}" ))); } diff --git a/datafusion/physical-expr/src/utils.rs b/datafusion/physical-expr/src/utils.rs index c842f8521d2a3..3b186ddf8ab28 100644 --- a/datafusion/physical-expr/src/utils.rs +++ b/datafusion/physical-expr/src/utils.rs @@ -1152,7 +1152,7 @@ mod tests { (vec![(col_e, option1)], false), ]; for (cols, expected) in requirements { - let err_msg = format!("Error in test case:{:?}", cols); + let err_msg = format!("Error in test case:{cols:?}"); let required = cols .into_iter() .map(|(col, options)| PhysicalSortExpr { @@ -1170,8 +1170,7 @@ mod tests { || ordering_eq_properties.clone(), ), expected, - "{}", - err_msg + "{err_msg}" ); } Ok(()) @@ -1247,8 +1246,7 @@ mod tests { expr.clone(), eq_properties.classes() )), - "error in test: expr: {:?}", - expr + "error in test: expr: {expr:?}" ); } @@ -1269,9 +1267,7 @@ mod tests { ordering_eq_properties.classes() ) ), - "error in test: expr: {:?}, sort_options: {:?}", - expr, - sort_options + "error in test: expr: {expr:?}, sort_options: {sort_options:?}" ); } Ok(()) @@ -1321,9 +1317,7 @@ mod tests { arg.clone(), eq_properties.classes() )), - "error in test: expr: {:?}, sort_options: {:?}", - expr, - sort_options + "error in test: expr: {expr:?}, sort_options: {sort_options:?}" ); } @@ -1349,9 +1343,7 @@ mod tests { arg.clone(), ordering_eq_properties.classes() )), - "error in test: expr: {:?}, sort_options: {:?}", - expr, - sort_options + "error in test: expr: {expr:?}, sort_options: {sort_options:?}" ); } Ok(()) @@ -1402,9 +1394,7 @@ mod tests { arg.clone(), eq_properties.classes() )), - "error in test: expr: {:?}, sort_options: {:?}", - expr, - sort_options + "error in test: expr: {expr:?}, sort_options: {sort_options:?}" ); } @@ -1432,9 +1422,7 @@ mod tests { ordering_eq_properties.classes() ) ), - "error in test: expr: {:?}, sort_options: {:?}", - expr, - sort_options + "error in test: expr: {expr:?}, sort_options: {sort_options:?}" ); } Ok(())