diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-04-25 12:34:26 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-04-25 12:34:26 +0200 |
| commit | fa78d806e3ae40031e80eebb86e4eb1756d7baea (patch) | |
| tree | 144662fb430c484093f6f9a585a2441c2ff26494 /src/api/k2v/index.rs | |
| parent | 654999e254e6c1f46bb5d668bc1230f226575716 (diff) | |
| parent | a16eb7e4b8344d2f58c09a249b7b1bd17d339a35 (diff) | |
| download | garage-fa78d806e3ae40031e80eebb86e4eb1756d7baea.tar.gz garage-fa78d806e3ae40031e80eebb86e4eb1756d7baea.zip | |
Merge branch 'main' into next
Diffstat (limited to 'src/api/k2v/index.rs')
| -rw-r--r-- | src/api/k2v/index.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/api/k2v/index.rs b/src/api/k2v/index.rs index 210950bf..6c1d4a91 100644 --- a/src/api/k2v/index.rs +++ b/src/api/k2v/index.rs @@ -1,10 +1,9 @@ use std::sync::Arc; -use hyper::{Body, Response, StatusCode}; +use hyper::{Body, Response}; use serde::Serialize; use garage_util::data::*; -use garage_util::error::Error as GarageError; use garage_rpc::ring::Ring; use garage_table::util::*; @@ -12,6 +11,7 @@ use garage_table::util::*; use garage_model::garage::Garage; use garage_model::k2v::item_table::{BYTES, CONFLICTS, ENTRIES, VALUES}; +use crate::helpers::*; use crate::k2v::error::*; use crate::k2v::range::read_range; @@ -68,10 +68,7 @@ pub async fn handle_read_index( next_start, }; - let resp_json = serde_json::to_string_pretty(&resp).map_err(GarageError::from)?; - Ok(Response::builder() - .status(StatusCode::OK) - .body(Body::from(resp_json))?) + Ok(json_ok_response(&resp)?) } #[derive(Serialize)] |