roaring 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc33ef0434903a23cc016fc7b1d31250280c96efd5e94ddbff4b8fa4f0977b73
-  data.tar.gz: 67b0b48a4b7dd2868977af10de721eba00e6c3aa08f222f1d3866a5003be5218
+  metadata.gz: c061d28a03b3ba5b386807eb2cf2bde2d1e8309c69316c67bfb3e6d36dd13236
+  data.tar.gz: 52a90f348280c88153f31e6b2a2f2a333bfc8094e813314df5d5f84aa41cb831
 SHA512:
-  metadata.gz: 2159681201c2f83fadc8d01fd2ddc1bedb7bcbc7828d955f6bf2c9ea8168fdce066f3f653cc7cfe935342f1bf126c895d09fd1f28296395e5f08331bf71807b2
-  data.tar.gz: 3d9bbdaecd48f645370d3bf116e00e457d878a6dce95be1b59c412088c969f4df09a4360897be8931eb2a94f44360c6cd3887abdffca56d6e784c71b0fa21307
+  metadata.gz: 62b208238f339e10313701dc0272d0cdddccfc407b7f78fdf5e3bc86500f36cb5eb0d98741c69a179af085a800eae60740b194963f2ddec6f5b745ad1d89cfe6
+  data.tar.gz: eea3734551e011cb1835d4bf5d3c0d15ddd767dbfa21582f714581e0b8206d1fe608df5eda6d9cb6de71d731c643e3e845fd7ecd6e64be02e37d47f83f5cf1cc

data/ext/roaring/bitmap32.c

@@ -63,7 +63,7 @@ static VALUE rb_roaring32_cardinality(VALUE self)
 {
     roaring_bitmap_t *data = get_bitmap(self);
     uint64_t cardinality = roaring_bitmap_get_cardinality(data);
-    return ULONG2NUM(cardinality);
+    return ULL2NUM(cardinality);
 }
 
 // Adds an element from the bitmap
@@ -229,10 +229,19 @@ static VALUE rb_roaring32_serialize(VALUE self)
 }
 
 // Loads a previously serialized bitmap
+// @param str [String] a string previously returned from {#serialize}
+// @raise [ArgumentError] if the string isn't a valid serialized bitmap
 // @return [Bitmap32]
 static VALUE rb_roaring32_deserialize(VALUE self, VALUE str)
 {
+    StringValue(str);
+
     roaring_bitmap_t *bitmap = roaring_bitmap_portable_deserialize_safe(RSTRING_PTR(str), RSTRING_LEN(str));
+    RB_GC_GUARD(str);
+
+    if (!bitmap) {
+        rb_raise(rb_eArgError, "invalid Roaring::Bitmap32 serialization");
+    }
 
     return TypedData_Wrap_Struct(cRoaringBitmap32, &roaring_type, bitmap);
 }
@@ -300,6 +309,15 @@ static VALUE rb_roaring32_binary_op_bool(VALUE self, VALUE other, binary_func_bo
     return RBOOL(result);
 }
 
+typedef uint64_t binary_func_cardinality(const roaring_bitmap_t *, const roaring_bitmap_t *);
+static VALUE rb_roaring32_binary_op_cardinality(VALUE self, VALUE other, binary_func_cardinality func) {
+    roaring_bitmap_t *self_data = get_bitmap(self);
+    roaring_bitmap_t *other_data = get_bitmap(other);
+
+    uint64_t result = func(self_data, other_data);
+    return ULL2NUM(result);
+}
+
 // Inplace version of {and}
 // @return [self] the modified Bitmap
 static VALUE rb_roaring32_and_inplace(VALUE self, VALUE other)
@@ -349,6 +367,30 @@ static VALUE rb_roaring32_xor(VALUE self, VALUE other)
     return rb_roaring32_binary_op(self, other, roaring_bitmap_xor);
 }
 
+// Computes the cardinality of the intersection between two bitmaps without
+// materializing the result
+// @return [Integer] the number of elements in both `self` and `other`
+static VALUE rb_roaring32_and_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring32_binary_op_cardinality(self, other, roaring_bitmap_and_cardinality);
+}
+
+// Computes the cardinality of the union between two bitmaps without
+// materializing the result
+// @return [Integer] the number of elements in either `self` or `other`
+static VALUE rb_roaring32_or_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring32_binary_op_cardinality(self, other, roaring_bitmap_or_cardinality);
+}
+
+// Computes the cardinality of the exclusive or between two bitmaps without
+// materializing the result
+// @return [Integer] the number of elements in one of `self` or `other`, but not both
+static VALUE rb_roaring32_xor_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring32_binary_op_cardinality(self, other, roaring_bitmap_xor_cardinality);
+}
+
 // Computes the difference between two bitmaps
 // @return [Bitmap32] a new bitmap containing all elements in `self`, but not in `other`
 static VALUE rb_roaring32_andnot(VALUE self, VALUE other)
@@ -412,6 +454,10 @@ rb_roaring32_init(void)
   rb_define_method(cRoaringBitmap32, "xor", rb_roaring32_xor, 1);
   rb_define_method(cRoaringBitmap32, "andnot", rb_roaring32_andnot, 1);
 
+  rb_define_method(cRoaringBitmap32, "and_cardinality", rb_roaring32_and_cardinality, 1);
+  rb_define_method(cRoaringBitmap32, "or_cardinality", rb_roaring32_or_cardinality, 1);
+  rb_define_method(cRoaringBitmap32, "xor_cardinality", rb_roaring32_xor_cardinality, 1);
+
   rb_define_method(cRoaringBitmap32, "==", rb_roaring32_eq, 1);
   rb_define_method(cRoaringBitmap32, "<", rb_roaring32_lt, 1);
   rb_define_method(cRoaringBitmap32, "<=", rb_roaring32_lte, 1);

