Skip to content

Commit 206bc63

Browse files
authored
chore: debug for op value and flags (#278)
* chore: debug for op value and flags * style: fix formatting * style: fix clippy warnings
1 parent 1119847 commit 206bc63

File tree

3 files changed

+34
-28
lines changed

3 files changed

+34
-28
lines changed

grovedb/src/batch/mod.rs

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -380,27 +380,9 @@ impl fmt::Debug for GroveDbOp {
380380
self.key.visualize(key_drawer).unwrap();
381381

382382
let op_dbg = match &self.op {
383-
Op::Insert { element } => match element {
384-
Element::Item(..) => "Insert Item".to_string(),
385-
Element::Reference(..) => "Insert Ref".to_string(),
386-
Element::Tree(..) => "Insert Tree".to_string(),
387-
Element::SumTree(..) => "Insert Sum Tree".to_string(),
388-
Element::SumItem(..) => "Insert Sum Item".to_string(),
389-
},
390-
Op::Replace { element } => match element {
391-
Element::Item(..) => "Replace Item".to_string(),
392-
Element::Reference(..) => "Replace Ref".to_string(),
393-
Element::Tree(..) => "Replace Tree".to_string(),
394-
Element::SumTree(..) => "Replace Sum Tree".to_string(),
395-
Element::SumItem(..) => "Replace Sum Item".to_string(),
396-
},
397-
Op::Patch { element, .. } => match element {
398-
Element::Item(..) => "Patch Item".to_string(),
399-
Element::Reference(..) => "Patch Ref".to_string(),
400-
Element::Tree(..) => "Patch Tree".to_string(),
401-
Element::SumTree(..) => "Patch Sum Tree".to_string(),
402-
Element::SumItem(..) => "Patch Sum Item".to_string(),
403-
},
383+
Op::Insert { element } => format!("Insert {:?}", element),
384+
Op::Replace { element } => format!("Replace {:?}", element),
385+
Op::Patch { element, .. } => format!("Patch {:?}", element),
404386
Op::RefreshReference {
405387
reference_path_type,
406388
max_reference_hop,

grovedb/src/tests/query_tests.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2663,13 +2663,12 @@ fn test_query_b_depends_on_query_a() {
26632663
fn test_prove_absent_path_with_intermediate_emtpy_tree() {
26642664
// root
26652665
// test_leaf (empty)
2666-
let mut grovedb = make_test_grovedb();
2666+
let grovedb = make_test_grovedb();
26672667

26682668
// prove the absence of key "book" in ["test_leaf", "invalid"]
26692669
let mut query = Query::new();
26702670
query.insert_key(b"book".to_vec());
2671-
let mut path_query =
2672-
PathQuery::new_unsized(vec![TEST_LEAF.to_vec(), b"invalid".to_vec()], query);
2671+
let path_query = PathQuery::new_unsized(vec![TEST_LEAF.to_vec(), b"invalid".to_vec()], query);
26732672

26742673
let proof = grovedb
26752674
.prove_query(&path_query)

grovedb/src/visualize.rs

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,24 @@ use crate::{
4444
impl Visualize for Element {
4545
fn visualize<W: Write>(&self, mut drawer: Drawer<W>) -> Result<Drawer<W>> {
4646
match self {
47-
Element::Item(value, _) => {
47+
Element::Item(value, flags) => {
4848
drawer.write(b"item: ")?;
4949
drawer = value.visualize(drawer)?;
50+
51+
if let Some(f) = flags {
52+
if !f.is_empty() {
53+
drawer = f.visualize(drawer)?;
54+
}
55+
}
5056
}
51-
Element::SumItem(value, _) => {
57+
Element::SumItem(value, flags) => {
5258
drawer.write(format!("sum_item: {value}").as_bytes())?;
59+
60+
if let Some(f) = flags {
61+
if !f.is_empty() {
62+
drawer = f.visualize(drawer)?;
63+
}
64+
}
5365
}
5466
Element::Reference(_ref, ..) => {
5567
drawer.write(b"ref")?;
@@ -64,13 +76,26 @@ impl Visualize for Element {
6476
// }
6577
// drawer.write(b"]")?;
6678
}
67-
Element::Tree(root_key, _) => {
79+
Element::Tree(root_key, flags) => {
6880
drawer.write(b"tree: ")?;
6981
drawer = root_key.as_deref().visualize(drawer)?;
82+
83+
if let Some(f) = flags {
84+
if !f.is_empty() {
85+
drawer = f.visualize(drawer)?;
86+
}
87+
}
7088
}
71-
Element::SumTree(root_key, ..) => {
89+
Element::SumTree(root_key, value, flags) => {
7290
drawer.write(b"sum_tree: ")?;
7391
drawer = root_key.as_deref().visualize(drawer)?;
92+
drawer.write(format!(" {value}").as_bytes())?;
93+
94+
if let Some(f) = flags {
95+
if !f.is_empty() {
96+
drawer = f.visualize(drawer)?;
97+
}
98+
}
7499
}
75100
}
76101
Ok(drawer)

0 commit comments

Comments
 (0)