rebased

Author: tzaeschke

include/phtree/common/BUILD

@@ -5,7 +5,6 @@ cc_library(
     hdrs = [
         "b_plus_tree_base.h",
         "b_plus_tree_hash_map.h",
-        "b_plus_tree_hash_multimap.h",
         "b_plus_tree_map.h",
         "b_plus_tree_multimap.h",
         "base_types.h",

include/phtree/v16/node.h

@@ -20,7 +20,6 @@
 
 #include "entry.h"
 #include "phtree/common/b_plus_tree_hash_map.h"
-#include "phtree/common/b_plus_tree_hash_multimap.h"
 #include "phtree/common/b_plus_tree_multimap.h"
 #include "phtree/common/common.h"
 #include "phtree_v16.h"
@@ -69,12 +68,13 @@ template <dimension_t DIM, typename Entry>
 using EntryMap = typename std::conditional_t<
      DIM < 32, b_plus_tree_multimap<std::uint32_t, Entry>, b_plus_tree_multimap<std::uint64_t, Entry>>;
 #else
- using EntryMap = typename std::conditional<
-     DIM <= 3,
-     array_map<Entry, (hc_pos_t(1) << DIM)>,
-     typename std::
-         conditional<DIM <= 8, sparse_map<Entry>, b_plus_tree_map<Entry, (hc_pos_t(1) << DIM)>>::
-             type>::type;
+using EntryMap = typename std::conditional_t<
+    DIM <= 3,
+    array_map<Entry, (uint64_t(1) << DIM)>,
+    typename std::conditional_t<
+        DIM <= 8,
+        sparse_map<hc_pos_dim_t<DIM>, Entry>,
+        b_plus_tree_map<std::uint64_t, Entry, (uint64_t(1) << DIM)>>>;
 #endif
 
 template <dimension_t DIM, typename Entry>
@@ -103,19 +103,19 @@ using EntryIteratorC = decltype(EntryMap<DIM, Entry>().cbegin());
  */
 template <dimension_t DIM, typename T, typename SCALAR>
 class Node {
-#ifdef FLEX
-    static constexpr hc_pos_t MAX_SIZE = std::max(hc_pos_t(8), hc_pos_t(1) << DIM);
-#endif
     using KeyT = PhPoint<DIM, SCALAR>;
     using EntryT = Entry<DIM, T, SCALAR>;
     using hc_pos_t = hc_pos_64_t;
+#ifdef FLEX
+    static constexpr hc_pos_t MAX_SIZE = std::max(hc_pos_t(8), hc_pos_t(1) << DIM);
+#endif
 
   public:
     Node() : entries_{} {}
 
-    // Nodes should never be copied!
+    // Nodes should (almost) never be copied!
     Node(const Node&) = delete;
-    Node(Node&&) = delete;
+    Node(Node&&) = default;
     Node& operator=(const Node&) = delete;
     Node& operator=(Node&&) = delete;
 

test/common/BUILD

@@ -65,18 +65,18 @@ cc_test(
     ],
 )
 
-cc_test(
-    name = "b_plus_tree_hash_multi_map_test",
-    timeout = "long",
-    srcs = [
-        "b_plus_tree_hash_multimap_test.cc",
-    ],
-    linkstatic = True,
-    deps = [
-        "//:phtree",
-        "@gtest//:gtest_main",
-    ],
-)
+#cc_test(
+#    name = "b_plus_tree_hash_multi_map_test",
+#    timeout = "long",
+#    srcs = [
+#        "b_plus_tree_hash_multimap_test.cc",
+#    ],
+#    linkstatic = True,
+#    deps = [
+#        "//:phtree",
+#        "@gtest//:gtest_main",
+#    ],
+#)
 
 cc_test(
     name = "b_plus_tree_map_test",