Skip to content

Commit a685c15

Browse files
committed
Fix Clippy issues
1 parent 62d8123 commit a685c15

2 files changed

Lines changed: 9 additions & 16 deletions

File tree

crates/modelardb_server/src/storage/uncompressed_data_buffer.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,7 @@ mod tests {
597597
.unwrap();
598598

599599
let uncompressed_path = temp_dir.path().join(format!(
600-
"{UNCOMPRESSED_DATA_FOLDER}/{}/{TAG_HASH}",
601-
TIME_SERIES_TABLE_NAME
600+
"{UNCOMPRESSED_DATA_FOLDER}/{TIME_SERIES_TABLE_NAME}/{TAG_HASH}"
602601
));
603602
assert_eq!(uncompressed_path.read_dir().unwrap().count(), 1)
604603
}
@@ -623,8 +622,7 @@ mod tests {
623622
.unwrap();
624623

625624
let uncompressed_path = temp_dir.path().join(format!(
626-
"{UNCOMPRESSED_DATA_FOLDER}/{}/{TAG_HASH}",
627-
TIME_SERIES_TABLE_NAME
625+
"{UNCOMPRESSED_DATA_FOLDER}/{TIME_SERIES_TABLE_NAME}/{TAG_HASH}"
628626
));
629627
assert_eq!(uncompressed_path.read_dir().unwrap().count(), 1)
630628
}

crates/modelardb_storage/src/optimizer/model_simple_aggregates.rs

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ mod tests {
693693
#[tokio::test]
694694
async fn test_rewrite_aggregate_on_one_column_without_predicates() {
695695
let temp_dir = tempfile::tempdir().unwrap();
696-
let query = &format!("SELECT COUNT(field_1) FROM {}", TIME_SERIES_TABLE_NAME);
696+
let query = &format!("SELECT COUNT(field_1) FROM {TIME_SERIES_TABLE_NAME}");
697697
let physical_plan = query_optimized_physical_query_plan(&temp_dir, query).await;
698698

699699
let expected_plan = vec![
@@ -711,10 +711,9 @@ mod tests {
711711
// Apache DataFusion 30 creates two input columns to AggregateExec when both SUM and AVG is
712712
// computed in the same query, so for now, multiple queries are used for the test.
713713
let query_no_avg = &format!(
714-
"SELECT COUNT(field_1), MIN(field_1), MAX(field_1), SUM(field_1) FROM {}",
715-
TIME_SERIES_TABLE_NAME
714+
"SELECT COUNT(field_1), MIN(field_1), MAX(field_1), SUM(field_1) FROM {TIME_SERIES_TABLE_NAME}"
716715
);
717-
let query_only_avg = &format!("SELECT AVG(field_1) FROM {}", TIME_SERIES_TABLE_NAME);
716+
let query_only_avg = &format!("SELECT AVG(field_1) FROM {TIME_SERIES_TABLE_NAME}");
718717

719718
let expected_plan = vec![
720719
vec![TypeId::of::<AggregateExec>()],
@@ -734,10 +733,8 @@ mod tests {
734733
#[tokio::test]
735734
async fn test_do_not_rewrite_aggregate_on_one_column_with_predicates() {
736735
let temp_dir = tempfile::tempdir().unwrap();
737-
let query = &format!(
738-
"SELECT COUNT(field_1) FROM {} WHERE field_1 = 37.0",
739-
TIME_SERIES_TABLE_NAME
740-
);
736+
let query =
737+
&format!("SELECT COUNT(field_1) FROM {TIME_SERIES_TABLE_NAME} WHERE field_1 = 37.0",);
741738
let physical_plan = query_optimized_physical_query_plan(&temp_dir, query).await;
742739

743740
let expected_plan = vec![
@@ -758,10 +755,8 @@ mod tests {
758755
#[tokio::test]
759756
async fn test_do_not_rewrite_aggregate_on_multiple_columns_without_predicates() {
760757
let temp_dir = tempfile::tempdir().unwrap();
761-
let query = &format!(
762-
"SELECT COUNT(field_1), COUNT(field_2) FROM {}",
763-
TIME_SERIES_TABLE_NAME
764-
);
758+
let query =
759+
&format!("SELECT COUNT(field_1), COUNT(field_2) FROM {TIME_SERIES_TABLE_NAME}",);
765760
let physical_plan = query_optimized_physical_query_plan(&temp_dir, query).await;
766761

767762
let expected_plan = vec![

0 commit comments

Comments
 (0)