Skip to content

Commit 67dc683

Browse files
author
Rickard Lundin
committed
fmt
1 parent e711d23 commit 67dc683

4 files changed

Lines changed: 10 additions & 9 deletions

File tree

src/chunked/arrow_converter.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ use super::{
5050
};
5151
use crate::chunked;
5252
use crate::chunked::threaded_file_output::{ipc_file_out, output_factory, parquet_file_out};
53+
use crate::cli::Targets;
5354
use crate::datatype::DataType;
5455
use crate::schema;
5556
use arrow::datatypes::{Field, Schema, SchemaRef};
@@ -66,7 +67,6 @@ use std::thread;
6667
use std::thread::JoinHandle;
6768
use std::time::{Duration, Instant};
6869
use thread::spawn;
69-
use crate::cli::Targets;
7070
//use ordered_channel::Sender;
7171
//use crossbeam::channel::{Receiver, Sender};
7272

@@ -78,7 +78,7 @@ pub(crate) struct Slice2Arrow<'a> {
7878
pub(crate) fn_line_break_len: FnLineBreakLen,
7979
pub(crate) masterbuilders: MasterBuilders,
8080
pub(crate) consistent_counter: ConsistentCounter,
81-
pub(crate) target: Targets
81+
pub(crate) target: Targets,
8282
}
8383

8484
pub(crate) struct MasterBuilders {
@@ -236,10 +236,13 @@ impl<'a> Converter<'a> for Slice2Arrow<'a> {
236236
}
237237

238238
fn setup(&mut self) -> (Sender<RecordBatch>, JoinHandle<Result<Stats>>) {
239-
output_factory(self.target.clone(), self.masterbuilders.schema_factory(), self.masterbuilders.outfile.clone())
239+
output_factory(
240+
self.target.clone(),
241+
self.masterbuilders.schema_factory(),
242+
self.masterbuilders.outfile.clone(),
243+
)
240244
}
241245

242-
243246
fn shutdown(&mut self) {
244247
// converter.shutdown();
245248
let schema = Schema::new(vec![Field::new(
@@ -251,7 +254,6 @@ impl<'a> Converter<'a> for Slice2Arrow<'a> {
251254
let emptyrb = arrow::record_batch::RecordBatch::new_empty(Arc::new(schema));
252255
let c = self.consistent_counter.get();
253256
let _ = &self.masterbuilders.sender.clone().unwrap().send(c, emptyrb);
254-
255257
}
256258
}
257259

src/chunked/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ pub(crate) trait Converter<'a> {
161161

162162
// fn process(& mut self, slices: Vec< &'a[u8]>) -> usize;
163163
fn process(&mut self, slices: Vec<&'a [u8]>) -> (usize, usize, Duration, Duration);
164-
fn setup(&mut self)->(Sender<RecordBatch>, JoinHandle<Result<Stats>>);
164+
fn setup(&mut self) -> (Sender<RecordBatch>, JoinHandle<Result<Stats>>);
165165
fn shutdown(&mut self);
166166
}
167167

src/chunked/residual_slicer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ impl<'a> Slicer<'a> for ResidualSlicer<'a> {
8989
.build_global()
9090
.unwrap();
9191

92-
let threaded_writer=converter.setup();
92+
let threaded_writer = converter.setup();
9393

9494
loop {
9595
let cr = ir.next().unwrap();

src/chunked/self_converter.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ use log::info;
3030
use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator};
3131

3232
use arrow::array::RecordBatch;
33+
use ordered_channel::Sender;
3334
use parquet::errors::{ParquetError, Result};
3435
use parquet::file::metadata::FileMetaData;
3536
use parquet::format;
@@ -38,7 +39,6 @@ use std::io::Write;
3839
use std::sync::mpsc::SyncSender;
3940
use std::thread::JoinHandle;
4041
use std::time::Duration;
41-
use ordered_channel::Sender;
4242

4343
use super::{Converter, FnFindLastLineBreak};
4444

@@ -75,7 +75,6 @@ impl<'a> Converter<'a> for SampleSliceAggregator<'a> {
7575
todo!()
7676
}
7777

78-
7978
fn shutdown(&mut self) {
8079
todo!()
8180
}

0 commit comments

Comments
 (0)