Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: make ListKV non-blocking by returning stream directly #16868

Merged
merged 1 commit into from
Nov 19, 2024
Merged

refactor: make ListKV non-blocking by returning stream directly #16868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/meta/raft-store/src/state_machine_api_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,6 @@ pub trait StateMachineApiExt: StateMachineApi {
future::ready(Ok(res))
});

// Make it static

let vs = strm.collect::<Vec<_>>().await;
let strm = futures::stream::iter(vs);

Ok(strm.boxed())
}

Expand Down
1 change: 1 addition & 0 deletions src/meta/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ semver = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
serfig = { workspace = true }
tokio = { workspace = true }
tokio-stream = { workspace = true }
tonic = { workspace = true }
tonic-reflection = { workspace = true }
Expand Down
16 changes: 10 additions & 6 deletions src/meta/service/src/meta_service/meta_leader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@ use databend_common_meta_types::MetaOperationError;
use databend_common_meta_types::Node;
use databend_common_metrics::count::Count;
use futures::StreamExt;
use futures::TryStreamExt;
use log::debug;
use log::info;
use maplit::btreemap;
use maplit::btreeset;
use tonic::codegen::BoxStream;
use tonic::Status;

use crate::message::ForwardRequest;
use crate::message::ForwardRequestBody;
Expand Down Expand Up @@ -147,12 +149,14 @@ impl<'a> Handler<MetaGrpcReadReq> for MetaLeader<'a> {
}

MetaGrpcReadReq::ListKV(req) => {
// safe unwrap(): Infallible
let kvs = kv_api.prefix_list_kv(&req.prefix).await.unwrap();

let kv_iter = kvs.into_iter().map(|kv| Ok(StreamItem::from(kv)));

let strm = futures::stream::iter(kv_iter);
let strm =
kv_api.list_kv(&req.prefix).await.map_err(|e| {
MetaOperationError::DataError(MetaDataError::ReadError(
MetaDataReadError::new("list_kv", &req.prefix, &e),
))
})?;

let strm = strm.map_err(|e| Status::internal(e.to_string()));

Ok(strm.boxed())
}
Expand Down
Loading