Skip to content

fix #45, avoid inconsistent results for incorrectly serialized bitmaps #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChenHuajun merged 1 commit into from
Sep 7, 2025
+45 −19
Merged

fix #45, avoid inconsistent results for incorrectly serialized bitmaps #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions expected/roaringbitmap.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2671,3 +2671,11 @@ SELECT rb_and_cardinality('{100373,1829130,1861002,1975442,2353213,2456403}','{2
1
(1 row)

-- bugfix #45: rb_to_array and rb_min exhibits inconsistent results in a malformed serialize input
select rb_to_array('\x3a300000010000000000000000000000000000000000000000000000000000000000000000000000000000000008'::roaringbitmap),
rb_min('\x3a300000010000000000000000000000000000000000000000000000000000000000000000000000000000000008'::roaringbitmap);
rb_to_array | rb_min
-------------+--------
{0} | 0
(1 row)

50 changes: 31 additions & 19 deletions roaringbitmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

typedef enum
{
RBITMAP_OUTPUT_ARRAY, /* output as int array */
RBITMAP_OUTPUT_BYTEA /* output as bytea */
RBITMAP_OUTPUT_ARRAY, /* output as int array */
RBITMAP_OUTPUT_BYTEA /* output as bytea */
}RBITMAPOutputFormat;

static const struct config_enum_entry output_format_options[] =
Expand All @@ -21,7 +21,7 @@ static const struct config_enum_entry output_format_options[] =
{NULL, 0, false}
};

static int rbitmap_output_format = RBITMAP_OUTPUT_BYTEA; /* output format */
static int rbitmap_output_format = RBITMAP_OUTPUT_BYTEA; /* output format */

static roaring_memory_t rb_memory_hook = {
.malloc = palloc,
Expand All @@ -32,25 +32,25 @@ static roaring_memory_t rb_memory_hook = {
.aligned_free = pg_aligned_free,
};

void _PG_init(void);
void _PG_init(void);
/*
* Module load callback
*/
void
_PG_init(void)
{
/* Define custom GUC variables. */
DefineCustomEnumVariable("roaringbitmap.output_format",
"Selects output format of roaringbitmap.",
NULL,
&rbitmap_output_format,
RBITMAP_OUTPUT_BYTEA,
output_format_options,
PGC_USERSET,
0,
NULL,
NULL,
NULL);
/* Define custom GUC variables. */
DefineCustomEnumVariable("roaringbitmap.output_format",
"Selects output format of roaringbitmap.",
NULL,
&rbitmap_output_format,
RBITMAP_OUTPUT_BYTEA,
output_format_options,
PGC_USERSET,
0,
NULL,
NULL,
NULL);
roaring_init_memory_hook(rb_memory_hook);
}

Expand Down Expand Up @@ -99,15 +99,22 @@ Datum
rb_from_bytea(PG_FUNCTION_ARGS) {
bytea *serializedbytes = PG_GETARG_BYTEA_P(0);
roaring_bitmap_t *r1;
size_t expectedsize;
bytea *serializedbytes2;

r1 = roaring_bitmap_portable_deserialize_safe(VARDATA(serializedbytes), VARSIZE(serializedbytes) - VARHDRSZ);
if (!r1)
ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg("bitmap format is error")));

expectedsize = roaring_bitmap_portable_size_in_bytes(r1);
serializedbytes2 = (bytea *) palloc(VARHDRSZ + expectedsize);
roaring_bitmap_portable_serialize(r1, VARDATA(serializedbytes2));
roaring_bitmap_free(r1);
PG_RETURN_BYTEA_P(serializedbytes);

SET_VARSIZE(serializedbytes2, VARHDRSZ + expectedsize);
PG_RETURN_BYTEA_P(serializedbytes2);
}


Expand Down Expand Up @@ -136,12 +143,17 @@ roaringbitmap_in(PG_FUNCTION_ARGS) {
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg("bitmap format is error")));

expectedsize = roaring_bitmap_portable_size_in_bytes(r1);
serializedbytes = (bytea *) palloc(VARHDRSZ + expectedsize);
roaring_bitmap_portable_serialize(r1, VARDATA(serializedbytes));
roaring_bitmap_free(r1);
return dd;

SET_VARSIZE(serializedbytes, VARHDRSZ + expectedsize);
PG_RETURN_BYTEA_P(serializedbytes);
}
/* else int array input */

/* Find the head char '{' */
/* Find the head char '{' */
while (*ptr && isspace((unsigned char) *ptr))
ptr++;
if (*ptr !='{')
Expand Down
6 changes: 6 additions & 0 deletions sql/roaringbitmap.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,3 +610,9 @@ order by id limit 10;
-- bugfix #22
SELECT '{100373,1829130,1861002,1975442,2353213,2456403}'::roaringbitmap & '{2353213}'::roaringbitmap;
SELECT rb_and_cardinality('{100373,1829130,1861002,1975442,2353213,2456403}','{2353213}');

-- bugfix #45: rb_to_array and rb_min exhibits inconsistent results in a malformed serialize input
select rb_to_array('\x3a300000010000000000000000000000000000000000000000000000000000000000000000000000000000000008'::roaringbitmap),
rb_min('\x3a300000010000000000000000000000000000000000000000000000000000000000000000000000000000000008'::roaringbitmap);