tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nostrdb: filter: fix ndb_filter_init_with and make public

Browse Source 
This fixes an allocation issue with ndb_filter_init_with for small
page sizes. instead of allocating the buffer around pages, we allocate
based on total buffer size.

Fixes: f7aac3215575 ("filter: introduce ndb_filter_init_with")
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2025-01-13 11:25:10 -08:00
committed by Daniel D’Aquino
parent ec798bdeb2
commit d3496af5cc
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nostrdb/src/nostrdb.c
View File

@@ -685,15 +685,16 @@ ndb_filter_get_int_element(const struct ndb_filter_elements *els, int index)
return els->elements[index]; return els->elements[index];
} }
static int ndb_filter_init_with(struct ndb_filter *filter, int pages) int ndb_filter_init_with(struct ndb_filter *filter, int pages)
{ {
struct cursor cur; struct cursor cur;
int page_size, elem_pages, data_pages, buf_size; int page_size, elem_size, data_size, buf_size;
page_size = 4096; // assuming this, not a big deal if we're wrong page_size = 4096; // assuming this, not a big deal if we're wrong
elem_pages = pages / 4;
data_pages = pages - elem_pages;
buf_size = page_size * pages; buf_size = page_size * pages;
elem_size = buf_size / 4;
data_size = buf_size - elem_size;
unsigned char *buf = malloc(buf_size); unsigned char *buf = malloc(buf_size);
if (!buf) if (!buf)
@@ -702,8 +703,8 @@ static int ndb_filter_init_with(struct ndb_filter *filter, int pages)
// init memory arena for the cursor // init memory arena for the cursor
make_cursor(buf, buf + buf_size, &cur); make_cursor(buf, buf + buf_size, &cur);
cursor_slice(&cur, &filter->elem_buf, page_size * elem_pages); cursor_slice(&cur, &filter->elem_buf, elem_size);
cursor_slice(&cur, &filter->data_buf, page_size * data_pages); cursor_slice(&cur, &filter->data_buf, data_size);
// make sure we are fully allocated // make sure we are fully allocated
assert(cur.p == cur.end); assert(cur.p == cur.end);

6
nostrdb/src/nostrdb.h
View File

@@ -503,6 +503,12 @@ int ndb_builder_push_tag_str(struct ndb_builder *builder, const char *str, int l
// FILTERS // FILTERS
int ndb_filter_init(struct ndb_filter *); int ndb_filter_init(struct ndb_filter *);
/// Allocate a filter with a fixed sized buffer (where pages is number of 4096-byte sized blocks)
/// You can set pages to 1 if you know you are constructing small filters
// TODO: replace this with passed-in buffers
int ndb_filter_init_with(struct ndb_filter *filter, int pages);
int ndb_filter_add_id_element(struct ndb_filter *, const unsigned char *id); int ndb_filter_add_id_element(struct ndb_filter *, const unsigned char *id);
int ndb_filter_add_int_element(struct ndb_filter *, uint64_t integer); int ndb_filter_add_int_element(struct ndb_filter *, uint64_t integer);
int ndb_filter_add_str_element(struct ndb_filter *, const char *str); int ndb_filter_add_str_element(struct ndb_filter *, const char *str);