Skip to content

Commit d83f099

Browse files
authored
Use datafusion's re-exported arrow and parquet (#93)
Since Datafusion re exports arrow and parquet we should use these for version compatibility with Datafusion
1 parent 97a3dba commit d83f099

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

server/Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@ actix-web = { version = "4.1", features = ["openssl"] }
1414
actix-cors = "0.6"
1515
actix-files = "0.6.1"
1616
anyhow = { version = "1.0.43", features = ["backtrace"] }
17-
arrow = "15.0"
1817
async-trait = "0.1"
19-
aws-config = "0.47.0"
2018
aws-sdk-s3 = "0.17"
21-
aws-smithy-http = "0.47.0"
22-
aws-types = "0.47"
2319
bytes = "1"
2420
chrono = "0.4.19"
2521
crossterm = "0.23.2"
@@ -36,7 +32,6 @@ num_cpus = "1.0.0"
3632
openssl = { version = "0.10" }
3733
os_info = "3.0.7"
3834
hostname = "0.3"
39-
parquet = "15.0"
4035
rand = "0.8.4"
4136
rust-flatten-json = "0.2.0"
4237
serde = "^1.0.8"

server/src/error.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@
1616
*
1717
*/
1818

19-
use arrow::error::ArrowError;
20-
use datafusion::error::DataFusionError;
21-
use parquet::errors::ParquetError;
22-
2319
use crate::{response::EventError, storage::ObjectStorageError};
20+
use datafusion::{arrow::error::ArrowError, error::DataFusionError, parquet::errors::ParquetError};
2421

2522
#[derive(Debug, thiserror::Error)]
2623
pub enum Error {

server/src/event.rs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
*
1717
*
1818
*/
19-
20-
use arrow::json;
21-
use arrow::json::reader::infer_json_schema;
22-
use arrow::record_batch::RecordBatch;
19+
use datafusion::arrow;
20+
use datafusion::arrow::json;
21+
use datafusion::arrow::json::reader::infer_json_schema;
22+
use datafusion::arrow::record_batch::RecordBatch;
23+
use datafusion::parquet::arrow::{ArrowReader, ArrowWriter, ParquetFileArrowReader};
24+
use datafusion::parquet::file::properties::WriterProperties;
25+
use datafusion::parquet::file::serialized_reader::SerializedFileReader;
2326
use log::error;
24-
use parquet::arrow::arrow_writer::ArrowWriter;
25-
use parquet::arrow::{ArrowReader, ParquetFileArrowReader};
26-
use parquet::file::properties::WriterProperties;
27-
use parquet::file::reader::SerializedFileReader;
2827
use std::fs;
2928
use std::io::BufReader;
3029
use std::sync::Arc;
@@ -220,9 +219,7 @@ impl Event {
220219
Ok(compressed_size)
221220
}
222221

223-
pub fn convert_parquet_rb_reader(
224-
&self,
225-
) -> Result<parquet::arrow::ParquetFileArrowReader, Error> {
222+
pub fn convert_parquet_rb_reader(&self) -> Result<ParquetFileArrowReader, Error> {
226223
let file = fs::File::open(&self.data_file_path())?;
227224
let file_reader = SerializedFileReader::new(file)?;
228225
let arrow_reader = ParquetFileArrowReader::new(Arc::new(file_reader));

0 commit comments

Comments
 (0)