Skip to content
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

WIP: Improved async api for arrow1 #393

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
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
24 changes: 12 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ full = [
]

[dependencies]
wasm-bindgen = { version = "0.2.83", features = ["serde-serialize"] }
wasm-bindgen = { version = "0.2.88", features = ["serde-serialize"] }

# The `console_error_panic_hook` crate provides better debugging of panics by
# logging them with `console.error`. This is great for development, but requires
Expand Down
230 changes: 230 additions & 0 deletions src/arrow1/metadata.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
use crate::arrow1::error::WasmResult;
use wasm_bindgen::prelude::*;

/// Global Parquet metadata.
#[derive(Debug, Clone)]
#[wasm_bindgen]
pub struct ParquetMetaData(parquet::file::metadata::ParquetMetaData);

#[wasm_bindgen]
impl ParquetMetaData {
/// Returns file metadata as reference.
#[wasm_bindgen]
pub fn file_metadata(&self) -> FileMetaData {
self.0.file_metadata().clone().into()
}

/// Returns number of row groups in this file.
#[wasm_bindgen]
pub fn num_row_groups(&self) -> usize {
self.0.num_row_groups()
}

/// Returns row group metadata for `i`th position.
/// Position should be less than number of row groups `num_row_groups`.
#[wasm_bindgen]
pub fn row_group(&self, i: usize) -> RowGroupMetaData {
self.0.row_group(i).clone().into()
}

// /// Returns the column index for this file if loaded
// pub fn column_index(&self) -> Option<ParquetColumnIndex> {
// self.0.column_index()
// }
}

impl From<parquet::file::metadata::ParquetMetaData> for ParquetMetaData {
fn from(value: parquet::file::metadata::ParquetMetaData) -> Self {
Self(value)
}
}

impl From<ParquetMetaData> for parquet::file::metadata::ParquetMetaData {
fn from(value: ParquetMetaData) -> Self {
value.0
}
}

/// Metadata for a Parquet file.
#[derive(Debug, Clone)]
#[wasm_bindgen]
pub struct FileMetaData(parquet::file::metadata::FileMetaData);

#[wasm_bindgen]
impl FileMetaData {
/// Returns version of this file.
#[wasm_bindgen]
pub fn version(&self) -> i32 {
self.0.version()
}

/// Returns number of rows in the file.
#[wasm_bindgen]
pub fn num_rows(&self) -> i64 {
self.0.num_rows()
}

/// String message for application that wrote this file.
///
/// This should have the following format:
/// `<application> version <application version> (build <application build hash>)`.
///
/// ```shell
/// parquet-mr version 1.8.0 (build 0fda28af84b9746396014ad6a415b90592a98b3b)
/// ```
#[wasm_bindgen]
pub fn created_by(&self) -> Option<String> {
self.0.created_by().map(|s| s.to_string())
}

/// Returns key_value_metadata of this file.
#[wasm_bindgen]
pub fn key_value_metadata(&self) -> Result<js_sys::Map, JsValue> {
let map = js_sys::Map::new();
if let Some(metadata) = self.0.key_value_metadata() {
for meta in metadata {
if let Some(value) = &meta.value {
map.set(&JsValue::from_str(&meta.key), &JsValue::from_str(value));
}
}
}
Ok(map)
}
}

impl From<parquet::file::metadata::FileMetaData> for FileMetaData {
fn from(value: parquet::file::metadata::FileMetaData) -> Self {
Self(value)
}
}

impl From<FileMetaData> for parquet::file::metadata::FileMetaData {
fn from(value: FileMetaData) -> Self {
value.0
}
}

/// Metadata for a Parquet row group.
#[derive(Debug, Clone)]
#[wasm_bindgen]
pub struct RowGroupMetaData(parquet::file::metadata::RowGroupMetaData);

#[wasm_bindgen]
impl RowGroupMetaData {
/// Number of columns in this row group.
#[wasm_bindgen]
pub fn num_columns(&self) -> usize {
self.0.num_columns()
}

/// Returns column chunk metadata for `i`th column.
#[wasm_bindgen]
pub fn column(&self, i: usize) -> ColumnChunkMetaData {
self.0.column(i).clone().into()
}

/// Number of rows in this row group.
#[wasm_bindgen]
pub fn num_rows(&self) -> i64 {
self.0.num_rows()
}

/// Total byte size of all uncompressed column data in this row group.
#[wasm_bindgen]
pub fn total_byte_size(&self) -> i64 {
self.0.total_byte_size()
}

/// Total size of all compressed column data in this row group.
#[wasm_bindgen]
pub fn compressed_size(&self) -> i64 {
self.0.compressed_size()
}
}

impl From<parquet::file::metadata::RowGroupMetaData> for RowGroupMetaData {
fn from(value: parquet::file::metadata::RowGroupMetaData) -> Self {
Self(value)
}
}

impl From<RowGroupMetaData> for parquet::file::metadata::RowGroupMetaData {
fn from(value: RowGroupMetaData) -> Self {
value.0
}
}

/// Metadata for a Parquet column chunk.
#[derive(Debug, Clone)]
#[wasm_bindgen]
pub struct ColumnChunkMetaData(parquet::file::metadata::ColumnChunkMetaData);

#[wasm_bindgen]
impl ColumnChunkMetaData {
/// File where the column chunk is stored.
///
/// If not set, assumed to belong to the same file as the metadata.
/// This path is relative to the current file.
#[wasm_bindgen]
pub fn file_path(&self) -> Option<String> {
self.0.file_path().map(|s| s.to_string())
}

/// Byte offset in `file_path()`.
#[wasm_bindgen]
pub fn file_offset(&self) -> i64 {
self.0.file_offset()
}

// /// Type of this column. Must be primitive.
// pub fn column_type(&self) -> Type {
// self.column_descr.physical_type()
// }

/// Path (or identifier) of this column.
#[wasm_bindgen]
pub fn column_path(&self) -> Vec<String> {
let path = self.0.column_path();
path.parts().to_vec()
}

// /// All encodings used for this column.
// pub fn encodings(&self) -> &Vec<Encoding> {
// &self.encodings
// }

/// Total number of values in this column chunk.
#[wasm_bindgen]
pub fn num_values(&self) -> i64 {
self.0.num_values()
}

// /// Compression for this column.
// pub fn compression(&self) -> Compression {
// self.compression
// }

/// Returns the total compressed data size of this column chunk.
#[wasm_bindgen]
pub fn compressed_size(&self) -> i64 {
self.0.compressed_size()
}

/// Returns the total uncompressed data size of this column chunk.
#[wasm_bindgen]
pub fn uncompressed_size(&self) -> i64 {
self.0.uncompressed_size()
}
}

impl From<parquet::file::metadata::ColumnChunkMetaData> for ColumnChunkMetaData {
fn from(value: parquet::file::metadata::ColumnChunkMetaData) -> Self {
Self(value)
}
}

impl From<ColumnChunkMetaData> for parquet::file::metadata::ColumnChunkMetaData {
fn from(value: ColumnChunkMetaData) -> Self {
value.0
}
}
12 changes: 4 additions & 8 deletions src/arrow1/mod.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
pub mod error;
pub mod metadata;
#[cfg(feature = "reader")]
pub mod reader;

#[cfg(all(feature = "reader", feature = "async"))]
pub mod reader_async;
pub mod wasm;

#[cfg(feature = "writer")]
pub mod writer;

#[cfg(feature = "writer")]
pub mod writer_properties;

pub mod error;

#[cfg(all(feature = "reader", feature = "async"))]
pub mod reader_async;
Loading
Loading