Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions src/staging/streams.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,15 @@ use itertools::Itertools;
use parquet::{
arrow::ArrowWriter,
basic::Encoding,
file::properties::{WriterProperties, WriterPropertiesBuilder},
file::{
properties::{WriterProperties, WriterPropertiesBuilder},
FOOTER_SIZE,
},
format::SortingColumn,
schema::types::ColumnPath,
};
use rand::distributions::DistString;
use tracing::error;
use tracing::{error, trace};

use crate::{
cli::Options,
Expand Down Expand Up @@ -218,7 +221,10 @@ impl<'a> Stream<'a> {

dir.flatten()
.map(|file| file.path())
.filter(|file| file.extension().is_some_and(|ext| ext.eq("parquet")))
.filter(|file| {
file.extension().is_some_and(|ext| ext.eq("parquet"))
&& std::fs::metadata(file).is_ok_and(|meta| meta.len() > FOOTER_SIZE as u64)
})
.collect()
}

Expand Down Expand Up @@ -350,24 +356,32 @@ impl<'a> Stream<'a> {
.build();
schemas.push(merged_schema.clone());
let schema = Arc::new(merged_schema);
let parquet_file = OpenOptions::new()
let mut part_path = parquet_path.to_owned();
part_path.set_extension("part");
let mut part_file = OpenOptions::new()
.create(true)
.append(true)
.open(&parquet_path)
.open(&part_path)
.map_err(|_| StagingError::Create)?;
let mut writer = ArrowWriter::try_new(&parquet_file, schema.clone(), Some(props))?;
let mut writer = ArrowWriter::try_new(&mut part_file, schema.clone(), Some(props))?;
for ref record in record_reader.merged_iter(schema, time_partition.cloned()) {
writer.write(record)?;
}

writer.close()?;
if parquet_file.metadata().unwrap().len() < parquet::file::FOOTER_SIZE as u64 {

if part_file.metadata().unwrap().len() < parquet::file::FOOTER_SIZE as u64 {
error!(
"Invalid parquet file {:?} detected for stream {}, removing it",
&parquet_path, &self.stream_name
&part_path, &self.stream_name
);
remove_file(parquet_path).unwrap();
remove_file(part_path).unwrap();
} else {
trace!("Parquet file successfully constructed");
if let Err(e) = std::fs::rename(&part_path, &parquet_path) {
error!(
"Couldn't rename part file: {part_path:?} -> {parquet_path:?}, error = {e}"
);
}
for file in arrow_files {
// warn!("file-\n{file:?}\n");
let file_size = file.metadata().unwrap().len();
Expand Down
Loading