Skip to content

Commit

Permalink
[cosmetic] restored leftover differences from main
Browse files Browse the repository at this point in the history
  • Loading branch information
ccciudatu committed Dec 19, 2024
1 parent 908a289 commit 5165a36
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
7 changes: 1 addition & 6 deletions crates/core/src/data_catalog/storage/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,7 @@ impl ListingSchemaProvider {

/// Reload table information from ObjectStore
pub async fn refresh(&self) -> datafusion_common::Result<()> {
let tmp1 = self.store.list(None);

let entries: Vec<ObjectMeta> = self.store.list(None)
.try_collect()
.await
.map_err(|e| DataFusionError::ObjectStore(e))?;
let entries: Vec<_> = self.store.list(None).try_collect().await?;
let mut tables = HashSet::new();
for file in entries.iter() {
let mut parent = Path::new(file.location.as_ref());
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/delta_datafusion/planner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
//! };
//!
//! let state = state.with_query_planner(Arc::new(merge_planner));
use std::fmt::Debug;
use std::sync::Arc;

use async_trait::async_trait;
Expand All @@ -33,6 +32,7 @@ use datafusion::{
physical_planner::{DefaultPhysicalPlanner, ExtensionPlanner},
};
use datafusion_expr::LogicalPlan;

use crate::delta_datafusion::DataFusionResult;

/// Deltaplanner
Expand Down
1 change: 0 additions & 1 deletion crates/core/src/kernel/snapshot/log_segment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@ impl LogSegment {
config: &DeltaTableConfig,
) -> DeltaResult<impl Iterator<Item = Result<RecordBatch, DeltaTableError>> + '_> {
let log_path = table_root.child("_delta_log");
let tmp = Arc::new(read_schema.clone());
let mut decoder = json::get_decoder(Arc::new(read_schema.try_into()?), config)?;

let mut commit_data = Vec::new();
Expand Down
4 changes: 2 additions & 2 deletions crates/hdfs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use deltalake_core::logstore::{default_logstore, logstores, LogStore, LogStoreFa
use deltalake_core::storage::{
factories, url_prefix_handler, ObjectStoreFactory, ObjectStoreRef, StorageOptions,
};
use deltalake_core::{DeltaResult, DeltaTableError, Path};
use deltalake_core::{DeltaResult, Path};
use hdfs_native_object_store::HdfsObjectStore;
use url::Url;

Expand All @@ -20,7 +20,7 @@ impl ObjectStoreFactory for HdfsFactory {
let store: ObjectStoreRef = Arc::new(HdfsObjectStore::with_config(
url.as_str(),
options.0.clone(),
).map_err(|e| DeltaTableError::ObjectStore { source: e})?);
)?);
let prefix = Path::parse(url.path())?;
Ok((url_prefix_handler(store, prefix.clone()), prefix))
}
Expand Down

0 comments on commit 5165a36

Please sign in to comment.