misc

Author: zeromax007

README.md

@@ -85,6 +85,15 @@ SELECT '\x3a3000000100000000000000100000000100'::ROARINGBITMAP;
         </td>
         <td>rb_build('{1,2,3,4,5}')</td>
     </tr>
+    <tr>
+        <td>rb_build</td>
+        <td>integer<br>integer<br>integer</td>
+        <td>roaringbitmap</td>
+        <td>
+            Build a roaringbitmap from integer range (with step).
+        </td>
+        <td>rb_build('{1,2,3,4,5}')</td>
+    </tr>
     <tr>
         <td>rb_to_array</td>
         <td>roaringbitmap</td>
@@ -125,35 +134,56 @@ SELECT '\x3a3000000100000000000000100000000100'::ROARINGBITMAP;
     <tr>
         <td>rb_cardinality</td>
         <td>roraingbitmap</td>
-        <td>integer</td>
+        <td>bigint</td>
         <td>Retrun roaringbitmap cardinality.<br>统计基数</td>
         <td>rb_cardinality(rb_build('{1,2,3,4,5}'))</td>
     </tr>
+    <tr>
+        <td>rb_cardinality</td>
+        <td>roraingbitmap<br>integer<br>integer</td>
+        <td>bigint</td>
+        <td>Retrun roaringbitmap cardinality between integer range.</td>
+        <td>rb_cardinality(rb_build('{1,2,3,4,5}'),1,4)</td>
+    </tr>
+    <tr>
+        <td>rb_cardinality</td>
+        <td>roraingbitmap<br>integer<br>integer<br>integer</td>
+        <td>bigint</td>
+        <td>Retrun roaringbitmap cardinality between integer range with step.</td>
+        <td>rb_cardinality(rb_build('{1,2,3,4,5}'),1,4,2)</td>
+    </tr>
+    <tr>
+        <td>rb_cardinality</td>
+        <td>roraingbitmap<br>integer<br>integer<br>integer<br>integer[]</td>
+        <td>bigint</td>
+        <td>Retrun roaringbitmap cardinality between integer range with step, in offset array.</td>
+        <td>rb_cardinality(rb_build('{1,2,3,4,5}'),1,4,2,'{1,3}')</td>
+    </tr>
     <tr>
         <td>rb_and_cardinality</td>
         <td>roraingbitmap<br>roaringbitmap</td>
-        <td>integer</td>
+        <td>bigint</td>
         <td>Two roaringbitmap and calculation, return cardinality.<br>And计算并返回基数。</td>
         <td>rb_and_cardinality(rb_build('{1,2,3}'),rb_build('{3,4,5}'))</td>
     </tr>
     <tr>
         <td>rb_or_cardinality</td>
         <td>roraingbitmap<br>roaringbitmap</td>
-        <td>integer</td>
+        <td>bigint</td>
         <td>Two roaringbitmap or calculation, return cardinality.<br>Or计算并返回基数。</td>
         <td>rb_or_cardinality(rb_build('{1,2,3}'),rb_build('{3,4,5}'))</td>
     </tr>
     <tr>
         <td>rb_xor_cardinality</td>
         <td>roraingbitmap<br>roaringbitmap</td>
-        <td>integer</td>
+        <td>bigint</td>
         <td>Two roaringbitmap xor calculation, return cardinality.<br>Xor计算并返回基数。</td>
         <td>rb_xor_cardinality(rb_build('{1,2,3}'),rb_build('{3,4,5}'))</td>
     </tr>
     <tr>
         <td>rb_andnot_cardinality</td>
         <td>roraingbitmap<br>roaringbitmap</td>
-        <td>integer</td>
+        <td>bigint</td>
         <td>Two roaringbitmap andnot calculation, return cardinality.<br>AndNot计算并返回基数。</td>
         <td>rb_andnot_cardinality(rb_build('{1,2,3}'),rb_build('{3,4,5}'))</td>
     </tr>
@@ -470,21 +500,21 @@ SELECT '\x3a3000000100000000000000100000000100'::ROARINGBITMAP;
     <tr>
         <td>rb_or_cardinality_agg</td>
         <td>roraingbitmap</td>
-        <td>integer</td>
+        <td>bigint</td>
         <td>Or Aggregate calculations from a roraingbitmap set, return cardinality.<br>Or 聚合计算并返回其基数。</td>
         <td>rb_or_cardinality_agg(rb_build('{1,2,3}'))</td>
     </tr>   
     <tr>
         <td>rb_and_cardinality_agg</td>
         <td>roraingbitmap</td>
