Skip to content

Commit 0116239

Browse files
committed
put in fixes for clippy and scalafix issues.
1 parent ace7456 commit 0116239

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

core/src/execution/datafusion/expressions/cast.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,15 +1516,15 @@ fn date_parser(date_str: &str, eval_mode: EvalMode) -> CometResult<Option<i32>>
15161516
}
15171517

15181518
fn return_result(date_str: &str, eval_mode: EvalMode) -> CometResult<Option<i32>> {
1519-
return if eval_mode == EvalMode::Ansi {
1519+
if eval_mode == EvalMode::Ansi {
15201520
Err(CometError::CastInvalidValue {
15211521
value: date_str.to_string(),
15221522
from_type: "STRING".to_string(),
15231523
to_type: "DATE".to_string(),
15241524
})
15251525
} else {
15261526
Ok(None)
1527-
};
1527+
}
15281528
}
15291529
// end local functions
15301530

@@ -1571,7 +1571,7 @@ fn date_parser(date_str: &str, eval_mode: EvalMode) -> CometResult<Option<i32>>
15711571
} else {
15721572
//increment value of current segment by the next digit
15731573
let parsed_value = (b - b'0') as i32;
1574-
if parsed_value < 0 || parsed_value > 9 {
1574+
if !(0..=9).contains(&parsed_value) {
15751575
return return_result(date_str, eval_mode);
15761576
} else {
15771577
current_segment_value = current_segment_value * 10 + parsed_value;
@@ -1593,7 +1593,7 @@ fn date_parser(date_str: &str, eval_mode: EvalMode) -> CometResult<Option<i32>>
15931593

15941594
date_segments[current_segment as usize] = current_segment_value;
15951595

1596-
return match NaiveDate::from_ymd_opt(
1596+
match NaiveDate::from_ymd_opt(
15971597
sign * date_segments[0],
15981598
date_segments[1] as u32,
15991599
date_segments[2] as u32,
@@ -1603,7 +1603,7 @@ fn date_parser(date_str: &str, eval_mode: EvalMode) -> CometResult<Option<i32>>
16031603
Ok(Some(duration_since_epoch.to_i32().unwrap()))
16041604
}
16051605
None => Ok(None),
1606-
};
1606+
}
16071607
}
16081608

16091609
#[cfg(test)]

spark/src/test/scala/org/apache/comet/CometCastSuite.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ class CometCastSuite extends CometTestBase with AdaptiveSparkPlanHelper {
4949
*/
5050
private val numericPattern = "0123456789deEf+-." + whitespaceChars
5151

52-
private val datePattern = "0123456789/" + whitespaceChars
5352
private val timestampPattern = "0123456789/:T" + whitespaceChars
5453

5554
test("all valid cast combinations covered") {

0 commit comments

Comments
 (0)