diff options
author | Alex Auvolat <alex@adnab.me> | 2022-05-18 22:35:49 +0200 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2022-05-18 22:35:49 +0200 |
commit | 99976e11f880b39c1c57f66c68f19d8c54ad6c1f (patch) | |
tree | d0607d9fd176127e3a1733a794ebe95185620486 /src/garage | |
parent | 5367f8adb2aab70a5478c43b93de7051a93d831b (diff) | |
parent | 64c193e3dbb536d5d3c2881bc9aebbb3e4e6272e (diff) | |
download | garage-99976e11f880b39c1c57f66c68f19d8c54ad6c1f.tar.gz garage-99976e11f880b39c1c57f66c68f19d8c54ad6c1f.zip |
Merge branch 'main' into admin-api
Diffstat (limited to 'src/garage')
-rw-r--r-- | src/garage/cli/cmd.rs | 1 | ||||
-rw-r--r-- | src/garage/cli/layout.rs | 1 | ||||
-rw-r--r-- | src/garage/cli/util.rs | 30 |
3 files changed, 3 insertions, 29 deletions
diff --git a/src/garage/cli/cmd.rs b/src/garage/cli/cmd.rs index 2a799868..b2dd8f14 100644 --- a/src/garage/cli/cmd.rs +++ b/src/garage/cli/cmd.rs @@ -1,6 +1,7 @@ use std::collections::HashSet; use garage_util::error::*; +use garage_util::formater::format_table; use garage_rpc::layout::*; use garage_rpc::system::*; diff --git a/src/garage/cli/layout.rs b/src/garage/cli/layout.rs index cdd3869b..db0af57c 100644 --- a/src/garage/cli/layout.rs +++ b/src/garage/cli/layout.rs @@ -1,5 +1,6 @@ use garage_util::crdt::Crdt; use garage_util::error::*; +use garage_util::formater::format_table; use garage_rpc::layout::*; use garage_rpc::system::*; diff --git a/src/garage/cli/util.rs b/src/garage/cli/util.rs index fe11ad44..6d73be3a 100644 --- a/src/garage/cli/util.rs +++ b/src/garage/cli/util.rs @@ -3,6 +3,7 @@ use std::collections::HashMap; use garage_util::crdt::*; use garage_util::data::Uuid; use garage_util::error::*; +use garage_util::formater::format_table; use garage_model::bucket_table::*; use garage_model::key_table::*; @@ -173,35 +174,6 @@ pub fn print_bucket_info(bucket: &Bucket, relevant_keys: &HashMap<String, Key>) }; } -pub fn format_table(data: Vec<String>) { - let data = data - .iter() - .map(|s| s.split('\t').collect::<Vec<_>>()) - .collect::<Vec<_>>(); - - let columns = data.iter().map(|row| row.len()).fold(0, std::cmp::max); - let mut column_size = vec![0; columns]; - - let mut out = String::new(); - - for row in data.iter() { - for (i, col) in row.iter().enumerate() { - column_size[i] = std::cmp::max(column_size[i], col.chars().count()); - } - } - - for row in data.iter() { - for (col, col_len) in row[..row.len() - 1].iter().zip(column_size.iter()) { - out.push_str(col); - (0..col_len - col.chars().count() + 2).for_each(|_| out.push(' ')); - } - out.push_str(row[row.len() - 1]); - out.push('\n'); - } - - print!("{}", out); -} - pub fn find_matching_node( cand: impl std::iter::Iterator<Item = Uuid>, pattern: &str, |