data/ext/roaring/bitmap64.c

@@ -66,7 +66,7 @@ static VALUE rb_roaring64_cardinality(VALUE self)
 {
     roaring64_bitmap_t *data = get_bitmap(self);
     uint64_t cardinality = roaring64_bitmap_get_cardinality(data);
-    return ULONG2NUM(cardinality);
+    return ULL2NUM(cardinality);
 }
 
 static VALUE rb_roaring64_add(VALUE self, VALUE val)
@@ -208,7 +208,14 @@ static VALUE rb_roaring64_serialize(VALUE self)
 
 static VALUE rb_roaring64_deserialize(VALUE self, VALUE str)
 {
+    StringValue(str);
+
     roaring64_bitmap_t *bitmap = roaring64_bitmap_portable_deserialize_safe(RSTRING_PTR(str), RSTRING_LEN(str));
+    RB_GC_GUARD(str);
+
+    if (!bitmap) {
+        rb_raise(rb_eArgError, "invalid Roaring::Bitmap64 serialization");
+    }
 
     return TypedData_Wrap_Struct(cRoaringBitmap64, &roaring64_type, bitmap);
 }
@@ -274,6 +281,15 @@ static VALUE rb_roaring64_binary_op_bool(VALUE self, VALUE other, binary_func_bo
     return RBOOL(result);
 }
 
+typedef uint64_t binary_func_cardinality(const roaring64_bitmap_t *, const roaring64_bitmap_t *);
+static VALUE rb_roaring64_binary_op_cardinality(VALUE self, VALUE other, binary_func_cardinality func) {
+    roaring64_bitmap_t *self_data = get_bitmap(self);
+    roaring64_bitmap_t *other_data = get_bitmap(other);
+
+    uint64_t result = func(self_data, other_data);
+    return ULL2NUM(result);
+}
+
 static VALUE rb_roaring64_and_inplace(VALUE self, VALUE other)
 {
     return rb_roaring64_binary_op_inplace(self, other, roaring64_bitmap_and_inplace);
@@ -309,6 +325,21 @@ static VALUE rb_roaring64_xor(VALUE self, VALUE other)
     return rb_roaring64_binary_op(self, other, roaring64_bitmap_xor);
 }
 
+static VALUE rb_roaring64_and_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring64_binary_op_cardinality(self, other, roaring64_bitmap_and_cardinality);
+}
+
+static VALUE rb_roaring64_or_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring64_binary_op_cardinality(self, other, roaring64_bitmap_or_cardinality);
+}
+
+static VALUE rb_roaring64_xor_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring64_binary_op_cardinality(self, other, roaring64_bitmap_xor_cardinality);
+}
+
 static VALUE rb_roaring64_andnot(VALUE self, VALUE other)
 {
     return rb_roaring64_binary_op(self, other, roaring64_bitmap_andnot);
@@ -363,6 +394,10 @@ rb_roaring64_init(void)
   rb_define_method(cRoaringBitmap64, "xor", rb_roaring64_xor, 1);
   rb_define_method(cRoaringBitmap64, "andnot", rb_roaring64_andnot, 1);
 
+  rb_define_method(cRoaringBitmap64, "and_cardinality", rb_roaring64_and_cardinality, 1);
+  rb_define_method(cRoaringBitmap64, "or_cardinality", rb_roaring64_or_cardinality, 1);
+  rb_define_method(cRoaringBitmap64, "xor_cardinality", rb_roaring64_xor_cardinality, 1);
+
   rb_define_method(cRoaringBitmap64, "==", rb_roaring64_eq, 1);
   rb_define_method(cRoaringBitmap64, "<", rb_roaring64_lt, 1);
   rb_define_method(cRoaringBitmap64, "<=", rb_roaring64_lte, 1);

data/lib/roaring/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Roaring
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/roaring.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "roaring/version"
-require_relative "roaring/roaring"
+require "roaring/roaring"
 require "set"
 
 module Roaring

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: roaring
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - John Hawthorn
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prime
@@ -35,7 +34,6 @@ files:
 - ".yardopts"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -59,7 +57,6 @@ metadata:
   homepage_uri: https://github.com/jhawthorn/roaring-ruby
   changelog_uri: https://github.com/jhawthorn/roaring-ruby
   source_code_uri: https://github.com/jhawthorn/roaring-ruby
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,8 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Roaring bitmaps for Ruby
 test_files: []

data/Gemfile.lock

@@ -1,46 +0,0 @@
-PATH
-  remote: .
-  specs:
-    roaring (0.3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    benchmark-ips (2.13.0)
-    debug (1.6.2)
-      irb (>= 1.3.6)
-      reline (>= 0.3.1)
-    forwardable (1.3.2)
-    io-console (0.5.11)
-    irb (1.4.1)
-      reline (>= 0.3.0)
-    minitest (5.16.3)
-    prime (0.1.2)
-      forwardable
-      singleton
-    rake (13.0.6)
-    rake-compiler (1.2.0)
-      rake
-    reline (0.3.1)
-      io-console (~> 0.5)
-    singleton (0.1.1)
-    yard (0.9.36)
-
-PLATFORMS
-  arm64-darwin-23
-  arm64-darwin-24
-  ruby
-  x86_64-linux
-
-DEPENDENCIES
-  benchmark-ips
-  debug
-  minitest (~> 5.0)
-  prime
-  rake (~> 13.0)
-  rake-compiler
-  roaring!
-  yard
-
-BUNDLED WITH
-   2.3.4