Skip to content

Use datafusion's re-exported arrow and parquet #93

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.

Sign up for GitHub

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 1 commit into from
Sep 5, 2022
Merged

Use datafusion's re-exported arrow and parquet #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,8 @@ actix-web = { version = "4.1", features = ["openssl"] }
actix-cors = "0.6"
actix-files = "0.6.1"
anyhow = { version = "1.0.43", features = ["backtrace"] }
arrow = "15.0"
async-trait = "0.1"
aws-config = "0.47.0"
aws-sdk-s3 = "0.17"
aws-smithy-http = "0.47.0"
aws-types = "0.47"
bytes = "1"
chrono = "0.4.19"
crossterm = "0.23.2"
Expand All @@ -36,7 +32,6 @@ num_cpus = "1.0.0"
openssl = { version = "0.10" }
os_info = "3.0.7"
hostname = "0.3"
parquet = "15.0"
rand = "0.8.4"
rust-flatten-json = "0.2.0"
serde = "^1.0.8"
Expand Down
5 changes: 1 addition & 4 deletions server/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@
*
*/

use arrow::error::ArrowError;
use datafusion::error::DataFusionError;
use parquet::errors::ParquetError;

use crate::{response::EventError, storage::ObjectStorageError};
use datafusion::{arrow::error::ArrowError, error::DataFusionError, parquet::errors::ParquetError};

#[derive(Debug, thiserror::Error)]
pub enum Error {
Expand Down
19 changes: 8 additions & 11 deletions server/src/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@
*
*
*/

use arrow::json;
use arrow::json::reader::infer_json_schema;
use arrow::record_batch::RecordBatch;
use datafusion::arrow;
use datafusion::arrow::json;
use datafusion::arrow::json::reader::infer_json_schema;
use datafusion::arrow::record_batch::RecordBatch;
use datafusion::parquet::arrow::{ArrowReader, ArrowWriter, ParquetFileArrowReader};
use datafusion::parquet::file::properties::WriterProperties;
use datafusion::parquet::file::serialized_reader::SerializedFileReader;
use log::error;
use parquet::arrow::arrow_writer::ArrowWriter;
use parquet::arrow::{ArrowReader, ParquetFileArrowReader};
use parquet::file::properties::WriterProperties;
use parquet::file::reader::SerializedFileReader;
use std::fs;
use std::io::BufReader;
use std::sync::Arc;
Expand Down Expand Up @@ -220,9 +219,7 @@ impl Event {
Ok(compressed_size)
}

pub fn convert_parquet_rb_reader(
&self,
) -> Result<parquet::arrow::ParquetFileArrowReader, Error> {
pub fn convert_parquet_rb_reader(&self) -> Result<ParquetFileArrowReader, Error> {
let file = fs::File::open(&self.data_file_path())?;
let file_reader = SerializedFileReader::new(file)?;
let arrow_reader = ParquetFileArrowReader::new(Arc::new(file_reader));
Expand Down