Update contrib/libs/croaring to 4.3.6

commit_hash:02704b8cc0507ba555a101b7c53c23f38b7c4e7d

10 files changed, 30 insertions, 18 deletions

diff --git a/contrib/libs/croaring/.yandex_meta/__init__.py b/contrib/libs/croaring/.yandex_meta/__init__.py
index 49b42ccf6f6..0b7d5583fb3 100644
--- a/contrib/libs/croaring/.yandex_meta/__init__.py
+++ b/contrib/libs/croaring/.yandex_meta/__init__.py
@@ -6,7 +6,7 @@ croaring = CMakeNinjaNixProject(
     arcdir="contrib/libs/croaring",
     nixattr="croaring",
     copy_sources=[
-        "cpp/*.hh",
+        "cpp/roaring/*.hh",
     ],
     disable_includes=[
         "sys/byteorder.h",
@@ -14,5 +14,5 @@ croaring = CMakeNinjaNixProject(
     addincl_global={
         ".": ["./include"],
     },
-    inclink={"include/roaring": ["cpp/*.hh"]},
+    inclink={"include/roaring": ["cpp/roaring/*.hh"]},
 )
diff --git a/contrib/libs/croaring/.yandex_meta/override.nix b/contrib/libs/croaring/.yandex_meta/override.nix
index 61730a52030..35c4a263e51 100644
--- a/contrib/libs/croaring/.yandex_meta/override.nix
+++ b/contrib/libs/croaring/.yandex_meta/override.nix
@@ -1,12 +1,12 @@
 pkgs: attrs: with pkgs; with attrs; rec {
   pname = "croaring";
-  version = "4.3.5";
+  version = "4.3.6";
 
   src = fetchFromGitHub {
     owner = "RoaringBitmap";
     repo = "CRoaring";
     rev = "v${version}";
-    hash = "sha256-MNBlKAosKZ4wV3vbas77rfGOjTlWxTyluQYaFhES3Ro=";
+    hash = "sha256-8kXrPsjNkhx8pvA9A1ZzESoj5GdMSf4INjazU9jT3Ek=";
   };
 
   patches = [];
diff --git a/contrib/libs/croaring/README.md b/contrib/libs/croaring/README.md
index fce176e1f04..60723f48a55 100644
--- a/contrib/libs/croaring/README.md
+++ b/contrib/libs/croaring/README.md
@@ -281,8 +281,8 @@ The C interface is found in the files
 
 We also have a C++ interface:
 
-- [roaring.hh](https://github.com/RoaringBitmap/CRoaring/blob/master/cpp/roaring.hh),
-- [roaring64map.hh](https://github.com/RoaringBitmap/CRoaring/blob/master/cpp/roaring64map.hh).
+- [roaring.hh](https://github.com/RoaringBitmap/CRoaring/blob/master/cpp/roaring/roaring.hh),
+- [roaring64map.hh](https://github.com/RoaringBitmap/CRoaring/blob/master/cpp/roaring/roaring64map.hh).
 
 
 # Main API functions
@@ -447,7 +447,7 @@ The C++ interface is provided via the `roaring.hh` (32-bit) and `roaring64map.hh
 
 ## Example Usage
 ```cpp
-#include "roaring.hh"
+#include "roaring/roaring.hh"
 using namespace roaring;
 
 Roaring r1;
@@ -921,7 +921,7 @@ int main() {
 
 
 
-# Building with cmake (Linux and macOS, Visual Studio users should see below)
+# Building with cmake (Linux and macOS, Visual Studio or OpenHarmony users should see below)
 
 CRoaring follows the standard cmake workflow. Starting from the root directory of
 the project (CRoaring), you can do:
@@ -1039,6 +1039,11 @@ These commands will also print out instructions on how to use the library from M
 
 If you find the version of `roaring` shipped with `vcpkg` is out-of-date, feel free to report it to `vcpkg` community either by submiting an issue or by creating a PR.
 
+
+# Building (OpenHarmony)
+
+To build with OpenHarmony SDK please see the [OpenHarmony Cross Compile Guide](https://gitcode.com/openharmony-sig/tpc_c_cplusplus/blob/master/Cross-Compilation Guide for Open-Source Third-Party Libraries in OpenHarmony_en.md)
+
 # SIMD-related throttling
 
 Our AVX2 code does not use floating-point numbers or multiplications, so it is not subject to turbo frequency throttling on many-core Intel processors.
diff --git a/contrib/libs/croaring/cpp/roaring.hh b/contrib/libs/croaring/cpp/roaring/roaring.hh
index 8a3b8b6892a..8a3b8b6892a 100644
--- a/contrib/libs/croaring/cpp/roaring.hh
+++ b/contrib/libs/croaring/cpp/roaring/roaring.hh
diff --git a/contrib/libs/croaring/cpp/roaring64map.hh b/contrib/libs/croaring/cpp/roaring/roaring64map.hh
index 9f23a768e7d..aad8bfdf474 100644
--- a/contrib/libs/croaring/cpp/roaring64map.hh
+++ b/contrib/libs/croaring/cpp/roaring/roaring64map.hh
@@ -1249,6 +1249,9 @@ class Roaring64Map {
             });
     }
 
+    /**
+     * For advanced users only.
+     */
     static const Roaring64Map frozenView(const char *buf) {
         // size of bitmap buffer and key
         const size_t metadata_size = sizeof(size_t) + sizeof(uint32_t);
@@ -1284,6 +1287,10 @@ class Roaring64Map {
         return result;
     }
 
+    /**
+     * For advanced users only. This function is unsafe in the sense that
+     * that it may trigger unaligned memory access. Use with caution.
+     */
     static const Roaring64Map portableDeserializeFrozen(const char *buf) {
         Roaring64Map result;
         // get map size
diff --git a/contrib/libs/croaring/include/roaring/roaring.hh b/contrib/libs/croaring/include/roaring/roaring.hh
index 9ca2a52c438..1998603aace 100644
--- a/contrib/libs/croaring/include/roaring/roaring.hh
+++ b/contrib/libs/croaring/include/roaring/roaring.hh
@@ -1 +1 @@
-#include "../../cpp/roaring.hh" /* inclink generated by yamaker */
+#include "../../cpp/roaring/roaring.hh" /* inclink generated by yamaker */
diff --git a/contrib/libs/croaring/include/roaring/roaring64map.hh b/contrib/libs/croaring/include/roaring/roaring64map.hh
index 69c3615da02..fdb20373e30 100644
--- a/contrib/libs/croaring/include/roaring/roaring64map.hh
+++ b/contrib/libs/croaring/include/roaring/roaring64map.hh
@@ -1 +1 @@
-#include "../../cpp/roaring64map.hh" /* inclink generated by yamaker */
+#include "../../cpp/roaring/roaring64map.hh" /* inclink generated by yamaker */
diff --git a/contrib/libs/croaring/include/roaring/roaring_version.h b/contrib/libs/croaring/include/roaring/roaring_version.h
index a9ee0f9ac43..4df46f947af 100644
--- a/contrib/libs/croaring/include/roaring/roaring_version.h
+++ b/contrib/libs/croaring/include/roaring/roaring_version.h
@@ -2,11 +2,11 @@
 // /include/roaring/roaring_version.h automatically generated by release.py, do not change by hand
 #ifndef ROARING_INCLUDE_ROARING_VERSION
 #define ROARING_INCLUDE_ROARING_VERSION
-#define ROARING_VERSION "4.3.5"
+#define ROARING_VERSION "4.3.6"
 enum {
     ROARING_VERSION_MAJOR = 4,
     ROARING_VERSION_MINOR = 3,
-    ROARING_VERSION_REVISION = 5
+    ROARING_VERSION_REVISION = 6
 };
 #endif // ROARING_INCLUDE_ROARING_VERSION
 // clang-format on
\ No newline at end of file
diff --git a/contrib/libs/croaring/src/roaring.c b/contrib/libs/croaring/src/roaring.c
index 2363afa48f5..65ff6fabdcf 100644
--- a/contrib/libs/croaring/src/roaring.c
+++ b/contrib/libs/croaring/src/roaring.c
@@ -1920,7 +1920,7 @@ static void insert_flipped_container(roaring_array_t *ans_arr,
             container_not_range(container_to_flip, ctype_in, (uint32_t)lb_start,
                                 (uint32_t)(lb_end + 1), &ctype_out);
 
-        if (container_get_cardinality(flipped_container, ctype_out))
+        if (container_nonzero_cardinality(flipped_container, ctype_out))
             ra_insert_new_key_value_at(ans_arr, -j - 1, hb, flipped_container,
                                        ctype_out);
         else {
@@ -1946,7 +1946,7 @@ static void inplace_flip_container(roaring_array_t *x1_arr, uint16_t hb,
             container_to_flip, ctype_in, (uint32_t)lb_start,
             (uint32_t)(lb_end + 1), &ctype_out);
         // if a new container was created, the old one was already freed
-        if (container_get_cardinality(flipped_container, ctype_out)) {
+        if (container_nonzero_cardinality(flipped_container, ctype_out)) {
             ra_set_container_at_index(x1_arr, i, flipped_container, ctype_out);
         } else {
             container_free(flipped_container, ctype_out);
@@ -1973,7 +1973,7 @@ static void insert_fully_flipped_container(roaring_array_t *ans_arr,
             ra_get_container_at_index(x1_arr, (uint16_t)i, &ctype_in);
         flipped_container =
             container_not(container_to_flip, ctype_in, &ctype_out);
-        if (container_get_cardinality(flipped_container, ctype_out))
+        if (container_nonzero_cardinality(flipped_container, ctype_out))
             ra_insert_new_key_value_at(ans_arr, -j - 1, hb, flipped_container,
                                        ctype_out);
         else {
@@ -1996,7 +1996,7 @@ static void inplace_fully_flip_container(roaring_array_t *x1_arr, uint16_t hb) {
         flipped_container =
             container_inot(container_to_flip, ctype_in, &ctype_out);
 
-        if (container_get_cardinality(flipped_container, ctype_out)) {
+        if (container_nonzero_cardinality(flipped_container, ctype_out)) {
             ra_set_container_at_index(x1_arr, i, flipped_container, ctype_out);
         } else {
             container_free(flipped_container, ctype_out);
diff --git a/contrib/libs/croaring/ya.make b/contrib/libs/croaring/ya.make
index 7be4ed8883a..c5924ef844e 100644
--- a/contrib/libs/croaring/ya.make
+++ b/contrib/libs/croaring/ya.make
@@ -10,9 +10,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(4.3.5)
+VERSION(4.3.6)
 
-ORIGINAL_SOURCE(https://github.com/RoaringBitmap/CRoaring/archive/v4.3.5.tar.gz)
+ORIGINAL_SOURCE(https://github.com/RoaringBitmap/CRoaring/archive/v4.3.6.tar.gz)
 
 ADDINCL(
     GLOBAL contrib/libs/croaring/include