Fix to_dot_keys issues for homeobject (#482)

eBay · Aug 5, 2024 · 6806e5a · 6806e5a
1 parent 225a6ed
commit 6806e5a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/conanfile.py b/conanfile.py
@@ -9,7 +9,7 @@
 
 class HomestoreConan(ConanFile):
     name = "homestore"
-    version = "6.4.35"
+    version = "6.4.36"
 
     homepage = "https://github.com/eBay/Homestore"
     description = "HomeStore Storage Engine"

diff --git a/src/include/homestore/btree/detail/btree_mutate_impl.ipp b/src/include/homestore/btree/detail/btree_mutate_impl.ipp
@@ -299,20 +299,6 @@ btree_status_t Btree< K, V >::split_node(const BtreeNodePtr& parent_node, const
     return ret;
 }
 
-// template < typename K, typename V >
-// template < typename ReqT >
-// bool Btree< K, V >::is_split_needed(const BtreeNodePtr& node, ReqT& req) const {
-//     if (!node->is_leaf()) { // if internal node, size is atmost one additional entry, size of K/V
-//         return node->total_entries() >= 3;
-//     } else if constexpr (std::is_same_v< ReqT, BtreeRangePutRequest< K > >) {
-//         return node->total_entries() >= 3;
-//     } else if constexpr (std::is_same_v< ReqT, BtreeSinglePutRequest >) {
-//         return node->total_entries() >= 3;;
-//     } else {
-//         return false;
-//     }
-// }
-
 template < typename K, typename V >
 template < typename ReqT >
 bool Btree< K, V >::is_split_needed(const BtreeNodePtr& node, ReqT& req) const {

diff --git a/src/include/homestore/btree/detail/simple_node.hpp b/src/include/homestore/btree/detail/simple_node.hpp
@@ -227,10 +227,16 @@ class SimpleNode : public VariantNode< K, V > {
         }
         return str;
     }
-
     std::string to_dot_keys() const override {
+        return to_dot_keys_impl(std::is_same<K, uint64_t>{});
+    }
+
+    std::string to_dot_keys_impl(std::false_type) const {
+        return "";
+    }
+
+    std::string to_dot_keys_impl(std::true_type) const {
         std::string str;
-#if 0
         std::string snext = this->next_bnode() == empty_bnodeid ? "" : fmt::format("next_node={}", this->next_bnode());
         str += fmt::format(R"("{}" [
                 shape = none,
@@ -315,7 +321,6 @@ class SimpleNode : public VariantNode< K, V > {
                                     1, this->node_id(), this->link_version(), this->node_gen(), snext);
             return str + keys_buf;
         }
-#endif
         return str;
     }