Skip to content

Commit 21efab3

Browse files
ion-elgrecortyler
authored andcommitted
chore: bump kernel, datafusion 44rc1
Signed-off-by: Ion Koutsouris <[email protected]>
1 parent ac72297 commit 21efab3

File tree

8 files changed

+32
-45
lines changed

8 files changed

+32
-45
lines changed

Cargo.toml

+11-25
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ debug = true
2626
debug = "line-tables-only"
2727

2828
[workspace.dependencies]
29-
delta_kernel = { version = "0.5.0", features = ["default-engine"] }
29+
delta_kernel = { version = "0.6.0", features = ["default-engine"] }
3030
#delta_kernel = { path = "../delta-kernel-rs/kernel", features = ["sync-engine"] }
3131

3232
# arrow
@@ -45,16 +45,16 @@ object_store = { version = "0.11.2" }
4545
parquet = { version = "53" }
4646

4747
# datafusion
48-
datafusion = { version = "43" }
49-
datafusion-expr = { version = "43" }
50-
datafusion-common = { version = "43" }
51-
datafusion-ffi = { version = "43" }
52-
datafusion-functions = { version = "43" }
53-
datafusion-functions-aggregate = { version = "43" }
54-
datafusion-physical-expr = { version = "43" }
55-
datafusion-physical-plan = { version = "43" }
56-
datafusion-proto = { version = "43" }
57-
datafusion-sql = { version = "43" }
48+
datafusion = { version = "44" }
49+
datafusion-expr = { version = "44" }
50+
datafusion-common = { version = "44" }
51+
datafusion-ffi = { version = "44" }
52+
datafusion-functions = { version = "44" }
53+
datafusion-functions-aggregate = { version = "44" }
54+
datafusion-physical-expr = { version = "44" }
55+
datafusion-physical-plan = { version = "44" }
56+
datafusion-proto = { version = "44" }
57+
datafusion-sql = { version = "44" }
5858

5959
# serde
6060
serde = { version = "1.0.194", features = ["derive"] }
@@ -69,24 +69,10 @@ thiserror = { version = "2" }
6969
url = { version = "2" }
7070
urlencoding = "2.1.3"
7171
uuid = { version = "1" }
72-
path-tree = { version = "0.8.1"} # pin to 0.8.1 due to nightly features
7372

7473
# runtime / async
7574
async-trait = { version = "0.1" }
7675
futures = { version = "0.3" }
7776
tokio = { version = "1" }
7877
num_cpus = { version = "1" }
7978

80-
# temporary datafusion patches
81-
[patch.crates-io]
82-
datafusion = { git = "https://github.com/apache/datafusion.git", rev = "a50ed3488f77743a192d9e8dd9c99f00df659ef1" }
83-
datafusion-common = { git = "https://github.com/apache/datafusion.git", rev = "a50ed3488f77743a192d9e8dd9c99f00df659ef1" }
84-
datafusion-execution = { git = "https://github.com/apache/datafusion.git", rev = "a50ed3488f77743a192d9e8dd9c99f00df659ef1" }
85-
datafusion-expr = { git = "https://github.com/apache/datafusion.git", rev = "a50ed3488f77743a192d9e8dd9c99f00df659ef1" }
86-
datafusion-ffi = { git = "https://github.com/apache/datafusion.git", rev = "a50ed3488f77743a192d9e8dd9c99f00df659ef1" }
87-
datafusion-functions = { git = "https://github.com/apache/datafusion.git", rev = "a50ed3488f77743a192d9e8dd9c99f00df659ef1" }
88-
datafusion-functions-aggregate = { git = "https://github.com/apache/datafusion.git", rev = "a50ed3488f77743a192d9e8dd9c99f00df659ef1" }
89-
datafusion-physical-expr = { git = "https://github.com/apache/datafusion.git", rev = "a50ed3488f77743a192d9e8dd9c99f00df659ef1" }
90-
datafusion-physical-plan = { git = "https://github.com/apache/datafusion.git", rev = "a50ed3488f77743a192d9e8dd9c99f00df659ef1" }
91-
datafusion-proto = { git = "https://github.com/apache/datafusion.git", rev = "a50ed3488f77743a192d9e8dd9c99f00df659ef1" }
92-
datafusion-sql = { git = "https://github.com/apache/datafusion.git", rev = "a50ed3488f77743a192d9e8dd9c99f00df659ef1" }

crates/aws/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl LogStoreFactory for S3LogStoreFactory {
7878
store,
7979
)?));
8080
}
81-
Ok(default_logstore(store, location, &options))
81+
Ok(default_logstore(store, location, options))
8282
}
8383
}
8484

