Fix btree compilation issues. (#189)

eBay · Sep 26, 2023 · 1859c4c · 1859c4c
1 parent 319a3d5
commit 1859c4c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/include/homestore/btree/btree.hpp b/src/include/homestore/btree/btree.hpp
@@ -66,7 +66,7 @@ class Btree {
     // to overcome the gcc bug, pointer here: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66944
     static BtreeThreadVariables* bt_thread_vars() {
         auto this_id(boost::this_fiber::get_id());
-        static thread_local std::map< fibers::fiber::id, std::unique_ptr< BtreeThreadVariables > > fiber_map;
+        static thread_local std::map< boost::fibers::fiber::id, std::unique_ptr< BtreeThreadVariables > > fiber_map;
         if (fiber_map.count(this_id)) { return fiber_map[this_id].get(); }
         fiber_map[this_id] = std::make_unique< BtreeThreadVariables >();
         return fiber_map[this_id].get();

diff --git a/src/include/homestore/btree/detail/simple_node.hpp b/src/include/homestore/btree/detail/simple_node.hpp
@@ -262,6 +262,7 @@ class SimpleNode : public BtreeNode {
     }
 
     std::string to_string_keys(bool print_friendly = false) const override {
+#if 0
         std::string delimiter = print_friendly ? "\n" : "\t";
         auto str = fmt::format("{}{} nEntries={} {} ",
                                print_friendly ? "------------------------------------------------------------\n" : "",
@@ -314,6 +315,8 @@ class SimpleNode : public BtreeNode {
             fmt::format_to(std::back_inserter(str), "-{}]", cur_key);
         }
         return str;
+#endif
+        return {};
     }
 
     uint8_t* get_node_context() override { return uintptr_cast(this) + sizeof(SimpleNode< K, V >); }

diff --git a/src/include/homestore/btree/detail/varlen_node.hpp b/src/include/homestore/btree/detail/varlen_node.hpp
@@ -518,6 +518,7 @@ class VariableNode : public BtreeNode {
     }
 
     std::string to_string_keys(bool print_friendly = false) const override {
+#if 0
         std::string delimiter = print_friendly ? "\n" : "\t";
         auto str = fmt::format("{}{} nEntries={} {} ",
                                print_friendly ? "------------------------------------------------------------\n" : "",
@@ -570,6 +571,8 @@ class VariableNode : public BtreeNode {
             fmt::format_to(std::back_inserter(str), "-{}]", cur_key);
         }
         return str;
+#endif
+        return {};
     }
 
     uint8_t* get_node_context() override { return uintptr_cast(this) + sizeof(VariableNode< K, V >); }