mirror of
https://github.com/deuxfleurs-org/garage.git
synced 2026-08-24 19:46:30 +00:00
api: better handling of helper errors to distinguish error codes
This commit is contained in:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user