diff options
| author | Alex <lx@deuxfleurs.fr> | 2025-01-29 18:25:44 +0000 |
|---|---|---|
| committer | Alex <lx@deuxfleurs.fr> | 2025-01-29 18:25:44 +0000 |
| commit | ab71544499679685877cd7bd683ba4556b4331f2 (patch) | |
| tree | 7445be8428cfccd0996109b23a06ec2b7b959f40 /src/api/k2v/batch.rs | |
| parent | 991edbe02c9493e932614f1b801fe2bbdf020c53 (diff) | |
| parent | 9f3c7c3720d323bc9df3892197e6da5d89d1b84a (diff) | |
| download | garage-ab71544499679685877cd7bd683ba4556b4331f2.tar.gz garage-ab71544499679685877cd7bd683ba4556b4331f2.zip | |
Merge pull request 'api: better handling of helper errors to distinguish error codes' (#942) from fix-getkeyinfo-404 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/942
Diffstat (limited to 'src/api/k2v/batch.rs')
| -rw-r--r-- | src/api/k2v/batch.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/api/k2v/batch.rs b/src/api/k2v/batch.rs index 02b7ae8b..e4d0b0e5 100644 --- a/src/api/k2v/batch.rs +++ b/src/api/k2v/batch.rs @@ -4,12 +4,12 @@ use serde::{Deserialize, Serialize}; use garage_table::{EnumerationOrder, TableSchema}; -use garage_model::k2v::causality::*; use garage_model::k2v::item_table::*; use crate::helpers::*; use crate::k2v::api_server::{ReqBody, ResBody}; use crate::k2v::error::*; +use crate::k2v::item::parse_causality_token; use crate::k2v::range::read_range; pub async fn handle_insert_batch( @@ -23,7 +23,7 @@ pub async fn handle_insert_batch( let mut items2 = vec![]; for it in items { - let ct = it.ct.map(|s| CausalContext::parse_helper(&s)).transpose()?; + let ct = it.ct.map(|s| parse_causality_token(&s)).transpose()?; let v = match it.v { Some(vs) => DvvsValue::Value( BASE64_STANDARD @@ -281,7 +281,8 @@ pub(crate) async fn handle_poll_range( query.seen_marker, timeout_msec, ) - .await?; + .await + .map_err(pass_helper_error)?; if let Some((items, seen_marker)) = resp { let resp = PollRangeResponse { |