Skip to content

fix(core): handle Result type after get_actions sync conversion #3846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 18, 2025
Merged

fix(core): handle Result type after get_actions sync conversion #3846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b14c25
Fix Result handling after get_actions async removal
yousefsaad12 Oct 14, 2025
8893f00
Merge branch 'main' into fix/get-actions-result-handling
rtyler Oct 18, 2025
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
6 changes: 3 additions & 3 deletions crates/core/benches/json_parsing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fn bench_simple_actions(c: &mut Criterion) {
group.bench_function("get_actions", |b| {
b.iter(|| {
rt.block_on(async {
let result = get_actions(0, &commit_log).await;
let result = get_actions(0, &commit_log);
black_box(result.unwrap().len())
})
});
Expand All @@ -80,7 +80,7 @@ fn bench_with_stats(c: &mut Criterion) {
group.bench_function("get_actions", |b| {
b.iter(|| {
rt.block_on(async {
let result = get_actions(0, &commit_log).await;
let result = get_actions(0, &commit_log);
black_box(result.unwrap().len())
})
});
Expand All @@ -101,7 +101,7 @@ fn bench_full_complexity(c: &mut Criterion) {
group.bench_function("get_actions", |b| {
b.iter(|| {
rt.block_on(async {
let result = get_actions(0, &commit_log).await;
let result = get_actions(0, &commit_log);
black_box(result.unwrap().len())
})
});
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/kernel/transaction/conflict_checker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ impl WinningCommitSummary {
let commit_log_bytes = log_store.read_commit_entry(winning_commit_version).await?;
match commit_log_bytes {
Some(bytes) => {
let actions = get_actions(winning_commit_version, &bytes).await?;
let actions = get_actions(winning_commit_version, &bytes)?; // ← ADD ? HERE
let commit_info = actions
.iter()
.find(|action| matches!(action, Action::CommitInfo(_)))
Expand Down
6 changes: 3 additions & 3 deletions crates/core/src/logstore/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ pub trait LogStore: Send + Sync + AsAny {
Err(err) => Err(err),
}?;

let actions = crate::logstore::get_actions(next_version, &commit_log_bytes).await;
let actions = crate::logstore::get_actions(next_version, &commit_log_bytes);
Ok(PeekCommit::New(next_version, actions?))
}

Expand Down Expand Up @@ -564,7 +564,7 @@ pub fn to_uri(root: &Url, location: &Path) -> String {
}

/// Reads a commit and gets list of actions
pub async fn get_actions(
pub fn get_actions(
version: i64,
commit_log_bytes: &bytes::Bytes,
) -> Result<Vec<Action>, DeltaTableError> {
Expand Down Expand Up @@ -1006,7 +1006,7 @@ mod datafusion_tests {
{"invalid json without closing brace"#,
);

let result = get_actions(0, &malformed_json).await;
let result = get_actions(0, &malformed_json);

match result {
Err(DeltaTableError::InvalidJsonLog {
Expand Down
8 changes: 4 additions & 4 deletions crates/core/src/operations/load_cdf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ impl CdfLoadBuilder {
let ts = self.starting_timestamp.unwrap_or(DateTime::UNIX_EPOCH);
for v in 0..self.snapshot.version() {
if let Ok(Some(bytes)) = self.log_store.read_commit_entry(v).await {
if let Ok(actions) = get_actions(v, &bytes).await {
if let Ok(actions) = get_actions(v, &bytes) {
if actions.iter().any(|action| {
matches!(action, Action::CommitInfo(CommitInfo {
timestamp: Some(t), ..
Expand Down Expand Up @@ -209,7 +209,7 @@ impl CdfLoadBuilder {
.ok_or(DeltaTableError::InvalidVersion(latest_version))?;

let latest_version_actions: Vec<Action> =
get_actions(latest_version, &latest_snapshot_bytes).await?;
get_actions(latest_version, &latest_snapshot_bytes)?;
let latest_version_commit = latest_version_actions
.iter()
.find(|a| matches!(a, Action::CommitInfo(_)));
Expand Down Expand Up @@ -240,7 +240,7 @@ impl CdfLoadBuilder {
.await?
.ok_or(DeltaTableError::InvalidVersion(version));

let version_actions: Vec<Action> = get_actions(version, &snapshot_bytes?).await?;
let version_actions: Vec<Action> = get_actions(version, &snapshot_bytes?)?;

let mut ts = 0;
let mut cdc_actions = vec![];
Expand Down Expand Up @@ -953,7 +953,7 @@ pub(crate) mod tests {
.read_commit_entry(2)
.await?
.expect("failed to get snapshot bytes");
let version_actions = get_actions(2, &snapshot_bytes).await?;
let version_actions = get_actions(2, &snapshot_bytes)?;

let cdc_actions = version_actions
.iter()
Expand Down
12 changes: 3 additions & 9 deletions crates/core/src/operations/merge/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,9 +2008,7 @@ mod tests {
.await
.unwrap()
.expect("failed to get snapshot bytes");
let actions = crate::logstore::get_actions(2, &snapshot_bytes)
.await
.unwrap();
let actions = crate::logstore::get_actions(2, &snapshot_bytes).unwrap();

let schema_actions = actions
.iter()
Expand Down Expand Up @@ -2084,9 +2082,7 @@ mod tests {
.await
.unwrap()
.expect("failed to get snapshot bytes");
let actions = crate::logstore::get_actions(2, &snapshot_bytes)
.await
.unwrap();
let actions = crate::logstore::get_actions(2, &snapshot_bytes).unwrap();

let schema_actions = actions
.iter()
Expand Down Expand Up @@ -2195,9 +2191,7 @@ mod tests {
.await
.unwrap()
.expect("failed to get snapshot bytes");
let actions = crate::logstore::get_actions(2, &snapshot_bytes)
.await
.unwrap();
let actions = crate::logstore::get_actions(2, &snapshot_bytes).unwrap();

let schema_actions = actions
.iter()
Expand Down
6 changes: 3 additions & 3 deletions crates/core/src/operations/write/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1681,7 +1681,7 @@ mod tests {
.read_commit_entry(2)
.await?
.expect("failed to get snapshot bytes");
let version_actions = get_actions(2, &snapshot_bytes).await?;
let version_actions = get_actions(2, &snapshot_bytes)?;

let cdc_actions = version_actions
.iter()
Expand Down Expand Up @@ -1755,7 +1755,7 @@ mod tests {
.read_commit_entry(2)
.await?
.expect("failed to get snapshot bytes");
let version_actions = get_actions(2, &snapshot_bytes).await?;
let version_actions = get_actions(2, &snapshot_bytes)?;

let cdc_actions = version_actions
.iter()
Expand Down Expand Up @@ -1856,7 +1856,7 @@ mod tests {
.read_commit_entry(2)
.await?
.expect("failed to get snapshot bytes");
let version_actions = get_actions(2, &snapshot_bytes).await?;
let version_actions = get_actions(2, &snapshot_bytes)?;

let cdc_actions = version_actions
.iter()
Expand Down
Loading