Skip to content

Commit fc6f90a

Browse files
g-talbotclaude
andcommitted
fix: nightly rustfmt import ordering
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 72521f1 commit fc6f90a

3 files changed

Lines changed: 14 additions & 6 deletions

File tree

quickwit/quickwit-parquet-engine/src/merge/tests.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,9 @@ fn test_merge_per_output_metadata_from_actual_rows() {
323323
num_outputs: 1,
324324
writer_config: ParquetWriterConfig::default(),
325325
};
326-
let outputs = merge_sorted_parquet_files(&[input1.clone(), input2.clone()], &output_dir, &config).unwrap();
326+
let outputs =
327+
merge_sorted_parquet_files(&[input1.clone(), input2.clone()], &output_dir, &config)
328+
.unwrap();
327329
assert_eq!(outputs.len(), 1);
328330
let output = &outputs[0];
329331
assert!(output.metric_names.contains("cpu"));

quickwit/quickwit-parquet-engine/src/merge/writer.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ use crate::row_keys;
4040
use crate::sort_fields::parse_sort_fields;
4141
use crate::sorted_series::SORTED_SERIES_COLUMN;
4242
use crate::split::TAG_SERVICE;
43-
use crate::storage::split_writer::{extract_metric_names, extract_service_names, extract_time_range};
43+
use crate::storage::split_writer::{
44+
extract_metric_names, extract_service_names, extract_time_range,
45+
};
4446
use crate::storage::{
4547
PARQUET_META_NUM_MERGE_OPS, PARQUET_META_ROW_KEYS, PARQUET_META_ROW_KEYS_JSON,
4648
PARQUET_META_SORT_FIELDS, PARQUET_META_WINDOW_DURATION, PARQUET_META_WINDOW_START,
@@ -119,8 +121,8 @@ pub fn write_merge_outputs(
119121
// Extract per-output logical metadata from the actual rows.
120122
let metric_names = extract_metric_names(&sorted_batch)
121123
.context("extracting metric names from merge output")?;
122-
let time_range = extract_time_range(&sorted_batch)
123-
.context("extracting time range from merge output")?;
124+
let time_range =
125+
extract_time_range(&sorted_batch).context("extracting time range from merge output")?;
124126
let service_names = extract_service_names(&sorted_batch)
125127
.context("extracting service names from merge output")?;
126128

quickwit/quickwit-parquet-engine/src/storage/split_writer.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,9 @@ pub(crate) fn extract_time_range(batch: &RecordBatch) -> Result<TimeRange, Parqu
194194
}
195195

196196
/// Extracts distinct metric names from a RecordBatch.
197-
pub(crate) fn extract_metric_names(batch: &RecordBatch) -> Result<HashSet<String>, ParquetWriteError> {
197+
pub(crate) fn extract_metric_names(
198+
batch: &RecordBatch,
199+
) -> Result<HashSet<String>, ParquetWriteError> {
198200
let metric_idx = batch
199201
.schema()
200202
.index_of("metric_name")
@@ -227,7 +229,9 @@ pub(crate) fn extract_metric_names(batch: &RecordBatch) -> Result<HashSet<String
227229
}
228230

229231
/// Extracts distinct service names from a RecordBatch.
230-
pub(crate) fn extract_service_names(batch: &RecordBatch) -> Result<HashSet<String>, ParquetWriteError> {
232+
pub(crate) fn extract_service_names(
233+
batch: &RecordBatch,
234+
) -> Result<HashSet<String>, ParquetWriteError> {
231235
let service_idx = match batch.schema().index_of("service").ok() {
232236
Some(idx) => idx,
233237
None => return Ok(HashSet::new()),

0 commit comments

Comments
 (0)