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

{small_cache-0.0.2 → small_cache-0.0.3}/.github/workflows/pip.yml

@@ -14,7 +14,7 @@ jobs:
         python-version: ["3.11", "3.12"]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - uses: actions/setup-python@v6
       with:

{small_cache-0.0.2 → small_cache-0.0.3}/.github/workflows/wheels.yml

@@ -11,7 +11,7 @@ jobs:
     name: Build SDist
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         submodules: true
 
@@ -36,11 +36,11 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         submodules: true
 
-    - uses: pypa/cibuildwheel@v3.2
+    - uses: pypa/cibuildwheel@v3.3
 
     - name: Verify clean directory
       run: git diff --exit-code

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

@@ -66,7 +66,7 @@ include(FetchContent)
 FetchContent_Declare(
         glaze
         GIT_REPOSITORY https://github.com/stephenberry/glaze.git
-        GIT_TAG main
+        GIT_TAG v6.1.0
         GIT_SHALLOW TRUE
 )
 
@@ -75,7 +75,7 @@ FetchContent_MakeAvailable(glaze)
 FetchContent_Declare(
         tsl_sparse_map
         GIT_REPOSITORY https://github.com/Tessil/sparse-map
-        GIT_TAG master
+        GIT_TAG v0.7.0
         GIT_SHALLOW TRUE
 )
 FetchContent_MakeAvailable(tsl_sparse_map)
@@ -83,7 +83,7 @@ FetchContent_MakeAvailable(tsl_sparse_map)
 FetchContent_Declare(
         absl
         GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
-        GIT_TAG master
+        GIT_TAG 20250814.1
         GIT_SHALLOW TRUE
         OVERRIDE_FIND_PACKAGE TRUE
         EXCLUDE_FROM_ALL
@@ -92,14 +92,14 @@ FetchContent_Declare(
 find_package(
         absl
         REQUIRED
-        COMPONENTS flat_hash_map hash
+        COMPONENTS flat_hash_map flat_hash_set hash
 )
 
 Set(FETCHCONTENT_QUIET FALSE)
 FetchContent_Declare(
         Boost
         URL https://github.com/boostorg/boost/releases/download/boost-1.88.0/boost-1.88.0-cmake.7z
-        GIT_TAG "boost-1.88.0"
+        GIT_TAG "boost-1.89.0"
         USES_TERMINAL_DOWNLOAD TRUE
         GIT_PROGRESS TRUE
         DOWNLOAD_NO_EXTRACT FALSE

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

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

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

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "small-cache"
-version = "0.0.2"
+version = "0.0.3"
 description = "Small cache"
 readme = "README.md"
 requires-python = ">=3.11"

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

@@ -8,6 +8,7 @@
 #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>
@@ -295,7 +296,7 @@ public:
         increaseIteratorVersion();
     }
 
-    std::vector<pyAttrValue> get(const str &id, const strVec &attributes) {
+    std::vector<pyAttrValue> get_one(const str &id, const strVec &attributes) {
         if (attributes.empty()) {
             return {};
         }
@@ -316,36 +317,44 @@ public:
         return {};
     }
 
-
-    struct getAllResponse {
+    struct getManyResponse {
         uint64_t iterator_version{};
         uint64_t iterator{};
         std::vector<std::pair<str, std::vector<pyAttrValue>>> result{};
     };
 
-    str get_all(const strVec &attributes, uint64_t per_iteration = 10000, uint64_t iterator_version = 0,
-                uint64_t iterator = 0) {
+    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 all when transaction is opened");
+            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");
-        getAllResponse resp{};
-        std::vector<str> keys = cache | std::views::keys | std::ranges::to<std::vector>();
+        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);
 
-        uint64_t start = iterator;
-        uint64_t available = keys.size() > start ? keys.size() - start : 0;
-        uint64_t to_take = std::min<uint64_t>(available, per_iteration);
+        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(key, attributes));
+            resp.result.emplace_back(key, get_one(key, attributes));
             i++;
         }
         resp.iterator_version = this->iterator_version;
@@ -378,8 +387,7 @@ public:
             } else {
                 if (transactionShouldRemoveOldItems) {
                     it = cache.erase(it);
-                }
-                else {
+                } else {
                     ++it;
                 }
             }
@@ -434,8 +442,8 @@ NB_MODULE(_small_cache_impl, m) {
                  nb::arg("remove_old_items") = true)
             .def("end_transaction", &SmallCache::end_transaction)
             .def("add", &SmallCache::add_item, nb::arg("item_id"), nb::arg("attributes"))
-            .def("get", &SmallCache::get, nb::arg("id"), nb::arg("attributes"))
-            .def("get_all", &SmallCache::get_all, nb::arg("attributes"), nb::arg("per_iteration") = 10000,
+            .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("load_page", &SmallCache::load_page, nb::arg("json_text"));