-
Notifications
You must be signed in to change notification settings - Fork 338
feat(puffin): Add PuffinWriter #959
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ mod compression; | |
| mod metadata; | ||
| #[cfg(feature = "tokio")] | ||
| mod reader; | ||
| mod writer; | ||
|
|
||
| #[cfg(test)] | ||
| mod test_utils; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,338 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use std::collections::{HashMap, HashSet}; | ||
|
|
||
| use bytes::Bytes; | ||
|
|
||
| use crate::io::{FileWrite, OutputFile}; | ||
| use crate::puffin::blob::Blob; | ||
| use crate::puffin::compression::CompressionCodec; | ||
| use crate::puffin::metadata::{BlobMetadata, FileMetadata, Flag}; | ||
| use crate::Result; | ||
|
|
||
| /// Puffin writer | ||
| pub(crate) struct PuffinWriter { | ||
| writer: Box<dyn FileWrite>, | ||
| is_header_written: bool, | ||
| num_bytes_written: u64, | ||
| written_blobs_metadata: Vec<BlobMetadata>, | ||
| properties: HashMap<String, String>, | ||
| footer_compression_codec: CompressionCodec, | ||
| flags: HashSet<Flag>, | ||
| } | ||
|
|
||
| impl PuffinWriter { | ||
| /// Returns a new Puffin writer | ||
| pub(crate) async fn new( | ||
| output_file: &OutputFile, | ||
| properties: HashMap<String, String>, | ||
| compress_footer: bool, | ||
| ) -> Result<Self> { | ||
| let mut flags = HashSet::<Flag>::new(); | ||
| let footer_compression_codec = if compress_footer { | ||
| flags.insert(Flag::FooterPayloadCompressed); | ||
| CompressionCodec::Lz4 | ||
| } else { | ||
| CompressionCodec::None | ||
| }; | ||
|
|
||
| Ok(Self { | ||
| writer: output_file.writer().await?, | ||
| is_header_written: false, | ||
| num_bytes_written: 0, | ||
| written_blobs_metadata: Vec::new(), | ||
| properties, | ||
| footer_compression_codec, | ||
| flags, | ||
| }) | ||
| } | ||
|
|
||
| /// Adds blob to Puffin file | ||
| pub(crate) async fn add( | ||
| &mut self, | ||
| blob: Blob, | ||
| compression_codec: CompressionCodec, | ||
| ) -> Result<()> { | ||
| self.write_header_once().await?; | ||
|
|
||
| let offset = self.num_bytes_written; | ||
| let compressed_bytes: Bytes = compression_codec.compress(blob.data)?.into(); | ||
| let length = compressed_bytes.len().try_into()?; | ||
| self.write(compressed_bytes).await?; | ||
| self.written_blobs_metadata.push(BlobMetadata { | ||
| r#type: blob.r#type, | ||
| fields: blob.fields, | ||
| snapshot_id: blob.snapshot_id, | ||
| sequence_number: blob.sequence_number, | ||
| offset, | ||
| length, | ||
| compression_codec, | ||
| properties: blob.properties, | ||
| }); | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| /// Finalizes the Puffin file | ||
| pub(crate) async fn close(mut self) -> Result<()> { | ||
| self.write_header_once().await?; | ||
| self.write_footer().await?; | ||
| self.writer.close().await?; | ||
| Ok(()) | ||
| } | ||
|
|
||
| async fn write(&mut self, bytes: Bytes) -> Result<()> { | ||
| let length = bytes.len(); | ||
| self.writer.write(bytes).await?; | ||
| self.num_bytes_written += length as u64; | ||
| Ok(()) | ||
| } | ||
|
|
||
| async fn write_header_once(&mut self) -> Result<()> { | ||
| if !self.is_header_written { | ||
| let bytes = Bytes::copy_from_slice(&FileMetadata::MAGIC); | ||
| self.write(bytes).await?; | ||
| self.is_header_written = true; | ||
| } | ||
| Ok(()) | ||
| } | ||
|
|
||
| fn footer_payload_bytes(&self) -> Result<Vec<u8>> { | ||
| let file_metadata = FileMetadata { | ||
| blobs: self.written_blobs_metadata.clone(), | ||
| properties: self.properties.clone(), | ||
| }; | ||
| let json = serde_json::to_string::<FileMetadata>(&file_metadata)?; | ||
| let bytes = json.as_bytes(); | ||
| self.footer_compression_codec.compress(bytes.to_vec()) | ||
| } | ||
|
|
||
| fn flags_bytes(&self) -> [u8; FileMetadata::FOOTER_STRUCT_FLAGS_LENGTH as usize] { | ||
| let mut result = [0; FileMetadata::FOOTER_STRUCT_FLAGS_LENGTH as usize]; | ||
| for flag in &self.flags { | ||
| let byte_idx: usize = flag.byte_idx().into(); | ||
| result[byte_idx] |= 0x1 << flag.bit_idx(); | ||
| } | ||
| result | ||
| } | ||
|
|
||
| async fn write_footer(&mut self) -> Result<()> { | ||
| let mut footer_payload_bytes = self.footer_payload_bytes()?; | ||
| let footer_payload_bytes_length = u32::to_le_bytes(footer_payload_bytes.len().try_into()?); | ||
|
|
||
| let mut footer_bytes = Vec::new(); | ||
| footer_bytes.extend(&FileMetadata::MAGIC); | ||
| footer_bytes.append(&mut footer_payload_bytes); | ||
| footer_bytes.extend(footer_payload_bytes_length); | ||
| footer_bytes.extend(self.flags_bytes()); | ||
| footer_bytes.extend(&FileMetadata::MAGIC); | ||
|
|
||
| self.write(footer_bytes.into()).await | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use std::collections::HashMap; | ||
|
|
||
| use tempfile::TempDir; | ||
|
|
||
| use crate::io::{FileIOBuilder, InputFile, OutputFile}; | ||
| use crate::puffin::blob::Blob; | ||
| use crate::puffin::compression::CompressionCodec; | ||
| use crate::puffin::metadata::FileMetadata; | ||
| use crate::puffin::reader::PuffinReader; | ||
| use crate::puffin::test_utils::{ | ||
| blob_0, blob_1, empty_footer_payload, empty_footer_payload_bytes, file_properties, | ||
| java_empty_uncompressed_input_file, java_uncompressed_metric_input_file, | ||
| java_zstd_compressed_metric_input_file, uncompressed_metric_file_metadata, | ||
| zstd_compressed_metric_file_metadata, | ||
| }; | ||
| use crate::puffin::writer::PuffinWriter; | ||
| use crate::Result; | ||
|
|
||
| async fn write_puffin_file( | ||
| temp_dir: &TempDir, | ||
| blobs: Vec<(Blob, CompressionCodec)>, | ||
| properties: HashMap<String, String>, | ||
| ) -> Result<OutputFile> { | ||
| let file_io = FileIOBuilder::new_fs_io().build()?; | ||
|
|
||
| let path_buf = temp_dir.path().join("temp_puffin.bin"); | ||
| let temp_path = path_buf.to_str().unwrap(); | ||
| let output_file = file_io.new_output(temp_path)?; | ||
|
|
||
| let mut writer = PuffinWriter::new(&output_file, properties, false).await?; | ||
| for (blob, compression_codec) in blobs { | ||
| writer.add(blob, compression_codec).await?; | ||
| } | ||
| writer.close().await?; | ||
|
|
||
| Ok(output_file) | ||
| } | ||
|
|
||
| async fn read_all_blobs_from_puffin_file(input_file: InputFile) -> Vec<Blob> { | ||
| let puffin_reader = PuffinReader::new(input_file); | ||
| let mut blobs = Vec::new(); | ||
| let blobs_metadata = puffin_reader.file_metadata().await.unwrap().clone().blobs; | ||
| for blob_metadata in blobs_metadata { | ||
| blobs.push(puffin_reader.blob(&blob_metadata).await.unwrap()); | ||
| } | ||
| blobs | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn test_write_uncompressed_empty_file() { | ||
| let temp_dir = TempDir::new().unwrap(); | ||
|
|
||
| let input_file = write_puffin_file(&temp_dir, Vec::new(), HashMap::new()) | ||
| .await | ||
| .unwrap() | ||
| .to_input_file(); | ||
|
|
||
| assert_eq!( | ||
| FileMetadata::read(&input_file).await.unwrap(), | ||
| empty_footer_payload() | ||
| ); | ||
|
|
||
| assert_eq!( | ||
| input_file.read().await.unwrap().len(), | ||
| FileMetadata::MAGIC_LENGTH as usize | ||
| // no blobs since puffin file is empty | ||
| + FileMetadata::MAGIC_LENGTH as usize | ||
| + empty_footer_payload_bytes().len() | ||
| + FileMetadata::FOOTER_STRUCT_LENGTH as usize | ||
| ) | ||
| } | ||
|
|
||
| fn blobs_with_compression( | ||
| blobs: Vec<Blob>, | ||
| compression_codec: CompressionCodec, | ||
| ) -> Vec<(Blob, CompressionCodec)> { | ||
| blobs | ||
| .into_iter() | ||
| .map(|blob| (blob, compression_codec)) | ||
| .collect() | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn test_write_uncompressed_metric_data() { | ||
| let temp_dir = TempDir::new().unwrap(); | ||
| let blobs = vec![blob_0(), blob_1()]; | ||
| let blobs_with_compression = blobs_with_compression(blobs.clone(), CompressionCodec::None); | ||
|
|
||
| let input_file = write_puffin_file(&temp_dir, blobs_with_compression, file_properties()) | ||
| .await | ||
| .unwrap() | ||
| .to_input_file(); | ||
|
|
||
| assert_eq!( | ||
| FileMetadata::read(&input_file).await.unwrap(), | ||
| uncompressed_metric_file_metadata() | ||
| ); | ||
|
|
||
| assert_eq!(read_all_blobs_from_puffin_file(input_file).await, blobs) | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn test_write_zstd_compressed_metric_data() { | ||
| let temp_dir = TempDir::new().unwrap(); | ||
| let blobs = vec![blob_0(), blob_1()]; | ||
| let blobs_with_compression = blobs_with_compression(blobs.clone(), CompressionCodec::Zstd); | ||
|
|
||
| let input_file = write_puffin_file(&temp_dir, blobs_with_compression, file_properties()) | ||
| .await | ||
| .unwrap() | ||
| .to_input_file(); | ||
|
|
||
| assert_eq!( | ||
| FileMetadata::read(&input_file).await.unwrap(), | ||
| zstd_compressed_metric_file_metadata() | ||
| ); | ||
|
|
||
| assert_eq!(read_all_blobs_from_puffin_file(input_file).await, blobs) | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn test_write_lz4_compressed_metric_data() { | ||
| let temp_dir = TempDir::new().unwrap(); | ||
| let blobs = vec![blob_0(), blob_1()]; | ||
| let blobs_with_compression = blobs_with_compression(blobs.clone(), CompressionCodec::Lz4); | ||
|
|
||
| assert_eq!( | ||
| write_puffin_file(&temp_dir, blobs_with_compression, file_properties()) | ||
| .await | ||
| .unwrap_err() | ||
| .to_string(), | ||
| "FeatureUnsupported => LZ4 compression is not supported currently" | ||
| ); | ||
| } | ||
|
|
||
| async fn get_file_as_byte_vec(input_file: InputFile) -> Vec<u8> { | ||
| input_file.read().await.unwrap().to_vec() | ||
| } | ||
|
|
||
| async fn assert_files_are_bit_identical(actual: OutputFile, expected: InputFile) { | ||
| let actual_bytes = get_file_as_byte_vec(actual.to_input_file()).await; | ||
| let expected_bytes = get_file_as_byte_vec(expected).await; | ||
| assert_eq!(actual_bytes, expected_bytes); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn test_uncompressed_empty_puffin_file_is_bit_identical_to_java_generated_file() { | ||
| let temp_dir = TempDir::new().unwrap(); | ||
|
|
||
| assert_files_are_bit_identical( | ||
| write_puffin_file(&temp_dir, Vec::new(), HashMap::new()) | ||
| .await | ||
| .unwrap(), | ||
| java_empty_uncompressed_input_file(), | ||
| ) | ||
| .await | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn test_uncompressed_metric_data_is_bit_identical_to_java_generated_file() { | ||
| let temp_dir = TempDir::new().unwrap(); | ||
| let blobs = vec![blob_0(), blob_1()]; | ||
| let blobs_with_compression = blobs_with_compression(blobs, CompressionCodec::None); | ||
|
|
||
| assert_files_are_bit_identical( | ||
| write_puffin_file(&temp_dir, blobs_with_compression, file_properties()) | ||
| .await | ||
| .unwrap(), | ||
| java_uncompressed_metric_input_file(), | ||
| ) | ||
| .await | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn test_zstd_compressed_metric_data_is_bit_identical_to_java_generated_file() { | ||
| let temp_dir = TempDir::new().unwrap(); | ||
| let blobs = vec![blob_0(), blob_1()]; | ||
| let blobs_with_compression = blobs_with_compression(blobs, CompressionCodec::Zstd); | ||
|
|
||
| assert_files_are_bit_identical( | ||
| write_puffin_file(&temp_dir, blobs_with_compression, file_properties()) | ||
| .await | ||
| .unwrap(), | ||
| java_zstd_compressed_metric_input_file(), | ||
| ) | ||
| .await | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.