small-cache 0.0.3__tar.gz → 0.0.5__tar.gz

{small_cache-0.0.3 → small_cache-0.0.5}/CMakeLists.txt

@@ -92,7 +92,7 @@ FetchContent_Declare(
 find_package(
         absl
         REQUIRED
-        COMPONENTS flat_hash_map flat_hash_set hash
+        COMPONENTS flat_hash_map hash
 )
 
 Set(FETCHCONTENT_QUIET FALSE)

{small_cache-0.0.3 → small_cache-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: small-cache
-Version: 0.0.3
+Version: 0.0.5
 Summary: Small cache
 Author: kam1k4dze
 Classifier: License :: OSI Approved :: BSD License

{small_cache-0.0.3 → small_cache-0.0.5}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["scikit-build-core >=0.10", "nanobind >=1.3.2"]
+requires = ["scikit-build-core >=0.10", "nanobind >=2.10.2"]
 build-backend = "scikit_build_core.build"
 
 [project]
 name = "small-cache"
-version = "0.0.3"
+version = "0.0.5"
 description = "Small cache"
 readme = "README.md"
 requires-python = ">=3.11"

{small_cache-0.0.3 → small_cache-0.0.5}/src/small_cache.cpp

@@ -2,13 +2,11 @@
 #include <nanobind/stl/variant.h>
 #include <nanobind/stl/string.h>
 #include <nanobind/stl/vector.h>
-#include <nanobind/stl/pair.h>
 #include <nanobind/stl/optional.h>
 #include <nanobind/stl/unordered_map.h>
 #include <tsl/sparse_map.h>
 #include <absl/hash/hash.h>
 #include <absl/container/flat_hash_map.h>
-#include <absl/container/flat_hash_set.h>
 #include <boost/flyweight.hpp>
 #include <optional>
 #include <algorithm>
@@ -66,7 +64,7 @@ public:
         if (attributes.empty()) {
             throw std::runtime_error("No attributes provided");
         }
-        if (attributes.size() > 255) {
+        if (attributes.size() > MarkedItem::maxAttributes) {
             throw std::runtime_error("Too many attributes provided");
         }
         attrMap.reserve(attributes.size());
@@ -85,6 +83,9 @@ public:
     struct MarkedItem {
         bool isNew = true;
         std::array<uint32_t, 3> attrs_flags{}; // 96 bits total
+        static constexpr std::size_t maxAttributes =
+                std::tuple_size_v<decltype(attrs_flags)> *
+                std::numeric_limits<std::remove_reference_t<decltype(attrs_flags)>::value_type>::digits;
         std::vector<AttributeValue> value;
 
         [[nodiscard]] std::vector<size_t> getIdxs() const {
@@ -293,7 +294,6 @@ public:
         }
         auto &marked_attrs = cache[item_id];
         setMarkedItem(marked_attrs, attributes);
-        increaseIteratorVersion();
     }
 
     std::vector<pyAttrValue> get_one(const str &id, const strVec &attributes) {
@@ -317,51 +317,19 @@ public:
         return {};
     }
 
-    struct getManyResponse {
-        uint64_t iterator_version{};
-        uint64_t iterator{};
-        std::vector<std::pair<str, std::vector<pyAttrValue>>> result{};
-    };
-
-    str get_many(const strVec &ids, const strVec &attributes, uint64_t per_iteration = 10000,
-                 uint64_t iterator_version = 0, uint64_t iterator = 0) {
-        if (transactionOpened)
-            throw std::runtime_error("Can't get many when transaction is opened");
-        if (iterator && iterator_version == 0) {
-            throw std::runtime_error("Invalid iterator version");
-        }
-        if (iterator && iterator_version != this->iterator_version)
-            throw std::runtime_error("Iterator already invalidated");
-        getManyResponse resp{};
-        std::vector<str> keys;
-        if (ids.empty()) {
-            keys = cache | std::views::keys | std::ranges::to<std::vector>();
-            std::ranges::sort(keys);
-        } else {
-            absl::flat_hash_set<str> set_of_ids(ids.begin(), ids.end());
-            keys = cache | std::views::keys |
-                   std::views::filter([&](const auto &key) { return set_of_ids.contains(key); }) |
-                   std::ranges::to<std::vector>();
-        }
-        std::ranges::sort(keys);
-
-        const uint64_t start = iterator;
-        const uint64_t available = keys.size() > start ? keys.size() - start : 0;
-        const uint64_t to_take = std::min<uint64_t>(available, per_iteration);
-
-        resp.result.reserve(to_take);
-
-        auto i = iterator;
-        while (i < iterator + per_iteration && i < keys.size()) {
-            const auto &key = keys[i];
-            resp.result.emplace_back(key, get_one(key, attributes));
-            i++;
+    std::vector<std::vector<pyAttrValue>> get_many(const strVec &ids, const strVec &attributes) {
+        std::vector<std::vector<pyAttrValue>> out;
+        out.resize(ids.size());
+        for (size_t i = 0; i < ids.size(); ++i) {
+            out[i] = get_one(ids[i], attributes);
         }
-        resp.iterator_version = this->iterator_version;
-        resp.iterator = i < keys.size() ? i : 0;
-        return glz::write_json(resp).value_or("error"); // TODO don't use json
+        return out;
     }
 
+    std::vector<str> get_all_ids() {
+        std::vector<str> keys = cache | std::views::keys | std::ranges::to<std::vector>();
+        return keys;
+    }
 
     void begin_transaction(uint64_t estimated_number_of_items = 0, bool remove_old_items = true) {
         if (transactionOpened) {
@@ -369,7 +337,6 @@ public:
         }
         if (estimated_number_of_items != 0) {
             cache.reserve(estimated_number_of_items);
-            increaseIteratorVersion();
         }
         oldCacheSize = cache.size();
         transactionOpened = true;
@@ -392,7 +359,6 @@ public:
                 }
             }
         }
-        increaseIteratorVersion();
         transactionOpened = false;
         transactionShouldRemoveOldItems = true;
     }
@@ -413,15 +379,9 @@ public:
 
             setMarkedItem(marked_item, attrs);
         }
-        increaseIteratorVersion();
         return resp.result.pagination.pages;
     }
 
