fix decrement

Author: zeromax007

roaring.c

@@ -9114,6 +9114,15 @@ roaring_uint32_iterator_t *roaring_create_iterator(const roaring_bitmap_t *ra) {
     return newit;
 }
 
+/* Mod by ZEROMAX create previous iterator */
+roaring_uint32_iterator_t *roaring_create_iterator_last(const roaring_bitmap_t *ra) {
+    roaring_uint32_iterator_t *newit =
+        (roaring_uint32_iterator_t *)malloc(sizeof(roaring_uint32_iterator_t));
+    if (newit == NULL) return NULL;
+    roaring_init_iterator_last(ra, newit);
+    return newit;
+}
+
 roaring_uint32_iterator_t *roaring_copy_uint32_iterator(
     const roaring_uint32_iterator_t *it) {
     roaring_uint32_iterator_t *newit =

roaring.h

@@ -7174,6 +7174,9 @@ void roaring_init_iterator_last(const roaring_bitmap_t *ra,
 */
 roaring_uint32_iterator_t *roaring_create_iterator(const roaring_bitmap_t *ra);
 
+/* Mod by ZEROMAX create previous iterator */
+roaring_uint32_iterator_t *roaring_create_iterator_last(const roaring_bitmap_t *ra);
+
 /**
 * Advance the iterator. If there is a new value, then it->has_value is true.
 * The new value is in it->current_value. Values are traversed in increasing

roaringbitmap--0.2.65--0.2.65.1.sql

@@ -5,7 +5,9 @@ CREATE
   OR REPLACE FUNCTION roaringbitmap(bytea) RETURNS roaringbitmap AS 'MODULE_PATHNAME',
   'roaringbitmap' LANGUAGE C STRICT IMMUTABLE;
 
+DROP CAST IF EXISTS (bytea AS roaringbitmap);
 CREATE CAST (bytea AS roaringbitmap) WITH FUNCTION roaringbitmap(bytea);
+DROP CAST IF EXISTS (roaringbitmap AS bytea);
 CREATE CAST (roaringbitmap AS bytea) WITHOUT FUNCTION;
 
 CREATE
@@ -113,7 +115,7 @@ CREATE
   'rb_iterate_decrement' LANGUAGE C STRICT IMMUTABLE;
 
 
-  CREATE
+CREATE
 OR REPLACE FUNCTION rb_and_trans(internal, roaringbitmap) RETURNS internal AS 'MODULE_PATHNAME',
 'rb_and_trans' LANGUAGE C IMMUTABLE;
 CREATE

roaringbitmap--0.2.65.1.sql

@@ -2,7 +2,7 @@
 SET
   search_path = pg_catalog;
 --- data type --
-  CREATE
+CREATE
   OR REPLACE FUNCTION roaringbitmap_in(cstring) RETURNS roaringbitmap AS 'MODULE_PATHNAME',
   'roaringbitmap_in' LANGUAGE C STRICT IMMUTABLE;
 CREATE
@@ -25,8 +25,12 @@ CREATE TYPE roaringbitmap (
 CREATE
   OR REPLACE FUNCTION roaringbitmap(bytea) RETURNS roaringbitmap AS 'MODULE_PATHNAME',
   'roaringbitmap' LANGUAGE C STRICT IMMUTABLE;
+
+DROP CAST IF EXISTS (bytea AS roaringbitmap);
 CREATE CAST (bytea AS roaringbitmap) WITH FUNCTION roaringbitmap(bytea);
+DROP CAST IF EXISTS (roaringbitmap AS bytea);
 CREATE CAST (roaringbitmap AS bytea) WITHOUT FUNCTION;
+
 -- functions --
   CREATE
   OR REPLACE FUNCTION rb_build(integer[]) RETURNS roaringbitmap AS 'MODULE_PATHNAME',

roaringbitmap.c

@@ -650,7 +650,6 @@ Datum
     }
 }
 
-
 //bitmap iterate decrement
 PG_FUNCTION_INFO_V1(rb_iterate_decrement);
 Datum rb_iterate_decrement(PG_FUNCTION_ARGS);
@@ -674,7 +673,7 @@ Datum
         if (!r1)
             ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), errmsg("bitmap format is error")));
 
-        roaring_uint32_iterator_t *fctx = roaring_create_iterator(r1);
+        roaring_uint32_iterator_t *fctx = roaring_create_iterator_last(r1);
 
         funcctx->user_fctx = fctx;
 
@@ -882,19 +881,19 @@ Datum
 
     // Is the second argument non-null?
     if (!PG_ARGISNULL(1))
+    {
+        r2 = (roaring_bitmap_t *)PG_GETARG_POINTER(1);
+
+        if (PG_ARGISNULL(0))
         {
-            r2 = (roaring_bitmap_t *)PG_GETARG_POINTER(1);
-
-            if (PG_ARGISNULL(0))
-            {
-                r1 = roaring_bitmap_copy(r2);
-            }
-            else
-            {
-                roaring_bitmap_and_inplace(r1, r2);
-            }
-            roaring_bitmap_free(r2);
+            r1 = roaring_bitmap_copy(r2);
         }
+        else
+        {
+            roaring_bitmap_and_inplace(r1, r2);
+        }
+        roaring_bitmap_free(r2);
+    }
 
     PG_RETURN_POINTER(r1);
 }