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
4 changes: 2 additions & 2 deletions crates/aws/tests/repair_s3_rename_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use deltalake_core::logstore::object_store::{
use deltalake_core::{DeltaTableBuilder, ObjectStore, Path};
use deltalake_test::utils::IntegrationContext;
use futures::stream::BoxStream;
use object_store::{MultipartUpload, PutMultipartOpts, PutPayload};
use object_store::{MultipartUpload, PutMultipartOptions, PutPayload};
use serial_test::serial;
use std::ops::Range;
use std::sync::{Arc, Mutex};
Expand Down Expand Up @@ -237,7 +237,7 @@ impl ObjectStore for DelayedObjectStore {
async fn put_multipart_opts(
&self,
location: &Path,
options: PutMultipartOpts,
options: PutMultipartOptions,
) -> ObjectStoreResult<Box<dyn MultipartUpload>> {
self.inner.put_multipart_opts(location, options).await
}
Expand Down
1 change: 0 additions & 1 deletion crates/catalog-unity/src/datafusion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use datafusion::catalog::SchemaProvider;
use datafusion::catalog::{CatalogProvider, CatalogProviderList};
use datafusion::common::DataFusionError;
use datafusion::datasource::TableProvider;
use futures::FutureExt;
use moka::future::Cache;
use moka::Expiry;
use std::any::Any;
Expand Down
5 changes: 1 addition & 4 deletions crates/core/src/delta_datafusion/table_provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -988,10 +988,7 @@ impl ExecutionPlan for DeltaScan {
parent_filters: Vec<Arc<dyn PhysicalExpr>>,
_config: &ConfigOptions,
) -> Result<FilterDescription> {
Ok(FilterDescription::from_children(
parent_filters,
&self.children(),
)?)
FilterDescription::from_children(parent_filters, &self.children())
}
}

Expand Down
6 changes: 2 additions & 4 deletions crates/core/tests/read_delta_partitions_test.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use std::path::PathBuf;
use std::process::Command;
use url::Url;

#[allow(dead_code)]
Expand Down Expand Up @@ -48,7 +46,7 @@ async fn read_null_partitions_from_checkpoint() {

// verify that table loads from checkpoint and handles null partitions
let table = deltalake_core::open_table(
url::Url::from_directory_path(std::path::Path::new(&table.table_uri())).unwrap(),
Url::from_directory_path(std::path::Path::new(&table.table_uri())).unwrap(),
)
.await
.unwrap();
Expand All @@ -64,7 +62,7 @@ async fn load_from_delta_8_0_table_with_special_partition() {

let path = "../test/tests/data/delta-0.8.0-special-partition";
let table = deltalake_core::open_table(
url::Url::from_directory_path(std::fs::canonicalize(&path).unwrap()).unwrap(),
Url::from_directory_path(std::fs::canonicalize(&path).unwrap()).unwrap(),
)
.await
.unwrap();
Expand Down
Loading