Skip to content
Open
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
5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@ all-features = true
[dependencies]
async-trait = { version = "0.1.77" }
bytes = "1.4"
datafusion = "52.0"
datafusion = "53.0"
futures = { version = "0.3", default-features = false, features = ["std"] }
futures-util = { version = "0.3" }
object_store = { version = "0.12" }
orc-rust = { version = "0.7", features = ["async"] }
orc-rust = { version = "0.8", features = ["async"] }
tokio = { version = "1.28", features = [
"io-util",
"sync",
Expand Down
15 changes: 7 additions & 8 deletions src/file_format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,25 @@ use std::collections::HashMap;
use std::fmt::Debug;
use std::sync::Arc;

use async_trait::async_trait;
use datafusion::arrow::datatypes::{Schema, SchemaRef};
use datafusion::catalog::Session;
use datafusion::common::Statistics;
use datafusion::datasource::file_format::file_compression_type::FileCompressionType;
use datafusion::datasource::file_format::FileFormat;
use datafusion::datasource::physical_plan::{FileScanConfig, FileSource};
use datafusion::datasource::source::DataSourceExec;
use datafusion::datasource::table_schema::TableSchema;
use datafusion::error::{DataFusionError, Result};
use datafusion::object_store::path::Path;
use datafusion::object_store::{ObjectMeta, ObjectStore};
use datafusion::physical_plan::ExecutionPlan;
use futures::TryStreamExt;
use orc_rust::reader::metadata::read_metadata_async;

use crate::OrcSource;
use async_trait::async_trait;
use datafusion::catalog::Session;
use datafusion::datasource::source::DataSourceExec;
use futures_util::StreamExt;
use object_store::path::Path;
use object_store::{ObjectMeta, ObjectStore};
use orc_rust::reader::metadata::read_metadata_async;

use super::object_store_reader::ObjectStoreReader;
use crate::OrcSource;

async fn fetch_schema(store: &Arc<dyn ObjectStore>, file: &ObjectMeta) -> Result<(Path, Schema)> {
let loc_path = file.location.clone();
Expand Down
2 changes: 1 addition & 1 deletion src/file_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ use crate::physical_exec::OrcOpener;
use datafusion::common::DataFusionError;
use datafusion::datasource::physical_plan::{FileOpener, FileScanConfig, FileSource};
use datafusion::datasource::table_schema::TableSchema;
use datafusion::object_store::ObjectStore;
use datafusion::physical_plan::metrics::ExecutionPlanMetricsSet;
use datafusion::physical_plan::projection::ProjectionExprs;
use object_store::ObjectStore;
use std::any::Any;
use std::sync::Arc;

Expand Down
3 changes: 1 addition & 2 deletions src/object_store_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@
use std::sync::Arc;

use bytes::Bytes;
use datafusion::object_store::{GetOptions, ObjectMeta, ObjectStore, ObjectStoreExt};
use futures::future::BoxFuture;
use futures::{FutureExt, TryFutureExt};
use orc_rust::reader::AsyncChunkReader;

use object_store::{GetOptions, ObjectMeta, ObjectStore};

/// Implements [`AsyncChunkReader`] to allow reading ORC files via `object_store` API.
pub struct ObjectStoreReader {
store: Arc<dyn ObjectStore>,
Expand Down
5 changes: 2 additions & 3 deletions src/physical_exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@ use datafusion::arrow::error::ArrowError;
use datafusion::datasource::listing::PartitionedFile;
use datafusion::datasource::physical_plan::{FileOpenFuture, FileOpener};
use datafusion::error::Result;
use datafusion::object_store::ObjectStore;
use datafusion::physical_plan::projection::ProjectionExprs;
use futures_util::{StreamExt, TryStreamExt};
use orc_rust::projection::ProjectionMask;
use orc_rust::ArrowReaderBuilder;

use futures_util::{StreamExt, TryStreamExt};
use object_store::ObjectStore;

use super::object_store_reader::ObjectStoreReader;

pub(crate) struct OrcOpener {
Expand Down
Loading