diff --git a/server/Cargo.toml b/server/Cargo.toml index 89dec3be1..c48b8d963 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -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" @@ -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" diff --git a/server/src/error.rs b/server/src/error.rs index 496654e0b..4a0e9febb 100644 --- a/server/src/error.rs +++ b/server/src/error.rs @@ -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 { diff --git a/server/src/event.rs b/server/src/event.rs index 5d04845e5..9eaafe40f 100644 --- a/server/src/event.rs +++ b/server/src/event.rs @@ -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; @@ -220,9 +219,7 @@ impl Event { Ok(compressed_size) } - pub fn convert_parquet_rb_reader( - &self, - ) -> Result { + pub fn convert_parquet_rb_reader(&self) -> Result { let file = fs::File::open(&self.data_file_path())?; let file_reader = SerializedFileReader::new(file)?; let arrow_reader = ParquetFileArrowReader::new(Arc::new(file_reader));