@@ -141,6 +141,7 @@ impl std::fmt::Debug for DynamoDbLockClient {
141141

142142
impl DynamoDbLockClient {
143143
/// Creates a new DynamoDbLockClient from the supplied storage options.
144+
#[allow(clippy::too_many_arguments)]
144145
pub fn try_new(
145146
sdk_config: &SdkConfig,
146147
lock_table_name: Option<String>,

crates/azure/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ rust-version.workspace = true
1414
[dependencies]
1515
deltalake-core = { version = "0.23.0", path = "../core", features = [
1616
"datafusion",
17-
] }
17+
]}
1818
lazy_static = "1"
1919

2020
# workspace depenndecies

crates/catalog-unity/Cargo.toml

+8-6
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,19 @@ tokio.workspace = true
1717
serde.workspace = true
1818
serde_json.workspace = true
1919
thiserror.workspace = true
20-
deltalake-core = { version = "0.23", path = "../core" }
20+
deltalake-core = { version = "0.23", path = "../core", features = [
21+
"datafusion",
22+
]}
2123
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "json", "http2"] }
2224
reqwest-retry = "0.7"
2325
reqwest-middleware = "0.4.0"
2426
rand = "0.8"
25-
futures = "0.3"
26-
chrono = "0.4"
27+
futures = { workspace = true }
28+
chrono = { workspace = true }
2729
dashmap = "6"
28-
tracing = "0.1"
29-
datafusion = { version = "43", optional = true }
30-
datafusion-common = { version = "43", optional = true }
30+
tracing = { workspace = true }
31+
datafusion = { workspace = true, optional = true }
32+
datafusion-common = { workspace = true, optional = true }
3133

3234
[dev-dependencies]
3335
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }

crates/catalog-unity/src/credential.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ impl TokenCredential for AzureCliCredential {
205205
"got unexpected token type from azure cli: {0}",
206206
token_response.token_type
207207
),
208-
}
209-
.into());
208+
});
210209
}
211210
let duration =
212211
token_response.expires_on.naive_local() - chrono::Local::now().naive_local();
@@ -224,18 +223,15 @@ impl TokenCredential for AzureCliCredential {
224223
let message = String::from_utf8_lossy(&az_output.stderr);
225224
Err(UnityCatalogError::AzureCli {
226225
message: message.into(),
227-
}
228-
.into())
226+
})
229227
}
230228
Err(e) => match e.kind() {
231229
std::io::ErrorKind::NotFound => Err(UnityCatalogError::AzureCli {
232230
message: "Azure Cli not installed".into(),
233-
}
234-
.into()),
231+
}),
235232
error_kind => Err(UnityCatalogError::AzureCli {
236233
message: format!("io error: {error_kind:?}"),
237-
}
238-
.into()),
234+
}),
239235
},
240236
}
241237
}

crates/catalog-unity/src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -644,8 +644,7 @@ impl DataCatalog for UnityCatalog {
644644
GetTableResponse::Error(err) => Err(UnityCatalogError::InvalidTable {
645645
error_code: err.error_code,
646646
message: err.message,
647-
}
648-
.into()),
647+
}),
649648
}
650649
}
651650
}

crates/core/src/table/state_arrow.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use arrow_array::{
1414
use arrow_cast::cast;
1515
use arrow_cast::parse::Parser;
1616
use arrow_schema::{DataType, Field, Fields, TimeUnit};
17-
use delta_kernel::table_features::ColumnMappingMode;
17+
use delta_kernel::table_features::{validate_schema_column_mapping, ColumnMappingMode};
1818
use itertools::Itertools;
1919

2020
use super::state::DeltaTableState;
@@ -171,6 +171,8 @@ impl DeltaTableState {
171171
})
172172
.collect::<HashMap<&str, _>>();
173173

174+
validate_schema_column_mapping(self.schema(), column_mapping_mode)?;
175+
174176
let physical_name_to_logical_name = match column_mapping_mode {
175177
ColumnMappingMode::None => HashMap::with_capacity(0), // No column mapping, no need for this HashMap
176178
ColumnMappingMode::Id | ColumnMappingMode::Name => metadata
@@ -184,7 +186,7 @@ impl DeltaTableState {
184186
"Invalid partition column {0}",
185187
name
186188
)))?
187-
.physical_name(column_mapping_mode)?
189+
.physical_name()
188190
.to_string();
189191
Ok((physical_name, name.as_str()))
190192
})

python/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,7 @@ impl RawDeltaTable {
670670
}
671671

672672
#[pyo3(signature = (starting_version = 0, ending_version = None, starting_timestamp = None, ending_timestamp = None, columns = None, allow_out_of_range = false))]
673+
#[allow(clippy::too_many_arguments)]
673674
pub fn load_cdf(
674675
&mut self,
675676
py: Python,

0 commit comments

Comments
 (0)