Introduce New Blocked Leaf Page Format

conan.lock

@@ -1,25 +1,26 @@
 {
     "version": "0.5",
     "requires": [
-        "abseil/20250127.0",
-        "batteries/0.71.1",
+        "abseil/20260107.1",
+        "artc/0.2.1",
+        "batteries/0.72.0",
         "boost/1.88.0",
         "bzip2/1.0.8",
         "cli11/2.5.0",
         "gflags/2.2.2",
         "glog/0.7.1",
         "gtest/1.17.0",
         "keyvcr/0.2.2",
-        "libbacktrace/cci.20240730",
+        "libbacktrace/cci.20210118",
         "libfuse/3.16.2",
         "libpfm4/4.13.0",
         "libunwind/1.8.1",
         "liburing/2.11",
-        "llfs/0.47.1",
+        "llfs/0.47.2",
         "openssl/3.6.0",
         "pcg-cpp/cci.20220409",
         "protobuf/3.21.12",
-        "vqf/0.2.5",
+        "vqf/0.2.6",
         "xxhash/0.8.3",
         "yaml-cpp/0.9.0",
         "zlib/1.3.1"
@@ -49,10 +50,7 @@
         ],
         "boost/[>=1.84.0 <2]": [
             "boost/1.88.0"
-        ],
-        "batteries/[>=0.60.2 <2]": [
-            "batteries/0.70.2"
         ]
     },
     "config_requires": []
-}
+}

conanfile.py

@@ -16,7 +16,7 @@
 class TurtleKvRecipe(ConanFile):
     name = "turtle_kv"
 
-    python_requires = "cor_recipe_utils/0.19.1"
+    python_requires = "cor_recipe_utils/0.21.4.dev3+g0d8231b80"
     python_requires_extend = "cor_recipe_utils.ConanFileBase"
 
     settings = "os", "compiler", "build_type", "arch"
@@ -88,18 +88,19 @@ def requirements(self):
             "force": True,
         }
 
-        self.requires("abseil/20250127.0", **VISIBLE, **OVERRIDE)
-        self.requires("batteries/[>=0.71.1 <1]", **VISIBLE, **OVERRIDE)
-        self.requires("boost/1.88.0", **VISIBLE, **OVERRIDE)
-        self.requires("glog/0.7.1", **VISIBLE)
-        self.requires("llfs/[>=0.47.0 <1]", **VISIBLE)
-        self.requires("pcg-cpp/cci.20220409", **VISIBLE)
+        self.requires("abseil/[>=20260107.1]", **VISIBLE, **OVERRIDE)
+        self.requires("artc/[>=0.2.1 <1]")
+        self.requires("batteries/[>=0.72.0 <1]", **VISIBLE, **OVERRIDE)
+        self.requires("boost/[>=1.88.0 <2]", **VISIBLE, **OVERRIDE)
+        self.requires("glog/[>=0.7.1 <1]", **VISIBLE)
+        self.requires("llfs/[>=0.47.2 <1]", **VISIBLE)
+        self.requires("pcg-cpp/[>=cci.20220409]", **VISIBLE)
         self.requires("yaml-cpp/[>=0.9.0 <1]")
         self.requires("zlib/1.3.1", **OVERRIDE)
 
         # boost/1.88.0 and ninja/1.13.2 depend (exactly) on libbacktrace/cci.20210118
         #
-        self.requires("libbacktrace/[>=cci.20240730]", **OVERRIDE)
+        self.requires("libbacktrace/[>=cci.20210118]")
 
         if platform.system() == "Linux":
             if self.options.with_keyvcr:

cor.yml

@@ -1,3 +1,3 @@
 cor:
   cli:
-    version: 0.19.1
+    version: 0.21.4.dev3+g0d8231b80

src/CMakeLists.txt

@@ -34,6 +34,7 @@ endif ()
 target_link_libraries(
   turtle_kv
   PUBLIC
+  artc::artc
   abseil::abseil
   batteries::batteries
   boost::boost

src/turtle_kv/core/edit_view.hpp

@@ -1,3 +1,11 @@
+//=##=##=#==#=#==#===#+==#+==========+==+=+=+=+=+=++=+++=+++++=-++++=-+++++++++++
+//
+// Part of the TurtleKV Project, under Apache License v2.0.
+// See https://www.apache.org/licenses/LICENSE-2.0 for license information.
+// SPDX short identifier: Apache-2.0
+//
+//+++++++++++-+-+--+----- --- -- -  -  -   -
+
 #pragma once
 
 #include <turtle_kv/core/item_view.hpp>

src/turtle_kv/core/key_range.hpp

@@ -34,30 +34,17 @@ inline CInterval<KeyView> get_key_range(const Chunk<const T*>& chunk)
   };
 }
 
-inline CInterval<KeyView> get_key_range(const EditView& edit)
+template <HasKeyView T>
+inline CInterval<KeyView> get_key_range(const T& has_key_view)
 {
   return CInterval<KeyView>{
-      .lower_bound = get_key(edit),
-      .upper_bound = get_key(edit),
-  };
-}
-
-inline CInterval<KeyView> get_key_range(const ItemView& item)
-{
-  return CInterval<KeyView>{
-      .lower_bound = get_key(item),
-      .upper_bound = get_key(item),
-  };
-}
-
-inline CInterval<KeyView> get_key_range(const KeyView& key)
-{
-  return CInterval<KeyView>{
-      .lower_bound = key,
-      .upper_bound = key,
+      .lower_bound = get_key(has_key_view),
+      .upper_bound = get_key(has_key_view),
   };
 }
 
+//=#=#==#==#===============+=+=+=+=++=++++++++++++++-++-+--+-+----+---------------
+//
 struct ExtendedKeyRangeOrder : llfs::KeyRangeOrder {
   //+++++++++++-+-+--+----- --- -- -  -  -   -
 
@@ -89,4 +76,24 @@ struct ExtendedKeyRangeOrder : llfs::KeyRangeOrder {
   }
 };
 
+//=#=#==#==#===============+=+=+=+=++=++++++++++++++-++-+--+-+----+---------------
+//
+struct KeyLowerBoundOrder : KeyOrder {
+  template <typename L, typename R>
+  bool operator()(const L& l, const R& r) const
+  {
+    return KeyOrder::operator()(get_key_range(l).lower_bound, get_key_range(r).lower_bound);
+  }
+};
+
+//=#=#==#==#===============+=+=+=+=++=++++++++++++++-++-+--+-+----+---------------
+//
+struct KeyUpperBoundOrder : KeyOrder {
+  template <typename L, typename R>
+  bool operator()(const L& l, const R& r) const
+  {
+    return KeyOrder::operator()(get_key_range(l).upper_bound, get_key_range(r).upper_bound);
+  }
+};
+
 }  // namespace turtle_kv

src/turtle_kv/core/key_view.hpp

@@ -85,4 +85,13 @@ inline usize packed_key_data_size(const KeyView& key)
   return key.size();
 }
 
+template <typename T>
+concept HasKeyView = requires(const T& obj) {
+  { get_key(obj) } -> std::convertible_to<const KeyView&>;
+};
+
+static_assert(HasKeyView<KeyView>);
+static_assert(HasKeyView<const char*>);
+static_assert(HasKeyView<std::string>);
+
 }  // namespace turtle_kv