From 6806e5a9e0b82d9f0c5c26ae13440fc0df8ab92c Mon Sep 17 00:00:00 2001
From: Mehdi Hosseini <116847813+shosseinimotlagh@users.noreply.github.com>
Date: Mon, 5 Aug 2024 15:18:12 -0700
Subject: [PATCH] Fix to_dot_keys issues for homeobject (#482)

---
 .DS_Store                                        | Bin 8196 -> 0 bytes
 conanfile.py                                     |   2 +-
 .../homestore/btree/detail/btree_mutate_impl.ipp |  14 --------------
 .../homestore/btree/detail/simple_node.hpp       |  11 ++++++++---
 4 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 04e3372dddc6554a4509762009625dc91bada321..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHM-D(p-6h4z|nhmW|rG<JStaw{%8?{ipNz(=`RE0+LLM3LCG+n#d3A>xdQVO}(
zx9|Z(yz)WRXAv*-o1d2KG{p-+3eJ?7Gdpv>vuD2f*_<g6vFf0`LbO0cF0zob(<mk+
z(J%6ul+!I&AsO&Qhjfct6jGC-GupPnGGH073|Iy%1D1h{zyQA4BDv>$_f@YgEd!Q;
z|B?Z5K6uDNR<s-`DUS{mG6aBh&@2<`hyx_X)3T!FNJ$BWO%**b4P`pSU<!_YPpCsy
zv>Yj^;KUT1n0_<U5ek!U2hNk~#41YK(lTHfILm;D-RBXn_wg5I;`c6M`CZ}^QxE+q
zEm1;yTOn`xA@_k28*LqV>6c8X5f#X%0R^zsHZ(t;ujvnyzP9<r?}tH>E-!y$xx7=D
zD!N5?+I>~u<HLH|Ob1D|8NU!uPdN|$lX}yC7IcP<*|`lKrOhDf#1as+J5YJ~Jc!zS
zSmlGLok(n5b+{$B)R?_?bW|>{EH8TZR@aUfy`!}<>UZy~9v_$7`J1=z?=<$qUc}$Y
z;StlP4_#8vr{#Op#s+^-kE4)BU9<|s3~kUukoA}zP>r_f3FH!JHArIDp_`?%CCT5X
zPL@t4{2AB0f@>EsP0+-&olXMkZM2Bzu3_PaVPWCV7GN!gwH_8lYI>9tV;%SCGRFK!
zd$f%ukpPom)G58CH0w+5tAU+?FC14$;u>jJE~gHVeLBqI@*4)u!Du<KNmkGKY3LO(
z2V3y3h8d|-EvsD!3~dL?nN!!aTKI10m1qYR*J%^uu1%WXshWYvgOQk8+4oO<Hne60
z+mgQq4WTbK>x9i%ykX$xfD`l8p$0I!(n^eaOWMF@hLtz4Wvq<+C&P|I2e1**LDo;X
z`9F+pe!%2%x8Hxsge@!s7n^~+a&JMz|2Ue?yZ^t~gRtIN1}p=A#Q<|Q>zh@WIQeyJ
zS`)Fhhx{5@B%wD_QbJJ3a2!&G<B+HSFht#hs=!pV94UzwBzqAcX|RQ5;GZ(^8-^z>
ANB{r;

diff --git a/conanfile.py b/conanfile.py
index e9f91d434..b10e4f860 100644
--- 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
index 0c5313eb2..209b35558 100644
--- 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
index 6c038df7f..20f8b264d 100644
--- 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;
     }