aboutsummaryrefslogtreecommitdiff
path: root/src/k2v-client/bin/k2v-cli.rs
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2023-06-27 08:28:26 +0000
committerAlex <alex@adnab.me>2023-06-27 08:28:26 +0000
commite466edbaec0cb9710e937a7ac01f00f943b2c7d2 (patch)
tree44124b7b6141121027c747fc098440e8f60f6b8a /src/k2v-client/bin/k2v-cli.rs
parentee494f5aa2d1da4f1a0d1a7a27e5666183362cee (diff)
parent33b3cf8e227048525918b7f232fc250e44dc2d47 (diff)
downloadgarage-e466edbaec0cb9710e937a7ac01f00f943b2c7d2.tar.gz
garage-e466edbaec0cb9710e937a7ac01f00f943b2c7d2.zip
Merge pull request 'introduce dedicated return type for PollRange' (#590) from trinity-1686a/garage:k2v-client-poll-range-result into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/590
Diffstat (limited to 'src/k2v-client/bin/k2v-cli.rs')
-rw-r--r--src/k2v-client/bin/k2v-cli.rs18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/k2v-client/bin/k2v-cli.rs b/src/k2v-client/bin/k2v-cli.rs
index 5a2422ab..b9461c89 100644
--- a/src/k2v-client/bin/k2v-cli.rs
+++ b/src/k2v-client/bin/k2v-cli.rs
@@ -311,23 +311,19 @@ impl BatchOutputKind {
.collect::<Vec<_>>()
}
- fn display_poll_range_output(
- &self,
- seen_marker: String,
- values: BTreeMap<String, CausalValue>,
- ) -> ! {
+ fn display_poll_range_output(&self, poll_range: PollRangeResult) -> ! {
if self.json {
let json = serde_json::json!({
- "values": self.values_json(values),
- "seen_marker": seen_marker,
+ "values": self.values_json(poll_range.items),
+ "seen_marker": poll_range.seen_marker,
});
let stdout = std::io::stdout();
serde_json::to_writer_pretty(stdout, &json).unwrap();
exit(0)
} else {
- println!("seen marker: {}", seen_marker);
- self.display_human_output(values)
+ println!("seen marker: {}", poll_range.seen_marker);
+ self.display_human_output(poll_range.items)
}
}
@@ -501,8 +497,8 @@ async fn main() -> Result<(), Error> {
)
.await?;
match res {
- Some((items, seen_marker)) => {
- output_kind.display_poll_range_output(seen_marker, items);
+ Some(poll_range_output) => {
+ output_kind.display_poll_range_output(poll_range_output);
}
None => {
if output_kind.json {