-    void increaseIteratorVersion() {
-        iterator_version++;
-        iterator_version++;
-    }
-
     tsl::sparse_map<str, MarkedItem> cache;
     absl::flat_hash_map<str, uint8_t, absl::Hash<str>> attrMap;
     strVec attrIdx;
@@ -429,7 +389,6 @@ public:
     size_t oldCacheSize = 0;
     bool transactionOpened = false;
     bool transactionShouldRemoveOldItems = true;
-    uint64_t iterator_version = 1; // for get_all()
 };
 
 
@@ -443,9 +402,8 @@ NB_MODULE(_small_cache_impl, m) {
             .def("end_transaction", &SmallCache::end_transaction)
             .def("add", &SmallCache::add_item, nb::arg("item_id"), nb::arg("attributes"))
             .def("get_one", &SmallCache::get_one, nb::arg("id"), nb::arg("attributes"))
-            .def("get_many", &SmallCache::get_many, nb::arg("ids"), nb::arg("attributes"), nb::arg("per_iteration") = 10000,
-                 nb::arg("iterator_version") = 0,
-                 nb::arg("iterator") = 0)
+            .def("get_many", &SmallCache::get_many, nb::arg("ids"), nb::arg("attributes"))
+            .def("get_all_ids", &SmallCache::get_all_ids)
             .def("load_page", &SmallCache::load_page, nb::arg("json_text"));
     // nb::class_<SmallCache::getAllResponse>(cache, "getAllResponse")
     //         .def(nb::init<>())