forked from Deuxfleurs/garage
Alex
5768bf3622
**Specification:** View spec at [this URL](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/k2v/doc/drafts/k2v-spec.md) - [x] Specify the structure of K2V triples - [x] Specify the DVVS format used for causality detection - [x] Specify the K2V index (just a counter of number of values per partition key) - [x] Specify single-item endpoints: ReadItem, InsertItem, DeleteItem - [x] Specify index endpoint: ReadIndex - [x] Specify multi-item endpoints: InsertBatch, ReadBatch, DeleteBatch - [x] Move to JSON objects instead of tuples - [x] Specify endpoints for polling for updates on single values (PollItem) **Implementation:** - [x] Table for K2V items, causal contexts - [x] Indexing mechanism and table for K2V index - [x] Make API handlers a bit more generic - [x] K2V API endpoint - [x] K2V API router - [x] ReadItem - [x] InsertItem - [x] DeleteItem - [x] PollItem - [x] ReadIndex - [x] InsertBatch - [x] ReadBatch - [x] DeleteBatch **Testing:** - [x] Just a simple Python script that does some requests to check visually that things are going right (does not contain parsing of results or assertions on returned values) - [x] Actual tests: - [x] Adapt testing framework - [x] Simple test with InsertItem + ReadItem - [x] Test with several Insert/Read/DeleteItem + ReadIndex - [x] Test all combinations of return formats for ReadItem - [x] Test with ReadBatch, InsertBatch, DeleteBatch - [x] Test with PollItem - [x] Test error codes - [ ] Fix most broken stuff - [x] test PollItem broken randomly - [x] when invalid causality tokens are given, errors should be 4xx not 5xx **Improvements:** - [x] Descending range queries - [x] Specify - [x] Implement - [x] Add test - [x] Batch updates to index counter - [x] Put K2V behind `k2v` feature flag Co-authored-by: Alex Auvolat <alex@adnab.me> Reviewed-on: Deuxfleurs/garage#293 Co-authored-by: Alex <alex@adnab.me> Co-committed-by: Alex <alex@adnab.me>
101 lines
2.2 KiB
Rust
101 lines
2.2 KiB
Rust
use std::sync::Arc;
|
|
|
|
use hyper::{Body, Response, StatusCode};
|
|
use serde::Serialize;
|
|
|
|
use garage_util::data::*;
|
|
use garage_util::error::Error as GarageError;
|
|
|
|
use garage_rpc::ring::Ring;
|
|
use garage_table::util::*;
|
|
|
|
use garage_model::garage::Garage;
|
|
use garage_model::k2v::counter_table::{BYTES, CONFLICTS, ENTRIES, VALUES};
|
|
|
|
use crate::error::*;
|
|
use crate::k2v::range::read_range;
|
|
|
|
pub async fn handle_read_index(
|
|
garage: Arc<Garage>,
|
|
bucket_id: Uuid,
|
|
prefix: Option<String>,
|
|
start: Option<String>,
|
|
end: Option<String>,
|
|
limit: Option<u64>,
|
|
reverse: Option<bool>,
|
|
) -> Result<Response<Body>, Error> {
|
|
let reverse = reverse.unwrap_or(false);
|
|
|
|
let ring: Arc<Ring> = garage.system.ring.borrow().clone();
|
|
|
|
let (partition_keys, more, next_start) = read_range(
|
|
&garage.k2v.counter_table.table,
|
|
&bucket_id,
|
|
&prefix,
|
|
&start,
|
|
&end,
|
|
limit,
|
|
Some((DeletedFilter::NotDeleted, ring.layout.node_id_vec.clone())),
|
|
EnumerationOrder::from_reverse(reverse),
|
|
)
|
|
.await?;
|
|
|
|
let s_entries = ENTRIES.to_string();
|
|
let s_conflicts = CONFLICTS.to_string();
|
|
let s_values = VALUES.to_string();
|
|
let s_bytes = BYTES.to_string();
|
|
|
|
let resp = ReadIndexResponse {
|
|
prefix,
|
|
start,
|
|
end,
|
|
limit,
|
|
reverse,
|
|
partition_keys: partition_keys
|
|
.into_iter()
|
|
.map(|part| {
|
|
let vals = part.filtered_values(&ring);
|
|
ReadIndexResponseEntry {
|
|
pk: part.sk,
|
|
entries: *vals.get(&s_entries).unwrap_or(&0),
|
|
conflicts: *vals.get(&s_conflicts).unwrap_or(&0),
|
|
values: *vals.get(&s_values).unwrap_or(&0),
|
|
bytes: *vals.get(&s_bytes).unwrap_or(&0),
|
|
}
|
|
})
|
|
.collect::<Vec<_>>(),
|
|
more,
|
|
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))?)
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
struct ReadIndexResponse {
|
|
prefix: Option<String>,
|
|
start: Option<String>,
|
|
end: Option<String>,
|
|
limit: Option<u64>,
|
|
reverse: bool,
|
|
|
|
#[serde(rename = "partitionKeys")]
|
|
partition_keys: Vec<ReadIndexResponseEntry>,
|
|
|
|
more: bool,
|
|
#[serde(rename = "nextStart")]
|
|
next_start: Option<String>,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
struct ReadIndexResponseEntry {
|
|
pk: String,
|
|
entries: i64,
|
|
conflicts: i64,
|
|
values: i64,
|
|
bytes: i64,
|
|
}
|