Skip to content
Merged
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.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ keywords = ["arrow", "arrow-rs", "datafusion"]
rust-version = "1.85.1"

[dependencies]
arrow = "55.2.0"
arrow-schema = "55.2.0"
async-trait = "0.1"
arrow = "56.0.0"
arrow-schema = "56.0.0"
async-trait = "0.1.89"
dashmap = "6"
datafusion = "49.0.2"
datafusion-common = "49.0.2"
datafusion-expr = "49.0.2"
datafusion-functions = "49.0.2"
datafusion-functions-aggregate = "49.0.2"
datafusion-optimizer = "49.0.2"
datafusion-physical-expr = "49.0.2"
datafusion-physical-plan = "49.0.2"
datafusion-sql = "49.0.2"
datafusion = "50"
datafusion-common = "50"
datafusion-expr = "50"
datafusion-functions = "50"
datafusion-functions-aggregate = "50"
datafusion-optimizer = "50"
datafusion-physical-expr = "50"
datafusion-physical-plan = "50"
datafusion-sql = "50"
futures = "0.3"
itertools = "0.14"
log = "0.4"
Expand Down
7 changes: 4 additions & 3 deletions src/materialized/file_metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@

use arrow::array::{StringBuilder, TimestampNanosecondBuilder, UInt64Builder};
use arrow::record_batch::RecordBatch;
use arrow_schema::{DataType, Field, Schema, SchemaRef, TimeUnit};
use arrow_schema::{DataType, Field, TimeUnit};
use async_trait::async_trait;
use datafusion::arrow::datatypes::{Schema, SchemaRef};
use datafusion::catalog::SchemaProvider;
use datafusion::catalog::{CatalogProvider, Session};
use datafusion::datasource::listing::ListingTableUrl;
Expand All @@ -35,7 +36,7 @@ use datafusion::physical_plan::{
use datafusion::{
catalog::CatalogProviderList, execution::TaskContext, physical_plan::SendableRecordBatchStream,
};
use datafusion_common::{DataFusionError, Result, ScalarValue, ToDFSchema};
use datafusion_common::{DFSchema, DataFusionError, Result, ScalarValue};
use datafusion_expr::{Expr, Operator, TableProviderFilterPushDown, TableType};
use datafusion_physical_plan::execution_plan::{Boundedness, EmissionType};
use futures::stream::{self, BoxStream};
Expand Down Expand Up @@ -103,7 +104,7 @@ impl TableProvider for FileMetadata {
filters: &[Expr],
limit: Option<usize>,
) -> Result<Arc<dyn ExecutionPlan>> {
let dfschema = self.table_schema.clone().to_dfschema()?;
let dfschema = DFSchema::try_from(self.table_schema.as_ref().clone())?;

let filters = filters
.iter()
Expand Down
4 changes: 2 additions & 2 deletions src/materialized/hive_partition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use std::sync::Arc;

use arrow::array::{Array, StringArray, StringBuilder};
use arrow_schema::DataType;
use datafusion::arrow::datatypes::DataType;

use datafusion_common::{DataFusionError, Result, ScalarValue};
use datafusion_expr::{
Expand Down Expand Up @@ -79,7 +79,7 @@ pub fn hive_partition_udf() -> ScalarUDF {
ScalarUDF::new_from_impl(udf_impl)
}

#[derive(Debug)]
#[derive(Debug, Hash, PartialEq, Eq)]
struct HivePartitionUdf {
pub signature: Signature,
}
Expand Down
Loading