rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-10-03 10:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(catalog): skip backend batch_get on full cache hits (#9431)

Browse Source 
fix(catalog): return cached batch values without an empty backend call

Count backend batch_get invocations in regression tests and cover empty input.

Signed-off-by: WenyXu <wenymedia@gmail.com>
This commit is contained in:
Weny Xu
2026-10-02 09:50:08 +00:00
committed by GitHub
parent 3e86422ef8
commit acebd6b35b
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/catalog/src/kvbackend/client.rs
+26 -2
View File
@@ -192,6 +192,10 @@ impl KvBackend for CachedKvBackend {
}
}
if miss_keys.is_empty() {
return Ok(BatchGetResponse { kvs });
}
let batch_get_req = BatchGetRequest::new().with_keys(miss_keys.clone());
let pre_version = self.version();
@@ -503,6 +507,7 @@ mod tests {
pub struct SimpleKvBackend {
inner_map: DashMap<Vec<u8>, Vec<u8>>,
get_execute_times: Arc<AtomicU32>,
batch_get_execute_times: Arc<AtomicU32>,
}
impl TxnService for SimpleKvBackend {
@@ -520,6 +525,7 @@ mod tests {
}
async fn batch_get(&self, req: BatchGetRequest) -> Result<BatchGetResponse, Self::Error> {
self.batch_get_execute_times.fetch_add(1, Ordering::SeqCst);
let mut kvs = Vec::with_capacity(req.keys.len());
for key in req.keys.iter() {
if let Some(kv) = self.get(key).await? {
@@ -571,6 +577,7 @@ mod tests {
async fn test_cached_kv_backend() {
let simple_kv = Arc::new(SimpleKvBackend::default());
let get_execute_times = simple_kv.get_execute_times.clone();
let batch_get_execute_times = simple_kv.batch_get_execute_times.clone();
let cached_kv = CachedKvBackend::wrap(simple_kv);
add_some_vals(&cached_kv).await;
@@ -582,9 +589,11 @@ mod tests {
assert_eq!(get_execute_times.load(Ordering::SeqCst), 0);
for _ in 0..10 {
let _batch_get_resp = cached_kv.batch_get(batch_get_req.clone()).await.unwrap();
let batch_get_resp = cached_kv.batch_get(batch_get_req.clone()).await.unwrap();
assert_eq!(batch_get_resp.kvs.len(), 2);
assert_eq!(get_execute_times.load(Ordering::SeqCst), 2);
assert_eq!(batch_get_execute_times.load(Ordering::SeqCst), 1);
}
let batch_get_req = BatchGetRequest {
@@ -594,14 +603,29 @@ mod tests {
let _batch_get_resp = cached_kv.batch_get(batch_get_req.clone()).await.unwrap();
assert_eq!(get_execute_times.load(Ordering::SeqCst), 3);
assert_eq!(batch_get_execute_times.load(Ordering::SeqCst), 2);
for _ in 0..10 {
let _batch_get_resp = cached_kv.batch_get(batch_get_req.clone()).await.unwrap();
let batch_get_resp = cached_kv.batch_get(batch_get_req.clone()).await.unwrap();
assert_eq!(batch_get_resp.kvs.len(), 3);
assert_eq!(get_execute_times.load(Ordering::SeqCst), 3);
assert_eq!(batch_get_execute_times.load(Ordering::SeqCst), 2);
}
}
#[tokio::test]
async fn test_cached_kv_backend_empty_batch_get() {
let simple_kv = Arc::new(SimpleKvBackend::default());
let cached_kv = CachedKvBackend::wrap(simple_kv.clone());
let response = cached_kv.batch_get(BatchGetRequest::new()).await.unwrap();
assert!(response.kvs.is_empty());
assert_eq!(simple_kv.batch_get_execute_times.load(Ordering::SeqCst), 0);
assert_eq!(simple_kv.get_execute_times.load(Ordering::SeqCst), 0);
}
#[tokio::test]
async fn test_cached_kv_backend_rejects_writes_with_read_only_inner() {
let inner = Arc::new(MemoryKvBackend::<common_meta::error::Error>::new());