diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 414775392..f8b844d80 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -21,5 +21,6 @@ cxx_test(simple_lru_counter_test dfly_core LABELS DFLY)
 cxx_test(string_set_test dfly_core LABELS DFLY)
 cxx_test(string_map_test dfly_core LABELS DFLY)
 cxx_test(sorted_map_test dfly_core LABELS DFLY)
+cxx_test(bptree_set_test dfly_core LABELS DFLY)
 
 add_subdirectory(search)
diff --git a/src/core/bptree_set.h b/src/core/bptree_set.h
new file mode 100644
index 000000000..e590ac658
--- /dev/null
+++ b/src/core/bptree_set.h
@@ -0,0 +1,284 @@
+// Copyright 2023, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
+//
+
+#pragma once
+
+#include "base/pmr/memory_resource.h"
+#include "core/detail/bptree_internal.h"
+
+namespace dfly {
+
+template <typename T> struct DefaultCompareTo {
+  int operator()(const T& a, const T& b) const {
+    std::less<T> cmp;
+    return cmp(a, b) ? -1 : (cmp(b, a) ? 1 : 0);
+  }
+};
+
+template <typename T> struct BPTreePolicy {
+  using KeyT = T;
+  using KeyCompareTo = DefaultCompareTo<T>;
+};
+
+template <typename T, typename Policy = BPTreePolicy<T>> class BPTree {
+  BPTree(const BPTree&) = delete;
+  BPTree& operator=(const BPTree&) = delete;
+
+  using BPTreeNode = detail::BPTreeNode<T>;
+  using BPTreePath = detail::BPTreePath<T>;
+
+ public:
+  using KeyT = typename Policy::KeyT;
+
+  BPTree(PMR_NS::memory_resource* mr = PMR_NS::get_default_resource()) : mr_(mr) {
+  }
+
+  ~BPTree() {
+    Clear();
+  }
+
+  // true if inserted, false if skipped.
+  bool Insert(KeyT item);
+
+  bool Contains(KeyT item) const;
+
+  size_t Height() const {
+    return height_;
+  }
+
+  size_t Size() const {
+    return count_;  // number of items in the tree
+  }
+
+  size_t NodeCount() const {
+    // number of nodes in the tree (usually, order of magnitude smaller than Size()).
+    return num_nodes_;
+  }
+
+  void Clear();
+
+  BPTreeNode* DEBUG_root() {
+    return root_;
+  }
+
+ private:
+  BPTreeNode* CreateNode(bool leaf);
+
+  void DestroyNode(BPTreeNode* node);
+
+  // Unloads the full leaf to allow insertion of additional item.
+  // The leaf should be the last one in the path.
+  std::pair<BPTreeNode*, KeyT> InsertFullLeaf(KeyT item, const BPTreePath& path);
+
+  // Charts the path towards key. Returns true if key is found.
+  // In that case path->Last().first->Key(path->Last().second) == key.
+  // Fills the tree path not including the key itself.
+  bool Locate(KeyT key, BPTreePath* path) const;
+
+  BPTreeNode* root_ = nullptr;  // root node or NULL if empty tree
+  uint32_t count_ = 0;          // number of items in tree
+  uint32_t height_ = 0;         // height of tree from root to leaf
+  uint32_t num_nodes_ = 0;      // number of nodes in tree
+  PMR_NS::memory_resource* mr_;
+};
+
+template <typename T, typename Policy> bool BPTree<T, Policy>::Contains(KeyT item) const {
+  BPTreePath path;
+  bool found = Locate(item, &path);
+  return found;
+}
+
+template <typename T, typename Policy> void BPTree<T, Policy>::Clear() {
+  if (!root_)
+    return;
+
+  BPTreePath path;
+  BPTreeNode* node = root_;
+
+  auto deep_left = [&](unsigned pos) {
+    do {
+      path.Push(node, pos);
+      node = node->Child(pos);
+      pos = 0;
+    } while (!node->IsLeaf());
+  };
+
+  if (!root_->IsLeaf())
+    deep_left(0);
+
+  while (true) {
+    DestroyNode(node);
+
+    if (path.Depth() == 0) {
+      break;
+    }
+    node = path.Last().first;
+    unsigned pos = path.Last().second;
+    path.Pop();
+    if (pos < node->NumItems()) {
+      deep_left(pos + 1);
+    }
+  }
+  root_ = nullptr;
+  height_ = count_ = 0;
+}
+
+template <typename T, typename Policy> bool BPTree<T, Policy>::Insert(KeyT item) {
+  if (!root_) {
+    root_ = CreateNode(true);
+    root_->InitSingle(item);
+    count_ = height_ = 1;
+
+    return true;
+  }
+
+  BPTreePath path;
+  bool found = Locate(item, &path);
+
+  if (found) {
+    return false;
+  }
+
+  assert(path.Depth() > 0u);
+
+  BPTreeNode* leaf = path.Last().first;
+  assert(leaf->IsLeaf());
+
+  if (leaf->NumItems() == detail::BPNodeLayout<T>::kMaxLeafKeys) {
+    unsigned root_free [[maybe_unused]] = root_->AvailableSlotCount();
+    std::pair<BPTreeNode*, KeyT> res = InsertFullLeaf(item, path);
+    if (res.first) {  // we propagated the new node all the way to the root.
+      assert(root_free == 0u);
+      BPTreeNode* new_root = CreateNode(false);
+      new_root->InitSingle(res.second);
+      new_root->SetChild(0, root_);
+      new_root->SetChild(1, res.first);
+      root_ = new_root;
+      height_++;
+    }
+  } else {
+    unsigned pos = path.Last().second;
+    leaf->LeafInsert(pos, item);
+  }
+  count_++;
+  return true;
+}
+
+template <typename T, typename Policy>
+bool BPTree<T, Policy>::Locate(KeyT key, BPTreePath* path) const {
+  assert(root_);
+  BPTreeNode* node = root_;
+  typename Policy::KeyCompareTo cmp;
+  while (true) {
+    typename BPTreeNode::SearchResult res = node->BSearch(key, cmp);
+    path->Push(node, res.index);
+    if (res.found) {
+      return true;
+    }
+    assert(res.index <= node->NumItems());
+
+    if (node->IsLeaf()) {
+      break;
+    }
+    node = node->Child(res.index);
+  }
+  return false;
+}
+
+template <typename T, typename Policy>
+auto BPTree<T, Policy>::InsertFullLeaf(KeyT item, const BPTreePath& path)
+    -> std::pair<BPTreeNode*, KeyT> {
+  using Layout = detail::BPNodeLayout<T>;
+  assert(path.Depth() > 0u);
+
+  BPTreeNode* node = path.Last().first;
+  assert(node->IsLeaf() && node->AvailableSlotCount() == 0);
+
+  unsigned insert_pos = path.Last().second;
+  unsigned level = path.Depth() - 1;
+  if (level > 0) {
+    BPTreeNode* parent = path.Node(level - 1);
+    unsigned pos = path.Position(level - 1);
+    assert(parent->Child(pos) == node);
+
+    std::pair<BPTreeNode*, unsigned> rebalance_res = parent->RebalanceChild(pos, insert_pos);
+    if (rebalance_res.first) {
+      rebalance_res.first->LeafInsert(rebalance_res.second, item);
+      return {nullptr, 0};
+    }
+  }
+
+  KeyT median;
+  BPTreeNode* right = CreateNode(node->IsLeaf());
+  node->Split(right, &median);
+
+  assert(node->NumItems() < Layout::kMaxLeafKeys);
+
+  if (insert_pos <= node->NumItems()) {
+    assert(item < median);
+    node->LeafInsert(insert_pos, item);
+  } else {
+    assert(item > median);
+    right->LeafInsert(insert_pos - node->NumItems() - 1, item);
+  }
+
+  // we now must add right to the paren if it exists.
+  while (level-- > 0) {
+    node = path.Node(level);            // level up, now node is parent.
+    insert_pos = path.Position(level);  // insert_pos is position of node in parent.
+
+    assert(!node->IsLeaf() && insert_pos <= node->NumItems());
+
+    if (node->NumItems() == Layout::kMaxInnerKeys) {
+      if (level > 0) {
+        BPTreeNode* parent = path.Node(level - 1);
+        unsigned node_pos = path.Position(level - 1);
+        assert(parent->Child(node_pos) == node);
+        std::pair<BPTreeNode*, unsigned> rebalance_res =
+            parent->RebalanceChild(node_pos, insert_pos);
+        if (rebalance_res.first) {
+          rebalance_res.first->InnerInsert(rebalance_res.second, median, right);
+          return {nullptr, 0};
+        }
+      }
+
+      KeyT parent_median;
+      BPTreeNode* parent_right = CreateNode(false);
+      node->Split(parent_right, &parent_median);
+      assert(node->NumItems() < Layout::kMaxInnerKeys);
+
+      if (insert_pos <= node->NumItems()) {
+        assert(median < parent_median);
+        node->InnerInsert(insert_pos, median, right);
+      } else {
+        assert(median > parent_median);
+        parent_right->InnerInsert(insert_pos - node->NumItems() - 1, median, right);
+      }
+      right = parent_right;
+      median = parent_median;
+    } else {
+      node->InnerInsert(insert_pos, median, right);
+      return {nullptr, 0};
+    }
+  }
+
+  return {right, median};
+}
+
+template <typename T, typename Policy>
+detail::BPTreeNode<T>* BPTree<T, Policy>::CreateNode(bool leaf) {
+  num_nodes_++;
+  void* ptr = mr_->allocate(detail::kBPNodeSize, 8);
+  BPTreeNode* node = new (ptr) BPTreeNode(leaf);
+
+  return node;
+}
+
+template <typename T, typename Policy> void BPTree<T, Policy>::DestroyNode(BPTreeNode* node) {
+  void* ptr = node;
+  mr_->deallocate(ptr, detail::kBPNodeSize, 8);
+  num_nodes_--;
+}
+
+}  // namespace dfly
diff --git a/src/core/bptree_set_test.cc b/src/core/bptree_set_test.cc
new file mode 100644
index 000000000..29b2ad939
--- /dev/null
+++ b/src/core/bptree_set_test.cc
@@ -0,0 +1,115 @@
+// Copyright 2023, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
+//
+#include "core/bptree_set.h"
+
+#include <mimalloc.h>
+
+#include <random>
+
+#include "base/gtest.h"
+#include "base/logging.h"
+#include "core/mi_memory_resource.h"
+
+using namespace std;
+
+namespace dfly {
+
+class BPTreeSetTest : public ::testing::Test {
+  using Node = detail::BPTreeNode<uint64_t>;
+
+ protected:
+  BPTreeSetTest() : mi_alloc_(mi_heap_get_backing()), bPtree_(&mi_alloc_) {
+  }
+  static void SetUpTestSuite() {
+  }
+
+  bool Validate();
+
+  static bool Validate(Node* node, uint64_t ubound);
+
+  MiMemoryResource mi_alloc_;
+  BPTree<uint64_t> bPtree_;
+};
+
+bool BPTreeSetTest::Validate(Node* node, uint64_t ubound) {
+  if (node->NumItems() <= 1)
+    return false;
+
+  for (unsigned i = 1; i < node->NumItems(); ++i) {
+    if (node->Key(i - 1) >= node->Key(i))
+      return false;
+  }
+
+  return node->Key(node->NumItems() - 1) < ubound;
+}
+
+bool BPTreeSetTest::Validate() {
+  auto* root = bPtree_.DEBUG_root();
+  if (!root)
+    return true;
+
+  std::vector<pair<Node*, uint64_t>> stack;
+
+  stack.emplace_back(root, UINT64_MAX);
+
+  while (!stack.empty()) {
+    Node* node = stack.back().first;
+    uint64_t ubound = stack.back().second;
+    stack.pop_back();
+
+    if (!Validate(node, ubound))
+      return false;
+
+    if (!node->IsLeaf()) {
+      for (unsigned i = 0; i < node->NumItems(); ++i) {
+        stack.emplace_back(node->Child(i), node->Key(i));
+      }
+      stack.emplace_back(node->Child(node->NumItems()), ubound);
+    }
+  }
+  return true;
+}
+
+TEST_F(BPTreeSetTest, BPtreeInsert) {
+  mt19937 generator(1);
+
+  for (unsigned i = 1; i < 7000; ++i) {
+    bPtree_.Insert(i);
+  }
+  ASSERT_TRUE(Validate());
+
+  ASSERT_GT(mi_alloc_.used(), 56000u);
+  ASSERT_LT(mi_alloc_.used(), 66000u);
+
+  for (unsigned i = 1; i < 7000; ++i) {
+    ASSERT_TRUE(bPtree_.Contains(i));
+  }
+
+  bPtree_.Clear();
+  ASSERT_EQ(mi_alloc_.used(), 0u);
+
+  uniform_int_distribution<uint64_t> dist(0, 100000);
+  for (unsigned i = 0; i < 20000; ++i) {
+    bPtree_.Insert(dist(generator));
+  }
+  LOG(INFO) << bPtree_.Height() << " " << bPtree_.Size();
+
+  ASSERT_TRUE(Validate());
+  ASSERT_GT(mi_alloc_.used(), 10000u);
+  bPtree_.Clear();
+  ASSERT_EQ(mi_alloc_.used(), 0u);
+
+  for (unsigned i = 20000; i > 1; --i) {
+    bPtree_.Insert(i);
+  }
+  ASSERT_TRUE(Validate());
+
+  LOG(INFO) << bPtree_.Height() << " " << bPtree_.Size();
+  ASSERT_GT(mi_alloc_.used(), 20000 * 8);
+  ASSERT_LT(mi_alloc_.used(), 20000 * 10);
+  bPtree_.Clear();
+  ASSERT_EQ(mi_alloc_.used(), 0u);
+}
+
+}  // namespace dfly
diff --git a/src/core/detail/bptree_internal.h b/src/core/detail/bptree_internal.h
new file mode 100644
index 000000000..9c5c2bc89
--- /dev/null
+++ b/src/core/detail/bptree_internal.h
@@ -0,0 +1,477 @@
+// Copyright 2023, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
+//
+
+#pragma once
+
+#include <array>
+#include <cassert>
+#include <cstring>
+
+namespace dfly {
+
+template <typename T, typename Policy> class BPTree;
+
+namespace detail {
+
+// Internal classes related to B+tree implementation. The design is largely based on the
+// implementation of absl::bPtree_map/set.
+// The motivation for replacing zskiplist - significant size reduction:
+//   we reduce the metadata overhead per record from 45 bytes in zskiplist to just a
+//   few bytes with b-tree. The trick is using significantly large nodes (256 bytes) so that
+//   their overhead is negligible compared to the items they store.
+//   Why not use absl::bPtree_set? We must support Rank tree functionality that
+//   absl does not supply.
+//   Hacking into absl is not a simple task, implementing our own tree is easier.
+// Below some design decisions:
+// 1. We use predefined node size of 256 bytes and derive number of items in each node from it.
+//    Inner nodes have less items than leaf nodes because they also need to store child pointers.
+// 2. BPTreeNode does not predeclare fields besides the 8 bytes metadata - everything else is
+//    calculated at run-time and has dedicated accessors (similarly to absl). This allows
+//    dense and efficient representation of tree nodes.
+// 3. We assume that we store small items (8, 16 bytes) which will have a large branching
+//    factor (248/16), meaning the tree will stay shallow even for sizes reaching billion nodes.
+// 4. We do not store parent pointer like in absl tree. Instead we use BPTreePath to store
+//    hierarchy of parent nodes. That should reduce our overhead even further by few bits per item.
+// 5. We assume we store trivially copyable types - this reduces the
+//    complexity of the generics in the code.
+// 6. We support pmr memory resource. This allows us to use pluggable heaps.
+//
+// TODO: (all the ideas taken from absl implementation)
+//       1. to introduce slices when removing items from the tree (avoid shifts).
+//       2. to avoid merging/rebalancing when removing max/min items from the tree.
+//       3. Small tree optimization: when the tree is small with a single root node, we can
+//          allocate less then 256 bytes (special case) to avoid relative blowups in memory for
+//          small trees.
+
+constexpr uint16_t kBPNodeSize = 256;
+
+template <typename T> class BPNodeLayout {
+  static_assert(std::is_trivially_copyable<T>::value, "KeyT must be triviall copyable");
+
+  static constexpr uint16_t kKeyOffset = sizeof(uint64_t);  // 8 bytes for metadata
+
+ public:
+  static constexpr uint16_t kKeySize = sizeof(T);
+  static constexpr uint16_t kMaxLeafKeys = (kBPNodeSize - kKeyOffset) / kKeySize;
+  static constexpr uint16_t kMinLeafKeys = kMaxLeafKeys / 2;
+
+  // internal node:
+  // x slots, (x+1) children: x * kKeySize + (x+1) * sizeof(BPTreeNode*) = x * (kKeySize + 8) + 8
+  // x = (kBPNodeSize - 8 - kKeyOffset) / (kKeySize + 8)
+  static constexpr uint16_t kMaxInnerKeys =
+      (kBPNodeSize - sizeof(void*) - kKeyOffset) / (kKeySize + sizeof(void*));
+  static constexpr uint16_t kMinInnerKeys = kMaxInnerKeys / 2;
+
+  using KeyT = T;
+
+  // The class is constructed inside a block of memory of size kBPNodeSize.
+  // Only BPTree can create it, hence it can access the memory outside its fields.
+  static uint8_t* KeyPtr(unsigned index, void* node) {
+    return reinterpret_cast<uint8_t*>(node) + kKeyOffset + kKeySize * index;
+  }
+
+  static const uint8_t* KeyPtr(unsigned index, const void* node) {
+    return reinterpret_cast<const uint8_t*>(node) + kKeyOffset + kKeySize * index;
+  }
+
+  static uint8_t* InnerKeysEnd(void* node) {
+    return reinterpret_cast<uint8_t*>(node) + kKeyOffset + kKeySize * kMaxInnerKeys;
+  }
+
+  static_assert(kMaxLeafKeys < 128);
+};
+
+template <typename T> class BPTreeNode {
+  template <typename K, typename Policy> friend class ::dfly::BPTree;
+
+  BPTreeNode(const BPTreeNode&) = delete;
+  BPTreeNode& operator=(const BPTreeNode&) = delete;
+
+  BPTreeNode(bool leaf) : num_items_(0), leaf_(leaf) {
+  }
+
+  using Layout = BPNodeLayout<T>;
+
+ public:
+  using KeyT = T;
+
+  void InitSingle(T key) {
+    SetKey(0, key);
+    num_items_ = 1;
+  }
+
+  KeyT Key(unsigned index) const {
+    KeyT res;
+    memcpy(&res, Layout::KeyPtr(index, this), sizeof(KeyT));
+    return res;
+  }
+
+  void SetKey(size_t index, KeyT item) {
+    uint8_t* slot = Layout::KeyPtr(index, this);
+    memcpy(slot, &item, sizeof(KeyT));
+  }
+
+  BPTreeNode** Children() {
+    uint8_t* ptr = Layout::InnerKeysEnd(this);
+    return reinterpret_cast<BPTreeNode**>(ptr);
+  }
+
+  BPTreeNode* Child(unsigned i) {
+    return Children()[i];
+  }
+
+  void SetChild(unsigned i, BPTreeNode* child) {
+    Children()[i] = child;
+  }
+
+  struct SearchResult {
+    uint16_t index;
+    bool found;
+  };
+
+  // Searches for key in the node using binary search.
+  // Returns SearchResult with index of the key if found.
+  template <typename Comp> SearchResult BSearch(KeyT key, Comp&& comp) const;
+
+  void Split(BPTreeNode* right, KeyT* median);
+
+  bool IsLeaf() const {
+    return leaf_;
+  }
+
+  unsigned NumItems() const {
+    return num_items_;
+  }
+
+  unsigned AvailableSlotCount() const {
+    return MaxItems() - num_items_;
+  }
+
+  unsigned MaxItems() const {
+    return IsLeaf() ? Layout::kMaxLeafKeys : Layout::kMaxInnerKeys;
+  }
+
+  unsigned MinItems() const {
+    return IsLeaf() ? Layout::kMinLeafKeys : Layout::kMinInnerKeys;
+  }
+
+  void ShiftRight(unsigned index);
+
+  // Rebalance a full child at position pos, at which we tried to insert at insert_pos.
+  // Returns the node and the position to insert into if rebalancing succeeded.
+  // Returns nullptr if rebalancing did not succeed.
+  std::pair<BPTreeNode*, unsigned> RebalanceChild(unsigned pos, unsigned insert_pos);
+
+  // Inserts item into a leaf node.
+  // Assumes: the node is IsLeaf() and has some space.
+  void LeafInsert(unsigned index, KeyT item) {
+    assert(IsLeaf() && NumItems() < MaxItems());
+    InsertItem(index, item);
+  }
+
+  void InnerInsert(unsigned index, KeyT item, BPTreeNode* child) {
+    InsertItem(index, item);
+    SetChild(index + 1, child);
+  }
+
+  // Tries to merge the child at position pos with its sibling.
+  // If we did not succeed to merge, we try to rebalance.
+  // Returns retired BPTreeNode* if children got merged and this parent node's children
+  // count decreased, otherwise, we return nullptr (rebalanced).
+  BPTreeNode* MergeOrRebalanceChild(unsigned pos);
+
+  void Validate(KeyT upper_bound) const;
+
+ private:
+  void RebalanceChildToLeft(unsigned child_pos, unsigned count);
+  void RebalanceChildToRight(unsigned child_pos, unsigned count);
+
+  void MergeFromRight(KeyT key, BPTreeNode* right);
+
+  void InsertItem(unsigned index, KeyT item) {
+    assert(index <= num_items_);
+    assert(index == 0 || Key(index - 1) < item);
+    assert(index == num_items_ || Key(index) > item);
+
+    ShiftRight(index);
+    SetKey(index, item);
+  }
+
+  struct {
+    uint64_t num_items_ : 7;
+    uint64_t leaf_ : 1;
+    uint64_t : 56;
+  };
+};
+
+// Contains parent/index pairs. Meaning that node0->Child(index0) == node1.
+template <typename T> class BPTreePath {
+  static constexpr unsigned kMaxDepth = 16;
+
+ public:
+  void Push(BPTreeNode<T>* node, unsigned pos) {
+    assert(depth_ < kMaxDepth);
+    record_[depth_].node = node;
+    record_[depth_].pos = pos;
+    depth_++;
+  }
+
+  unsigned Depth() const {
+    return depth_;
+  }
+
+  std::pair<BPTreeNode<T>*, unsigned> Last() const {
+    assert(depth_ > 0u);
+    return {record_[depth_ - 1].node, record_[depth_ - 1].pos};
+  }
+
+  BPTreeNode<T>* Node(unsigned i) const {
+    assert(i < depth_);
+    return record_[i].node;
+  }
+
+  unsigned Position(unsigned i) const {
+    assert(i < depth_);
+    return record_[i].pos;
+  }
+
+  void Pop() {
+    assert(depth_ > 0u);
+    depth_--;
+  }
+
+ private:
+  struct Record {
+    BPTreeNode<T>* node;
+    unsigned pos;
+  };
+
+  std::array<Record, kMaxDepth> record_;
+  unsigned depth_ = 0;
+};
+
+// Returns the position of the first item whose key is greater or equal than key.
+// if all items are smaller than key, returns num_items_.
+template <typename T>
+template <typename Comp>
+auto BPTreeNode<T>::BSearch(KeyT key, Comp&& cmp_op) const -> SearchResult {
+  uint16_t lo = 0;
+  uint16_t hi = num_items_;
+  while (lo < hi) {
+    uint16_t mid = (lo + hi) >> 1;
+    assert(mid < hi);
+
+    KeyT item = Key(mid);
+
+    int cmp_res = cmp_op(key, item);
+    if (cmp_res == 0) {
+      return SearchResult{.index = mid, .found = true};
+    }
+
+    if (cmp_res < 0) {
+      hi = mid;
+    } else {
+      lo = mid + 1;  // we never return indices upto mid because they are strictly less than key.
+    }
+  }
+  assert(lo == hi);
+
+  return {.index = hi, .found = 0};
+}
+
+template <typename T> void BPTreeNode<T>::ShiftRight(unsigned index) {
+  unsigned num_items_to_shift = num_items_ - index;
+  if (num_items_to_shift > 0) {
+    uint8_t* ptr = Layout::KeyPtr(index, this);
+    memmove(ptr + Layout::kKeySize, ptr, num_items_to_shift * Layout::kKeySize);
+
+    BPTreeNode** children = Children();
+    if (!IsLeaf()) {
+      memmove(children + index + 1, children + index,
+              (num_items_to_shift + 1) * sizeof(BPTreeNode*));
+    }
+  }
+  num_items_++;
+}
+
+/***
+ *  Rebalances the (full) child at position pos with its sibling. `this` node is an inner node.
+ *  It first tried to rebalance (move items) from the full child to its left sibling. If the left
+ *  sibling does not have enough space, it tries to rebalance to the right sibling. The caller
+ *  passes the original position of the item it tried to insert into the full child. In case the
+ *  rebalance succeeds the function returns the new node and the position to insert into. Otherwise,
+ *  it returns result.first == nullptr.
+ */
+template <typename T>
+std::pair<BPTreeNode<T>*, unsigned> BPTreeNode<T>::RebalanceChild(unsigned pos,
+                                                                  unsigned insert_pos) {
+  unsigned to_move = 0;
+  BPTreeNode* node = Child(pos);
+
+  if (pos > 0) {
+    BPTreeNode* left = Child(pos - 1);
+    unsigned dest_free = left->AvailableSlotCount();
+    if (dest_free > 0) {
+      // We bias rebalancing based on the position being inserted. If we're
+      // inserting at the end of the right node then we bias rebalancing to
+      // fill up the left node.
+      if (insert_pos == node->NumItems()) {
+        to_move = dest_free;
+        assert(to_move < node->NumItems());
+      } else if (dest_free > 1) {
+        // we move less than left free capacity which leaves as some space in the node.
+        to_move = dest_free / 2;
+      }
+
+      if (to_move) {
+        unsigned dest_old_count = left->NumItems();
+        RebalanceChildToLeft(pos, to_move);
+        assert(node->AvailableSlotCount() == to_move);
+        if (insert_pos < to_move) {
+          assert(left->AvailableSlotCount() > 0u);       // we did not fill up the left node.
+          insert_pos = dest_old_count + insert_pos + 1;  // +1 because we moved the separator.
+          node = left;
+        } else {
+          insert_pos -= to_move;
+        }
+
+        return {node, insert_pos};
+      }
+    }
+  }
+
+  if (pos < NumItems()) {
+    BPTreeNode* right = Child(pos + 1);
+    unsigned dest_free = right->AvailableSlotCount();
+    if (dest_free > 0) {
+      if (insert_pos == 0) {
+        to_move = dest_free;
+        assert(to_move < node->NumItems());
+      } else if (dest_free > 1) {
+        to_move = dest_free / 2;
+      }
+
+      if (to_move) {
+        RebalanceChildToRight(pos, to_move);
+        if (insert_pos > node->NumItems()) {
+          insert_pos -= (node->NumItems() + 1);
+          node = right;
+        }
+        return {node, insert_pos};
+      }
+    }
+  }
+  return {nullptr, 0};
+}
+
+template <typename T> void BPTreeNode<T>::RebalanceChildToLeft(unsigned child_pos, unsigned count) {
+  assert(child_pos > 0u);
+  BPTreeNode* src = Child(child_pos);
+  BPTreeNode* dest = Child(child_pos - 1);
+  assert(src->NumItems() >= count);
+  assert(count >= 1u);
+  assert(dest->AvailableSlotCount() >= count);
+
+  unsigned dest_items = dest->NumItems();
+
+  // Move the delimiting value to the left node.
+  dest->SetKey(dest_items, Key(child_pos - 1));
+
+  // Copy src keys [0, count-1] to dest keys [dest_items+1, dest_items+count].
+  for (unsigned i = 1; i < count; ++i) {
+    dest->SetKey(dest_items + i, src->Key(i - 1));
+  }
+
+  SetKey(child_pos - 1, src->Key(count - 1));
+
+  // Shift the values in the right node to their correct position.
+  for (unsigned i = count; i < src->NumItems(); ++i) {
+    src->SetKey(i - count, src->Key(i));
+  }
+
+  if (!src->IsLeaf()) {
+    // Move the child pointers from the right to the left node.
+    for (unsigned i = 0; i < count; ++i) {
+      dest->SetChild(1 + dest->NumItems() + i, src->Child(i));
+    }
+    for (unsigned i = count; i <= src->NumItems(); ++i) {
+      src->SetChild(i - count, src->Child(i));
+      src->SetChild(i, NULL);
+    }
+  }
+
+  // Fixup the counts on the src and dest nodes.
+  dest->num_items_ += count;
+  src->num_items_ -= count;
+}
+
+template <typename T>
+void BPTreeNode<T>::RebalanceChildToRight(unsigned child_pos, unsigned count) {
+  assert(child_pos < NumItems());
+  BPTreeNode* src = Child(child_pos);
+  BPTreeNode* dest = Child(child_pos + 1);
+
+  assert(src->NumItems() >= count);
+  assert(count >= 1u);
+  assert(dest->AvailableSlotCount() >= count);
+
+  unsigned dest_items = dest->NumItems();
+
+  assert(dest_items > 0u);
+
+  // Shift the values in the right node to their correct position.
+  for (int i = dest_items - 1; i >= 0; --i) {
+    dest->SetKey(i + count, dest->Key(i));
+  }
+
+  // Move the delimiting value to the left node and the new delimiting value
+  // from the right node.
+  KeyT new_delim = src->Key(src->NumItems() - count);
+  for (unsigned i = 1; i < count; ++i) {
+    unsigned src_id = src->NumItems() - count + i;
+    dest->SetKey(i - 1, src->Key(src_id));
+  }
+  // Move parent's delimiter to destination and update it with new delimiter.
+  dest->SetKey(count - 1, Key(child_pos));
+  SetKey(child_pos, new_delim);
+
+  if (!src->IsLeaf()) {
+    // Shift child pointers in the right node to their correct position.
+    for (int i = dest_items; i >= 0; --i) {
+      dest->SetChild(i + count, dest->Child(i));
+    }
+
+    // Move child pointers from the left node to the right.
+    for (unsigned i = 0; i < count; ++i) {
+      unsigned src_id = src->NumItems() - (count - 1) + i;
+      dest->SetChild(i, src->Child(src_id));
+      src->SetChild(src_id, NULL);
+    }
+  }
+
+  // Fixup the counts on the src and dest nodes.
+  dest->num_items_ += count;
+  src->num_items_ -= count;
+}
+
+// splits the node into two nodes. The left node is the current node and the right node is
+// is filled with the right half of the items. The median key is returned in *median.
+template <typename T> void BPTreeNode<T>::Split(BPTreeNode<T>* right, T* median) {
+  unsigned mid = num_items_ / 2;
+  *median = Key(mid);
+  right->leaf_ = leaf_;
+  right->num_items_ = num_items_ - (mid + 1);
+  memmove(Layout::KeyPtr(0, right), Layout::KeyPtr(mid + 1, this),
+          right->num_items_ * Layout::kKeySize);
+  if (!IsLeaf()) {
+    BPTreeNode** rchild = right->Children();
+    for (size_t i = 0; i <= right->num_items_; i++) {
+      rchild[i] = Child(mid + 1 + i);
+    }
+  }
+  num_items_ = mid;
+}
+
+}  // namespace detail
+}  // namespace dfly
diff --git a/src/server/transaction.cc b/src/server/transaction.cc
index 1b75cd95d..928655c0e 100644
--- a/src/server/transaction.cc
+++ b/src/server/transaction.cc
@@ -26,7 +26,7 @@ namespace {
 
 atomic_uint64_t op_seq{1};
 
-[[maybe_unused]] constexpr size_t kTransSize = sizeof(Transaction);
+constexpr size_t kTransSize [[maybe_unused]] = sizeof(Transaction);
 
 }  // namespace