-        <td>integer</td>
+        <td>bigint</td>
         <td>And Aggregate calculations from a roraingbitmap set, return cardinality.<br>And 聚合计算并返回其基数。</td>
         <td>rb_and_cardinality_agg(rb_build('{1,2,3}'))</td>
     </tr>  
     <tr>
         <td>rb_xor_cardinality_agg</td>
         <td>roraingbitmap</td>
-        <td>integer</td>
+        <td>bigint</td>
         <td>Xor Aggregate calculations from a roraingbitmap set, return cardinality.<br>Xor 聚合计算并返回其基数。</td>
         <td>rb_xor_cardinality_agg(rb_build('{1,2,3}'))</td>
     </tr>

roaringbitmap--0.2.65.1--0.2.65.2.sql

@@ -13,33 +13,40 @@ CREATE
 CREATE
   OR REPLACE FUNCTION rb_or(roaringbitmap, roaringbitmap) RETURNS roaringbitmap AS 'MODULE_PATHNAME',
   'rb_or' LANGUAGE C STRICT IMMUTABLE;
+DROP FUNCTION IF EXISTS rb_or_cardinality(roaringbitmap, roaringbitmap);
 CREATE
   OR REPLACE FUNCTION rb_or_cardinality(roaringbitmap, roaringbitmap) RETURNS BIGINT AS 'MODULE_PATHNAME',
   'rb_or_cardinality' LANGUAGE C STRICT IMMUTABLE;
 CREATE
   OR REPLACE FUNCTION rb_and(roaringbitmap, roaringbitmap) RETURNS roaringbitmap AS 'MODULE_PATHNAME',
   'rb_and' LANGUAGE C STRICT IMMUTABLE;
+DROP FUNCTION IF EXISTS rb_and_cardinality(roaringbitmap, roaringbitmap);
 CREATE
   OR REPLACE FUNCTION rb_and_cardinality(roaringbitmap, roaringbitmap) RETURNS BIGINT AS 'MODULE_PATHNAME',
   'rb_and_cardinality' LANGUAGE C STRICT IMMUTABLE;
 CREATE
   OR REPLACE FUNCTION rb_xor(roaringbitmap, roaringbitmap) RETURNS roaringbitmap AS 'MODULE_PATHNAME',
   'rb_xor' LANGUAGE C STRICT IMMUTABLE;
+DROP FUNCTION IF EXISTS rb_xor_cardinality(roaringbitmap, roaringbitmap);
 CREATE
   OR REPLACE FUNCTION rb_xor_cardinality(roaringbitmap, roaringbitmap) RETURNS BIGINT AS 'MODULE_PATHNAME',
   'rb_xor_cardinality' LANGUAGE C STRICT IMMUTABLE;
 CREATE
   OR REPLACE FUNCTION rb_andnot(roaringbitmap, roaringbitmap) RETURNS roaringbitmap AS 'MODULE_PATHNAME',
   'rb_andnot' LANGUAGE C STRICT IMMUTABLE;
+DROP FUNCTION IF EXISTS rb_andnot_cardinality(roaringbitmap, roaringbitmap);
 CREATE
   OR REPLACE FUNCTION rb_andnot_cardinality(roaringbitmap, roaringbitmap) RETURNS BIGINT AS 'MODULE_PATHNAME',
   'rb_andnot_cardinality' LANGUAGE C STRICT IMMUTABLE;
+DROP FUNCTION IF EXISTS rb_cardinality(roaringbitmap);
 CREATE
   OR REPLACE FUNCTION rb_cardinality(roaringbitmap) RETURNS BIGINT AS 'MODULE_PATHNAME',
   'rb_cardinality' LANGUAGE C STRICT IMMUTABLE;
+DROP FUNCTION IF EXISTS rb_cardinality(roaringbitmap, integer, integer);
 CREATE
   OR REPLACE FUNCTION rb_cardinality(roaringbitmap, integer, integer) RETURNS BIGINT AS 'MODULE_PATHNAME',
   'rb_cardinality_range' LANGUAGE C STRICT IMMUTABLE;
+DROP FUNCTION IF EXISTS rb_cardinality(roaringbitmap, integer, integer, integer);
 CREATE
   OR REPLACE FUNCTION rb_cardinality(roaringbitmap, integer, integer, integer) RETURNS BIGINT AS 'MODULE_PATHNAME',
   'rb_cardinality_step' LANGUAGE C STRICT IMMUTABLE;

roaringbitmap.c

@@ -361,7 +361,7 @@ Datum
     if (!r1)
         ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), errmsg("bitmap format is error")));
 
-    int64 card1 = roaring_bitmap_range_cardinality(r1, min, max + 1);
+    int64 card1 = roaring_bitmap_range_cardinality(r1, min, max == -1 ? -1 : max + 1);
 
     roaring_bitmap_free(r1);
     PG_RETURN_INT64(card1);